X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=kernel%2Fmonitor.c;h=d5579799cb429d6e79629c8ccf13bb1324de2197;hb=4938d0c2e8f4e1eec397c2bfbbc7e23fd150c369;hp=aeb5cb77bbe47e57462247e0cc500d5343ec25ba;hpb=06f969f8132e7aaa1c6bb559d4611416d4120b59;p=egate.git diff --git a/kernel/monitor.c b/kernel/monitor.c index aeb5cb7..d557979 100644 --- a/kernel/monitor.c +++ b/kernel/monitor.c @@ -45,7 +45,22 @@ * Europagate, 1995 * * $Log: monitor.c,v $ - * Revision 1.10 1995/05/18 12:03:09 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 * Bug fixes and minor improvements. * * Revision 1.9 1995/05/17 10:51:32 adam @@ -104,7 +119,7 @@ #include #include -#define LINE_MAX 1024 +#define STR_LINE_MAX 1024 #define MONITOR_FIFO_S "fifo.s.m" #define MONITOR_FIFO_C "fifo.c.m" @@ -140,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 */ @@ -167,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; } @@ -358,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 */ } @@ -376,11 +396,15 @@ static void monitor_events (int argc, char **argv) fd_set set_r; char command[128], *cp; + mknod (MONITOR_FIFO_C, S_IFIFO|0666, 0); + open (MONITOR_FIFO_C, O_RDONLY|O_NONBLOCK); gip_m = gips_initialize (MONITOR_FIFO_S); - r = gips_open (gip_m, MONITOR_FIFO_C); + 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; @@ -412,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, @@ -427,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 ())) { @@ -444,15 +467,17 @@ static void monitor_events (int argc, char **argv) } str_queue_enq (ki->queue, "stop\n"); str_queue_enq (ki->queue, "\001"); - gw_log (GW_LOG_DEBUG, module, "Stopping %d", ki->id); - deliver (argc, argv, ki->id, ki->queue, &ki->gip, - &ki->pid, 1); + r = deliver (argc, argv, ki->id, ki->queue, &ki->gip, + &ki->pid, 1); + if (r != 1) + 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); @@ -469,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 */ @@ -513,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; } } } @@ -569,20 +596,44 @@ int main (int argc, char **argv) { if (argv[argno][0] == '-') { + if (argv[argno][1] == '-') + break; switch (argv[argno][1]) { + case 'h': case 'H': - fprintf (stderr, "monitor [option..] [resource]\n"); - fprintf (stderr, "If no resource file is given"); + fprintf (stderr, "monitor [options] [resourceFile]" + " -- [kernelOptions]\n"); + fprintf (stderr, "If no resource file is specified"); fprintf (stderr, " default.res is used\n"); - fprintf (stderr, "Options are transferred to kernel\n"); + fprintf (stderr, "Options:\n"); + fprintf (stderr, " -l log Set Log file\n"); + fprintf (stderr, " -d Enable debugging log\n"); + fprintf (stderr, " -D Enable more debugging log\n"); + fprintf (stderr, " -- Precedes kernel options\n"); + fprintf (stderr, "Kernel options are transferred to kernel\n"); exit (1); + case 'l': + if (argv[argno][2]) + gw_log_file (GW_LOG_ALL, argv[argno]+2); + else if (++argno < argc) + gw_log_file (GW_LOG_ALL, argv[argno]); + else + { + fprintf (stderr, "%s: missing log filename\n", *argv); + exit (1); + } + break; case 'd': gw_log_level (GW_LOG_ALL & ~RES_DEBUG); break; case 'D': gw_log_level (GW_LOG_ALL); break; + default: + fprintf (stderr, "%s: unknown option `%s'; use -H for help\n", + *argv, argv[argno]); + exit (1); } } else @@ -593,10 +644,6 @@ int main (int argc, char **argv) signal (SIGHUP, catch_hup); signal (SIGTERM, catch_term); signal (SIGINT, catch_int); -#if 1 - gw_log_level (GW_LOG_ALL & ~RES_DEBUG); - gw_log_file (GW_LOG_ALL, "monitor.log"); -#endif - monitor_events (argc, argv); + monitor_events (argc-argno, argv+argno); exit (0); }