X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fstatserv.c;h=a502bee2e0235f1489c866667552c54cbeb238ec;hb=8aa7ee02ee4abdda2f19b42236600f2954ce6c05;hp=a32ce35084294f3f69dc7de4eaec7d84fa8c5d16;hpb=e958092d7a7b66ff71cb05434b900d871e1f30fa;p=yaz-moved-to-github.git diff --git a/src/statserv.c b/src/statserv.c index a32ce35..a502bee 100644 --- a/src/statserv.c +++ b/src/statserv.c @@ -5,7 +5,7 @@ * NT threaded server code by * Chas Woodfield, Fretwell Downing Informatics. * - * $Id: statserv.c,v 1.11 2004-11-16 17:08:11 heikki Exp $ + * $Id: statserv.c,v 1.17 2005-01-03 11:56:08 adam Exp $ */ /** @@ -61,7 +61,7 @@ statserv_options_block control_block = { 1, /* dynamic mode */ 0, /* threaded mode */ 0, /* one shot (single session) */ - LOG_DEFAULT_LEVEL, /* log level */ + YLOG_DEFAULT_LEVEL, /* log level */ "", /* no PDUs */ "", /* diagnostic output to stderr */ "tcp:@:9999", /* default listener port */ @@ -290,12 +290,12 @@ static void listener(IOCHAN h, int event) { if ((res = cs_listen(line, 0, 0)) < 0) { - yaz_log(LOG_FATAL, "cs_listen failed"); + yaz_log(YLOG_FATAL, "cs_listen failed"); return; } else if (res == 1) return; - yaz_log(LOG_DEBUG, "listen ok"); + yaz_log(YLOG_DEBUG, "listen ok"); iochan_setevent(h, EVENT_OUTPUT); iochan_setflags(h, EVENT_OUTPUT | EVENT_EXCEPT); /* set up for acpt */ } @@ -307,24 +307,24 @@ static void listener(IOCHAN h, int event) if (!new_line) { - yaz_log(LOG_FATAL, "Accept failed."); + yaz_log(YLOG_FATAL, "Accept failed."); iochan_setflags(h, EVENT_INPUT | EVENT_EXCEPT); return; } - yaz_log(LOG_DEBUG, "Accept ok"); + yaz_log(YLOG_DEBUG, "Accept ok"); if (!(new_chan = iochan_create(cs_fileno(new_line), ir_session, EVENT_INPUT))) { - yaz_log(LOG_FATAL, "Failed to create iochan"); + yaz_log(YLOG_FATAL, "Failed to create iochan"); iochan_destroy(h); return; } - yaz_log(LOG_DEBUG, "Creating association"); + yaz_log(YLOG_DEBUG, "Creating association"); if (!(newas = create_association(new_chan, new_line))) { - yaz_log(LOG_FATAL, "Failed to create new assoc."); + yaz_log(YLOG_FATAL, "Failed to create new assoc."); iochan_destroy(h); return; } @@ -332,7 +332,7 @@ static void listener(IOCHAN h, int event) newas->cs_put_mask = 0; newas->cs_accept_mask = 0; - yaz_log(LOG_DEBUG, "Setting timeout %d", control_block.idle_timeout); + yaz_log(YLOG_DEBUG, "Setting timeout %d", control_block.idle_timeout); iochan_setdata(new_chan, newas); iochan_settimeout(new_chan, 60); @@ -342,19 +342,19 @@ static void listener(IOCHAN h, int event) if (newHandle == (HANDLE) -1) { - yaz_log(LOG_FATAL|LOG_ERRNO, "Failed to create new thread."); + yaz_log(YLOG_FATAL|YLOG_ERRNO, "Failed to create new thread."); iochan_destroy(h); return; } /* We successfully created the thread, so add it to the list */ statserv_add(newHandle, new_chan); - yaz_log(LOG_DEBUG, "Created new thread, id = %ld iochan %p",(long) newHandle, new_chan); + yaz_log(YLOG_DEBUG, "Created new thread, id = %ld iochan %p",(long) newHandle, new_chan); iochan_setflags(h, EVENT_INPUT | EVENT_EXCEPT); /* reset listener */ } else { - yaz_log(LOG_FATAL, "Bad event on listener."); + yaz_log(YLOG_FATAL, "Bad event on listener."); iochan_destroy(h); return; } @@ -404,26 +404,35 @@ static int no_sessions = 0; static void listener(IOCHAN h, int event) { COMSTACK line = (COMSTACK) iochan_getdata(h); - static int hand[2]; - static int child = 0; int res; if (event == EVENT_INPUT) { - if (control_block.dynamic && !child) + COMSTACK new_line; + if ((res = cs_listen_check(line, 0, 0, control_block.check_ip, + control_block.daemon_name)) < 0) + { + yaz_log(YLOG_WARN|YLOG_ERRNO, "cs_listen failed"); + return; + } + else if (res == 1) + { + yaz_log(YLOG_WARN, "cs_listen incomplete"); + return; + } + new_line = cs_accept(line); + if (!new_line) + { + yaz_log(YLOG_FATAL, "Accept failed."); + iochan_setflags(h, EVENT_INPUT | EVENT_EXCEPT); /* reset listener */ + return; + } + no_sessions++; + if (control_block.dynamic) { - int res; - - ++no_sessions; - if (pipe(hand) < 0) - { - yaz_log(LOG_FATAL|LOG_ERRNO, "pipe"); - iochan_destroy(h); - return; - } if ((res = fork()) < 0) { - yaz_log(LOG_FATAL|LOG_ERRNO, "fork"); + yaz_log(YLOG_FATAL|YLOG_ERRNO, "fork"); iochan_destroy(h); return; } @@ -432,16 +441,11 @@ static void listener(IOCHAN h, int event) char nbuf[100]; IOCHAN pp; - close(hand[0]); - child = 1; for (pp = pListener; pp; pp = iochan_getnext(pp)) { - if (pp != h) - { - COMSTACK l = (COMSTACK)iochan_getdata(pp); - cs_close(l); - iochan_destroy(pp); - } + COMSTACK l = (COMSTACK)iochan_getdata(pp); + cs_close(l); + iochan_destroy(pp); } sprintf(nbuf, "%s(%d)", me, no_sessions); yaz_log_init(control_block.loglevel, nbuf, 0); @@ -451,82 +455,17 @@ static void listener(IOCHAN h, int event) } else /* parent */ { - close(hand[1]); - /* wait for child to take the call */ - for (;;) - { - char dummy[1]; - int res; - - if ((res = read(hand[0], dummy, 1)) < 0 && - yaz_errno() != EINTR) - { - yaz_log(LOG_FATAL|LOG_ERRNO, "handshake read"); - return; - } - else if (res >= 0) - break; - } - yaz_log(LOG_DEBUG, "P: Child has taken the call"); - close(hand[0]); + cs_close(new_line); return; } } - if ((res = cs_listen_check(line, 0, 0, control_block.check_ip, - control_block.daemon_name)) < 0) - { - yaz_log(LOG_WARN|LOG_ERRNO, "cs_listen failed"); - return; - } - else if (res == 1) - return; - yaz_log(LOG_DEBUG, "listen ok"); - iochan_setevent(h, EVENT_OUTPUT); - iochan_setflags(h, EVENT_OUTPUT | EVENT_EXCEPT); /* set up for acpt */ - } - /* in dynamic mode, only the child ever comes down here */ - else if (event == EVENT_OUTPUT) - { - COMSTACK new_line = cs_accept(line); - - if (!new_line) - { - yaz_log(LOG_FATAL, "Accept failed."); - iochan_setflags(h, EVENT_INPUT | EVENT_EXCEPT); /* reset listener */ - return; - } - yaz_log(LOG_DEBUG, "accept ok"); - if (control_block.dynamic) - { - IOCHAN pp; - /* close our half of the listener socket */ - for (pp = pListener; pp; pp = iochan_getnext(pp)) - { - COMSTACK l = (COMSTACK)iochan_getdata(pp); - cs_close(l); - iochan_destroy(pp); - } - /* release dad */ - yaz_log(LOG_DEBUG, "Releasing parent"); - close(hand[1]); - } - else - { - iochan_setflags(h, EVENT_INPUT | EVENT_EXCEPT); /* reset listener */ - ++no_sessions; - } -#if YAZ_POSIX_THREADS if (control_block.threads) { +#if YAZ_POSIX_THREADS pthread_t child_thread; pthread_create (&child_thread, 0, new_session, new_line); pthread_detach (child_thread); - } - else - new_session(new_line); #elif YAZ_GNU_THREADS - if (control_block.threads) - { pth_attr_t attr; pth_t child_thread; @@ -534,16 +473,16 @@ static void listener(IOCHAN h, int event) pth_attr_set (attr, PTH_ATTR_JOINABLE, FALSE); pth_attr_set (attr, PTH_ATTR_STACK_SIZE, 32*1024); pth_attr_set (attr, PTH_ATTR_NAME, "session"); - yaz_log (LOG_DEBUG, "pth_spawn begin"); + yaz_log (YLOG_DEBUG, "pth_spawn begin"); child_thread = pth_spawn (attr, new_session, new_line); - yaz_log (LOG_DEBUG, "pth_spawn finish"); + yaz_log (YLOG_DEBUG, "pth_spawn finish"); pth_attr_destroy (attr); +#else + new_session(new_line); +#endif } else new_session(new_line); -#else - new_session(new_line); -#endif } else if (event == EVENT_TIMEOUT) { @@ -552,7 +491,7 @@ static void listener(IOCHAN h, int event) } else { - yaz_log(LOG_FATAL, "Bad event on listener."); + yaz_log(YLOG_FATAL, "Bad event on listener."); iochan_destroy(h); } } @@ -581,12 +520,12 @@ static void *new_session (void *vp) if (!(new_chan = iochan_create(cs_fileno(new_line), ir_session, mask))) { - yaz_log(LOG_FATAL, "Failed to create iochan"); + yaz_log(YLOG_FATAL, "Failed to create iochan"); return 0; } if (!(newas = create_association(new_chan, new_line))) { - yaz_log(LOG_FATAL, "Failed to create new assoc."); + yaz_log(YLOG_FATAL, "Failed to create new assoc."); return 0; } newas->cs_accept_mask = cs_accept_mask; @@ -599,9 +538,9 @@ static void *new_session (void *vp) #else a = 0; #endif - yaz_log(log_session, "Starting session from %s (pid=%d)", - a ? a : "[Unknown]", getpid()); - if (max_sessions && no_sessions == max_sessions) + yaz_log(log_session, "Starting session %d from %s (pid=%ld)", + no_sessions, a ? a : "[Unknown]", (long) getpid()); + if (max_sessions && no_sessions >= max_sessions) control_block.one_shot = 1; if (control_block.threads) { @@ -640,19 +579,19 @@ static void inetd_connection(int what) } else { - yaz_log(LOG_FATAL, "Failed to create association structure"); + yaz_log(YLOG_FATAL, "Failed to create association structure"); } chan->next = pListener; pListener = chan; } else { - yaz_log(LOG_FATAL, "Failed to create iochan"); + yaz_log(YLOG_FATAL, "Failed to create iochan"); } } else { - yaz_log(LOG_ERRNO|LOG_FATAL, "Failed to create comstack on socket 0"); + yaz_log(YLOG_ERRNO|YLOG_FATAL, "Failed to create comstack on socket 0"); } } @@ -679,7 +618,7 @@ static int add_listener(char *where, int what) l = cs_create_host(where, 2, &ap); if (!l) { - yaz_log(LOG_FATAL, "Failed to listen on %s", where); + yaz_log(YLOG_FATAL, "Failed to listen on %s", where); return -1; } if (*control_block.cert_fname) @@ -687,14 +626,14 @@ static int add_listener(char *where, int what) if (cs_bind(l, ap, CS_SERVER) < 0) { - yaz_log(LOG_FATAL|LOG_ERRNO, "Failed to bind to %s", where); + yaz_log(YLOG_FATAL|YLOG_ERRNO, "Failed to bind to %s", where); cs_close (l); return -1; } if (!(lst = iochan_create(cs_fileno(l), listener, EVENT_INPUT | EVENT_EXCEPT))) { - yaz_log(LOG_FATAL|LOG_ERRNO, "Failed to create IOCHAN-type"); + yaz_log(YLOG_FATAL|YLOG_ERRNO, "Failed to create IOCHAN-type"); cs_close (l); return -1; } @@ -773,25 +712,48 @@ int statserv_start(int argc, char **argv) inetd_connection(control_block.default_proto); else { + static int hand[2]; if (control_block.background) { + /* create pipe so that parent waits until child has created + PID (or failed) */ + if (pipe(hand) < 0) + { + yaz_log(YLOG_FATAL|YLOG_ERRNO, "pipe"); + return 1; + } switch (fork()) { case 0: break; case -1: return 1; - default: - _exit(0); + default: + close(hand[1]); + while(1) + { + char dummy[1]; + int res = read(hand[0], dummy, 1); + if (res < 0 && yaz_errno() != EINTR) + { + yaz_log(YLOG_FATAL|YLOG_ERRNO, "read fork handshake"); + break; + } + else if (res >= 0) + break; + } + close(hand[0]); + _exit(0); } - + /* child */ + close(hand[0]); if (setsid() < 0) return 1; close(0); close(1); close(2); - open("/dev/null",O_RDWR); + open("/dev/null", O_RDWR); dup(0); dup(0); } if (!pListener && *control_block.default_listen) @@ -806,7 +768,7 @@ int statserv_start(int argc, char **argv) FILE *f = fopen(control_block.pid_fname, "w"); if (!f) { - yaz_log(LOG_FATAL|LOG_ERRNO, "Couldn't create %s", + yaz_log(YLOG_FATAL|YLOG_ERRNO, "Couldn't create %s", control_block.pid_fname); exit(0); } @@ -814,7 +776,11 @@ int statserv_start(int argc, char **argv) fclose(f); } - yaz_log (log_server, "Starting server %s pid=%d", programname, getpid()); + if (control_block.background) + close(hand[1]); + + yaz_log (log_server, "Starting server %s pid=%ld", programname, + (long) getpid()); #if 0 sigset_t sigs_to_block; @@ -835,12 +801,12 @@ int statserv_start(int argc, char **argv) if (!(pw = getpwnam(control_block.setuid))) { - yaz_log(LOG_FATAL, "%s: Unknown user", control_block.setuid); + yaz_log(YLOG_FATAL, "%s: Unknown user", control_block.setuid); return(1); } if (setuid(pw->pw_uid) < 0) { - yaz_log(LOG_FATAL|LOG_ERRNO, "setuid"); + yaz_log(YLOG_FATAL|YLOG_ERRNO, "setuid"); exit(1); } } @@ -854,7 +820,7 @@ int statserv_start(int argc, char **argv) ret = 1; else { - yaz_log(LOG_DEBUG, "Entering event loop."); + yaz_log(YLOG_DEBUG, "Entering event loop."); ret = event_loop(&pListener); } return ret; @@ -959,7 +925,7 @@ int check_options(int argc, char **argv) case 'p': if (strlen(arg) >= sizeof(control_block.pid_fname)) { - yaz_log(LOG_FATAL, "pid fname too long"); + yaz_log(YLOG_FATAL, "pid fname too long"); exit(1); } strcpy(control_block.pid_fname, arg);