* For copying and distribution information, please see the file
* <mit-copyright.h>.
*
- * SMS server process.
+ * MOIRA server process.
*
* Most of this is stolen from ../gdb/tsr.c
*
*
*/
-static char *rcsid_sms_main_c = "$Header$";
+static char *rcsid_mr_main_c = "$Header$";
#include <mit-copyright.h>
#include <strings.h>
#include <sys/signal.h>
#include <sys/wait.h>
#include <sys/stat.h>
-#include "sms_server.h"
+#include "mr_server.h"
#include <krb_et.h>
extern CONNECTION newconn, listencon;
extern char *takedown;
extern int errno;
extern FILE *journal;
-#define JOURNAL "/u1/sms/journal"
extern char *malloc();
extern int free();
extern char *inet_ntoa();
-extern void sms_com_err();
+extern void mr_com_err();
extern void do_client();
extern int sigshut();
extern time_t now;
/*
- * Main SMS server loop.
+ * Main MOIRA server loop.
*
* Initialize the world, then start accepting connections and
* making progress on current connections.
int argc;
char **argv;
{
- int status;
+ int status, i;
time_t tardy;
+ char *port;
+ extern char *database;
struct stat stbuf;
whoami = argv[0];
*/
initialize_sms_error_table();
initialize_krb_error_table();
- set_com_err_hook(sms_com_err);
+ initialize_gdss_error_table();
+ set_com_err_hook(mr_com_err);
setlinebuf(stderr);
- if (argc != 1) {
- com_err(whoami, 0, "Usage: smsd");
+ database = "moira";
+ port = index(MOIRA_SERVER, ':') + 1;
+
+ for (i = 1; i < argc; i++) {
+ if (!strcmp(argv[i], "-db") && i+1 < argc) {
+ database = argv[i+1];
+ i++;
+ } else if (!strcmp(argv[i], "-p") && i+1 < argc) {
+ port = argv[i+1];
+ i++;
+ } else {
+ com_err(whoami, 0, "Usage: moirad [-db database][-p port]");
exit(1);
- }
+ }
+ }
/* Profiling implies that getting rid of one level of call
* indirection here wins us maybe 1% on the VAX.
gdb_debug(0); /* this can be patched, if necessary, to enable */
/* GDB level debugging .. */
krb_realm = malloc(REALM_SZ);
- get_krbrlm(krb_realm, 1);
+ krb_get_lrealm(krb_realm, 1);
/*
- * Database initialization.
+ * Database initialization. Only init if database should be open.
*/
- if ((status = sms_open_database()) != 0) {
+ if (stat(MOIRA_MOTD_FILE, &stbuf) != 0) {
+ if ((status = mr_open_database()) != 0) {
com_err(whoami, status, " when trying to open database.");
exit(1);
+ }
+ sanity_check_database();
+ } else {
+ dormant = ASLEEP;
+ com_err(whoami, 0, "sleeping, not opening database");
}
sanity_check_queries();
- sanity_check_database();
/*
* Set up client array handler.
nclients = 0;
clients = (client **) malloc(0);
- /*
- * Signal handlers
- * There should probably be a few more of these. This is
- * duplicated on the next page, be sure to also add any
- * additional handlers there.
- */
-
- if ((((int)signal (SIGTERM, sigshut)) < 0) ||
- (((int)signal (SIGCHLD, reapchild)) < 0) ||
- (((int)signal (SIGUSR1, godormant)) < 0) ||
- (((int)signal (SIGUSR2, gowakeup)) < 0) ||
- (((int)signal (SIGHUP, sigshut)) < 0)) {
- com_err(whoami, errno, " Unable to establish signal handlers.");
- exit(1);
- }
+ mr_setup_signals();
journal = fopen(JOURNAL, "a");
if (journal == NULL) {
/*
* Establish template connection.
*/
- if ((status = do_listen()) != 0) {
+ if ((status = do_listen(port)) != 0) {
com_err(whoami, status,
" while trying to create listening connection");
exit(1);
op_list = create_list_of_operations(1, listenop);
com_err(whoami, 0, "started (pid %d)", getpid());
- com_err(whoami, 0, rcsid_sms_main_c);
- send_zgram("SMS", "server started");
+ com_err(whoami, 0, rcsid_mr_main_c);
+ if (dormant != ASLEEP)
+ send_zgram("MOIRA", "server started");
+ else
+ send_zgram("MOIRA", "server started, but database closed");
/*
* Run until shut down.
com_err(whoami, 0, "tick");
#endif notdef
if (dormant == SLEEPY) {
- sms_close_database();
+ mr_close_database();
com_err(whoami, 0, "database closed");
- send_zgram("SMS", "database closed");
+ mr_setup_signals();
+ send_zgram("MOIRA", "database closed");
dormant = ASLEEP;
} else if (dormant == GROGGY) {
- sms_open_database();
+ mr_open_database();
com_err(whoami, 0, "database open");
- if ((((int)signal (SIGTERM, sigshut)) < 0) ||
- (((int)signal (SIGCHLD, reapchild)) < 0) ||
- (((int)signal (SIGUSR1, godormant)) < 0) ||
- (((int)signal (SIGUSR2, gowakeup)) < 0) ||
- (((int)signal (SIGHUP, sigshut)) < 0)) {
- com_err(whoami, errno,
- " Unable to reestablish signal handlers.");
- exit(1);
- }
- send_zgram("SMS", "database open again");
+ mr_setup_signals();
+ send_zgram("MOIRA", "database open again");
dormant = AWAKE;
}
(fd_set *)NULL, (struct timeval *)NULL);
if (status == -1) {
- com_err(whoami, errno, " error from op_select");
+ if (errno != EINTR)
+ com_err(whoami, errno, " error from op_select");
+ if (!inc_running || now - inc_started > INC_TIMEOUT)
+ next_incremental();
continue;
} else if (status != -2) {
com_err(whoami, 0, " wrong return from op_select_any");
}
if (takedown) break;
time(&now);
+ if (!inc_running || now - inc_started > INC_TIMEOUT)
+ next_incremental();
#ifdef notdef
fprintf(stderr, " tick\n");
#endif notdef
if (errno == EWOULDBLOCK) {
do_reset_listen();
} else {
+ static int count = 0;
com_err(whoami, errno,
- " error on listen");
- exit(1);
+ " error (%d) on listen", count);
+ if (count++ > 10)
+ exit(1);
}
} else if ((status = new_connection()) != 0) {
com_err(whoami, errno,
* down now.
*/
if ((dormant == AWAKE) && (nclients == 1) &&
- (stat(SMS_MOTD_FILE, &stbuf) == 0)) {
+ (stat(MOIRA_MOTD_FILE, &stbuf) == 0)) {
com_err(whoami, 0, "motd file exists, slumbertime");
dormant = SLEEPY;
}
* to be down, then wake up.
*/
if ((dormant == ASLEEP) &&
- (stat(SMS_MOTD_FILE, &stbuf) == -1) &&
+ (stat(MOIRA_MOTD_FILE, &stbuf) == -1) &&
(errno == ENOENT)) {
com_err(whoami, 0, "motd file no longer exists, waking up");
dormant = GROGGY;
}
}
com_err(whoami, 0, "%s", takedown);
- sms_close_database();
- send_zgram("SMS", takedown);
+ mr_close_database();
+ send_zgram("MOIRA", takedown);
return 0;
}
*/
int
-do_listen()
+do_listen(port)
+char *port;
{
- char *service = index(SMS_GDB_SERV, ':') + 1;
-
- listencon = create_listening_connection(service);
+ listencon = create_listening_connection(port);
if (listencon == NULL)
return errno;
}
if (newconn == NULL) {
- return SMS_NOT_CONNECTED;
+ return MR_NOT_CONNECTED;
}
/*
cp->con = newconn;
cp->id = counter++;
cp->args = NULL;
- cp->clname = NULL;
- cp->reply.sms_argv = NULL;
+ cp->clname[0] = NULL;
+ cp->reply.mr_argv = NULL;
cp->first = NULL;
cp->last = NULL;
cp->last_time_used = now;
union wait status;
int pid;
- if (takedown || dormant == ASLEEP)
- return;
while ((pid = wait3(&status, WNOHANG, (struct rusage *)0)) > 0) {
- if (status.w_termsig == 0 && status.w_retcode == 0)
- com_err(whoami, 0, "child exited successfully");
- else
+ if (pid == inc_pid)
+ inc_running = 0;
+ if (!takedown && (status.w_termsig != 0 || status.w_retcode != 0))
com_err(whoami, 0, "%d: child exits with signal %d status %d",
pid, status.w_termsig, status.w_retcode);
}
}
dormant = GROGGY;
}
+
+
+mr_setup_signals()
+{
+ /* There should probably be a few more of these. */
+
+ if ((((int)signal (SIGTERM, sigshut)) < 0) ||
+ (((int)signal (SIGCHLD, reapchild)) < 0) ||
+ (((int)signal (SIGUSR1, godormant)) < 0) ||
+ (((int)signal (SIGUSR2, gowakeup)) < 0) ||
+ (((int)signal (SIGHUP, sigshut)) < 0)) {
+ com_err(whoami, errno, " Unable to establish signal handlers.");
+ exit(1);
+ }
+}
andersk / moira.git / blobdiff