X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=kernel%2Fmonitor.c;h=d5579799cb429d6e79629c8ccf13bb1324de2197;hb=4938d0c2e8f4e1eec397c2bfbbc7e23fd150c369;hp=8982094e7515bcea4c14dda3c436212b227ee13e;hpb=aa975e8f85af258357639e3407ce40090f4a4998;p=egate.git

diff --git a/kernel/monitor.c b/kernel/monitor.c
index 8982094..d557979 100644
--- a/kernel/monitor.c
+++ b/kernel/monitor.c
@@ -45,7 +45,19 @@
  * Europagate, 1995
  *
  * $Log: monitor.c,v $
- * Revision 1.11  1995/05/19 13:26:00  adam
+ * Revision 1.15  1995/07/11 11:49:12  adam
+ * LINE_MAX renamed to STR_LINE_MAX.
+ *
+ * Revision 1.14  1995/05/23  08:12:59  adam
+ * Minor changes.
+ *
+ * Revision 1.13  1995/05/22  11:42:48  adam
+ * Minor changes on dtbsun.
+ *
+ * Revision 1.12  1995/05/19  14:51:06  adam
+ * Bug fix: stopped kernels sometimes got IPC messages from the monitor.
+ *
+ * Revision 1.11  1995/05/19  13:26:00  adam
  * Bug fixes. Better command line options.
  *
  * Revision 1.10  1995/05/18  12:03:09  adam
@@ -107,7 +119,7 @@
 #include <strqueue.h>
 #include <lgets.h>
 
-#define LINE_MAX 1024
+#define STR_LINE_MAX 1024
 
 #define MONITOR_FIFO_S "fifo.s.m"
 #define MONITOR_FIFO_C "fifo.c.m"
@@ -143,6 +155,7 @@ static void reread_resources (void)
 
 struct ke_info {
     int id;                     /* email user-id */
+    int stopped;                /* stop flag */
     pid_t pid;                  /* pid of email kernel child */
     GIP gip;                    /* fifo information */
     struct str_queue *queue;    /* message queue */
@@ -170,6 +183,7 @@ struct ke_info *ke_info_add (int id)
     (*kip)->id = id;
     (*kip)->gip = NULL;
     (*kip)->queue = NULL;
+    (*kip)->stopped = 0;
     return *kip;
 }
 
@@ -361,7 +375,10 @@ static int deliver (int argc, char **argv, int id, struct str_queue *queue,
     }
     index = 0;                         /* transfer. may be interrupted */
     while ((msg = str_queue_get (queue, index++)))
+    {
+        gw_log (GW_LOG_DEBUG, module, "deliver: %s", msg);
         gip_wline (*gip, msg);
+    }
     signal (SIGPIPE, oldsig);
     return pass;                       /* successful transfer */
 }
@@ -384,7 +401,10 @@ static void monitor_events (int argc, char **argv)
     gip_m = gips_initialize (MONITOR_FIFO_S);
     r = gips_open (gip_m, MONITOR_FIFO_C, 0);
     gip_m_fd = gip_infileno (gip_m);
-
+#if 1
+    open (MONITOR_FIFO_S, O_WRONLY);
+#endif
+    gw_log (GW_LOG_DEBUG, module, "Starting event loop");
     while (1)
     {
         int fd_max;
@@ -416,7 +436,7 @@ static void monitor_events (int argc, char **argv)
             too_many = 0;
             for (ki = ke_info_list; ki; ki = ki->next)
             {
-                if (!ki->queue)
+                if (!ki->queue || ki->stopped)
                     continue;
                 gw_log (GW_LOG_DEBUG, module, "Transfer mail to %d", ki->id);
                 r = deliver (argc, argv, ki->id, ki->queue, &ki->gip, &ki->pid,
@@ -431,14 +451,13 @@ static void monitor_events (int argc, char **argv)
                 if (r == 0)             /* too many pending? */
                     too_many++;
             }
-#if 0
             if (too_many)
             {
                 gw_log (GW_LOG_DEBUG, module, "%d too many pending",
                         too_many);
                 for (ki = ke_info_list; ki; ki = ki->next)
                 {
-                    if (!ki->queue && ki->pid != -1)
+                    if (!ki->queue && ki->pid != -1 && !ki->stopped)
                     {
                         if (!(ki->queue = str_queue_mk ()))
                         {
@@ -454,11 +473,11 @@ static void monitor_events (int argc, char **argv)
                             gw_log (GW_LOG_DEBUG, module, 
                                     "Stop not sent: %d", r);
                         str_queue_rm (&ki->queue);
+                        ki->stopped = 1;
                         break;
                     }
                 }
             }
-#endif
             FD_ZERO (&set_r);
             FD_SET (gip_m_fd, &set_r);
             gw_log (GW_LOG_DEBUG, module, "set gip_m_fd %d", gip_m_fd);
@@ -475,6 +494,7 @@ static void monitor_events (int argc, char **argv)
                         gipc_close (ki->gip);
                         gipc_destroy (ki->gip);
                         ki->gip = NULL;
+                        ki->stopped = 0;
                     }
                     else if ((fd = gip_infileno (ki->gip)) != -1)
                     {                    /* read select on child FIFO */
@@ -519,6 +539,7 @@ static void monitor_events (int argc, char **argv)
                         gipc_close (ki->gip);
                         gipc_destroy (ki->gip);
                         ki->gip = NULL;
+                        ki->stopped = 0;
                     }
                 }
 	    }