Several 'Ingres error 32000' bug-fixes.

[moira.git] / server / mr_main.c

diff --git a/server/mr_main.c b/server/mr_main.c
index 2d76d215bd919071416d1a3b68211fb48135a2b7..86252a09a9bddfc49e752a5b368fe28d47d41a44 100644 (file)
--- a/server/mr_main.c
+++ b/server/mr_main.c
@@ -7,7 +7,7 @@
  *     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
  *
@@ -16,7 +16,7 @@
  * 
  */
 
-static char *rcsid_sms_main_c = "$Header$";
+static char *rcsid_mr_main_c = "$Header$";
 
 #include <mit-copyright.h>
 #include <strings.h>
@@ -25,7 +25,7 @@ static char *rcsid_sms_main_c = "$Header$";
 #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;
@@ -45,12 +45,11 @@ extern char buf1[BUFSIZ];
 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();
@@ -61,7 +60,7 @@ void reapchild(), godormant(), gowakeup();
 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.
@@ -83,11 +82,12 @@ main(argc, argv)
         */
        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");
+               com_err(whoami, 0, "Usage: moirad");
                exit(1);
        }               
 
@@ -107,14 +107,14 @@ main(argc, argv)
        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.  Only init if database should be open.
         */
 
-       if (stat(SMS_MOTD_FILE, &stbuf) != 0) {
-           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);
            }
@@ -132,7 +132,7 @@ main(argc, argv)
        nclients = 0;
        clients = (client **) malloc(0);
        
-       sms_setup_signals();
+       mr_setup_signals();
        
        journal = fopen(JOURNAL, "a");
        if (journal == NULL) {
@@ -152,11 +152,11 @@ main(argc, argv)
        op_list = create_list_of_operations(1, listenop);
        
        com_err(whoami, 0, "started (pid %d)", getpid());
-       com_err(whoami, 0, rcsid_sms_main_c);
+       com_err(whoami, 0, rcsid_mr_main_c);
        if (dormant != ASLEEP)
-         send_zgram("SMS", "server started");
+         send_zgram("MOIRA", "server started");
        else
-         send_zgram("SMS", "server started, but database closed");
+         send_zgram("MOIRA", "server started, but database closed");
 
        /*
         * Run until shut down.
@@ -170,16 +170,16 @@ main(argc, argv)
                com_err(whoami, 0, "tick");
 #endif notdef
                if (dormant == SLEEPY) {
-                   sms_close_database();
+                   mr_close_database();
                    com_err(whoami, 0, "database closed");
-                   sms_setup_signals();
-                   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");
-                   sms_setup_signals();
-                   send_zgram("SMS", "database open again");
+                   mr_setup_signals();
+                   send_zgram("MOIRA", "database open again");
                    dormant = AWAKE;
                }
 
@@ -189,7 +189,10 @@ main(argc, argv)
                                       (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");
@@ -197,6 +200,8 @@ main(argc, argv)
                }
                if (takedown) break;
                time(&now);
+               if (!inc_running || now - inc_started > INC_TIMEOUT)
+                 next_incremental();
 #ifdef notdef
                fprintf(stderr, "    tick\n");
 #endif notdef
@@ -209,9 +214,11 @@ main(argc, argv)
                                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,
@@ -225,7 +232,7 @@ main(argc, argv)
                         * 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;
                        }
@@ -233,7 +240,7 @@ main(argc, argv)
                         * 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;
@@ -259,8 +266,8 @@ main(argc, argv)
                }
        }
        com_err(whoami, 0, "%s", takedown);
-       sms_close_database();
-       send_zgram("SMS", takedown);
+       mr_close_database();
+       send_zgram("MOIRA", takedown);
        return 0;
 }
 
@@ -271,7 +278,7 @@ main(argc, argv)
 int
 do_listen()
 {
-       char *service = index(SMS_GDB_SERV, ':') + 1;
+       char *service = index(MOIRA_SERVER, ':') + 1;
 
        listencon = create_listening_connection(service);
 
@@ -315,7 +322,7 @@ new_connection()
        }
        
        if (newconn == NULL) {
-               return SMS_NOT_CONNECTED;
+               return MR_NOT_CONNECTED;
        }
 
        /*
@@ -327,8 +334,8 @@ new_connection()
        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;
@@ -476,12 +483,10 @@ void reapchild()
     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);
     }
@@ -522,7 +527,7 @@ void gowakeup()
 }
 
        
-sms_setup_signals()
+mr_setup_signals()
 {
     /* There should probably be a few more of these. */