X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=server%2Fstatserv.c;h=aab25b6d0c40b551f4a36e43675290a82ca20f4d;hb=29ad0d85b05dd7ed7a68a01b87ebce5195bdbb85;hp=9305cdfe9b9be954613e80ca5d65ff3b834ec079;hpb=a0bdc8bbd4d346939e7c24fd7e07b6d361d78643;p=yaz-moved-to-github.git diff --git a/server/statserv.c b/server/statserv.c index 9305cdf..aab25b6 100644 --- a/server/statserv.c +++ b/server/statserv.c @@ -7,7 +7,22 @@ * Chas Woodfield, Fretwell Downing Datasystems. * * $Log: statserv.c,v $ - * Revision 1.57 1999-07-06 12:17:15 adam + * Revision 1.62 2000-03-17 12:47:02 adam + * Minor changes to admin client. + * + * Revision 1.61 2000/03/15 12:59:49 adam + * Added handle member to statserv_control. + * + * Revision 1.60 2000/03/14 09:06:11 adam + * Added POSIX threads support for frontend server. + * + * Revision 1.59 1999/11/30 13:47:12 adam + * Improved installation. Moved header files to include/yaz. + * + * Revision 1.58 1999/08/27 09:40:32 adam + * Renamed logf function to yaz_log. Removed VC++ project files. + * + * Revision 1.57 1999/07/06 12:17:15 adam * Added option -1 that runs server once (for profiling purposes). * * Revision 1.56 1999/06/10 11:45:30 adam @@ -209,6 +224,9 @@ #include #include "service.h" #else +#if HAVE_PTHREAD_H +#include +#endif #include #include #endif @@ -216,16 +234,16 @@ #include #include -#include -#include -#include +#include +#include +#include #ifdef USE_XTIMOSI -#include +#include #endif -#include +#include #include "eventl.h" #include "session.h" -#include +#include static IOCHAN pListener = NULL; @@ -236,6 +254,7 @@ static char *me = "statserver"; int check_options(int argc, char **argv); statserv_options_block control_block = { 1, /* dynamic mode */ + 0, /* threaded mode */ 0, /* one shot (single session) */ LOG_DEFAULT_LEVEL, /* log level */ "", /* no PDUs */ @@ -251,7 +270,8 @@ statserv_options_block control_block = { check_options, /* Default routine, for checking the run-time arguments */ check_ip_tcpd, "", - 0 /* default value for inet deamon */ + 0, /* default value for inet deamon */ + 0, /* handle (for service, etc) */ #ifdef WIN32 ,"Z39.50 Server", /* NT Service Name */ @@ -438,12 +458,12 @@ static void listener(IOCHAN h, int event) { if ((res = cs_listen(line, 0, 0)) < 0) { - logf(LOG_FATAL, "cs_listen failed"); + yaz_log(LOG_FATAL, "cs_listen failed"); return; } else if (res == 1) return; - logf(LOG_DEBUG, "listen ok"); + yaz_log(LOG_DEBUG, "listen ok"); iochan_setevent(h, EVENT_OUTPUT); iochan_setflags(h, EVENT_OUTPUT | EVENT_EXCEPT); /* set up for acpt */ } @@ -456,34 +476,34 @@ static void listener(IOCHAN h, int event) if (!(new_line = cs_accept(line))) { - logf(LOG_FATAL, "Accept failed."); + yaz_log(LOG_FATAL, "Accept failed."); iochan_setflags(h, EVENT_INPUT | EVENT_EXCEPT); /* reset listener */ return; } - logf(LOG_DEBUG, "Accept ok"); + yaz_log(LOG_DEBUG, "Accept ok"); if (!(new_chan = iochan_create(cs_fileno(new_line), ir_session, EVENT_INPUT))) { - logf(LOG_FATAL, "Failed to create iochan"); + yaz_log(LOG_FATAL, "Failed to create iochan"); iochan_destroy(h); return; } - logf(LOG_DEBUG, "Creating association"); + yaz_log(LOG_DEBUG, "Creating association"); if (!(newas = create_association(new_chan, new_line))) { - logf(LOG_FATAL, "Failed to create new assoc."); + yaz_log(LOG_FATAL, "Failed to create new assoc."); iochan_destroy(h); return; } - logf(LOG_DEBUG, "Setting timeout %d", control_block.idle_timeout); + yaz_log(LOG_DEBUG, "Setting timeout %d", control_block.idle_timeout); iochan_setdata(new_chan, newas); iochan_settimeout(new_chan, control_block.idle_timeout * 60); #ifndef WIN32 - logf(LOG_DEBUG, "Determining client address"); + yaz_log(LOG_DEBUG, "Determining client address"); a = cs_addrstr(new_line); - logf(LOG_LOG, "Accepted connection from %s", a ? a : "[Unknown]"); + yaz_log(LOG_LOG, "Accepted connection from %s", a ? a : "[Unknown]"); #endif /* Now what we need todo is create a new thread with this iochan as the parameter */ @@ -496,19 +516,19 @@ static void listener(IOCHAN h, int event) if (NewHandle == (HANDLE)-1) { - logf(LOG_FATAL|LOG_ERRNO, "Failed to create new thread."); + yaz_log(LOG_FATAL|LOG_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); - logf(LOG_DEBUG, "Created new thread, iochan %p", new_chan); + yaz_log(LOG_DEBUG, "Created new thread, iochan %p", new_chan); iochan_setflags(h, EVENT_INPUT | EVENT_EXCEPT); /* reset listener */ } else { - logf(LOG_FATAL, "Bad event on listener."); + yaz_log(LOG_FATAL, "Bad event on listener."); iochan_destroy(h); return; } @@ -524,14 +544,25 @@ void statserv_remove(IOCHAN pIOChannel) void statserv_closedown() { IOCHAN p; + + if (control_block.bend_stop) + (*control_block.bend_stop)(&control_block); + for (p = pListener; p; p = p->next) iochan_destroy(p); } +void sigterm(int sig) +{ + statserv_closedown(); + exit (0); +} + +static void *new_session (void *vp); + static void listener(IOCHAN h, int event) { COMSTACK line = (COMSTACK) iochan_getdata(h); - association *newas; static int hand[2]; static int child = 0; int res; @@ -544,13 +575,13 @@ static void listener(IOCHAN h, int event) if (pipe(hand) < 0) { - logf(LOG_FATAL|LOG_ERRNO, "pipe"); + yaz_log(LOG_FATAL|LOG_ERRNO, "pipe"); iochan_destroy(h); return; } if ((res = fork()) < 0) { - logf(LOG_FATAL|LOG_ERRNO, "fork"); + yaz_log(LOG_FATAL|LOG_ERRNO, "fork"); iochan_destroy(h); return; } @@ -584,13 +615,13 @@ static void listener(IOCHAN h, int event) if ((res = read(hand[0], dummy, 1)) < 0 && errno != EINTR) { - logf(LOG_FATAL|LOG_ERRNO, "handshake read"); + yaz_log(LOG_FATAL|LOG_ERRNO, "handshake read"); return; } else if (res >= 0) break; } - logf(LOG_DEBUG, "P: Child has taken the call"); + yaz_log(LOG_DEBUG, "P: Child has taken the call"); close(hand[0]); return; } @@ -598,12 +629,12 @@ static void listener(IOCHAN h, int event) if ((res = cs_listen_check(line, 0, 0, control_block.check_ip, control_block.daemon_name)) < 0) { - logf(LOG_WARN, "cs_listen failed"); + yaz_log(LOG_WARN, "cs_listen failed"); return; } else if (res == 1) return; - logf(LOG_DEBUG, "listen ok"); + yaz_log(LOG_DEBUG, "listen ok"); iochan_setevent(h, EVENT_OUTPUT); iochan_setflags(h, EVENT_OUTPUT | EVENT_EXCEPT); /* set up for acpt */ } @@ -611,16 +642,14 @@ static void listener(IOCHAN h, int event) else if (event == EVENT_OUTPUT) { COMSTACK new_line; - IOCHAN new_chan; - char *a; if (!(new_line = cs_accept(line))) { - logf(LOG_FATAL, "Accept failed."); + yaz_log(LOG_FATAL, "Accept failed."); iochan_setflags(h, EVENT_INPUT | EVENT_EXCEPT); /* reset listener */ return; } - logf(LOG_DEBUG, "accept ok"); + yaz_log(LOG_DEBUG, "accept ok"); if (control_block.dynamic) { IOCHAN pp; @@ -632,40 +661,66 @@ static void listener(IOCHAN h, int event) iochan_destroy(pp); } /* release dad */ - logf(LOG_DEBUG, "Releasing parent"); + yaz_log(LOG_DEBUG, "Releasing parent"); close(hand[1]); } else iochan_setflags(h, EVENT_INPUT | EVENT_EXCEPT); /* reset listener */ - - if (!(new_chan = iochan_create(cs_fileno(new_line), ir_session, - EVENT_INPUT))) - { - logf(LOG_FATAL, "Failed to create iochan"); - iochan_destroy(h); - return; - } - new_chan->next = pListener; - pListener = new_chan; - if (!(newas = create_association(new_chan, new_line))) + +#if HAVE_PTHREAD_H + if (control_block.threads) { - logf(LOG_FATAL, "Failed to create new assoc."); - iochan_destroy(h); - return; + pthread_t child_thread; + pthread_create (&child_thread, 0, new_session, new_line); + pthread_detach (child_thread); } - iochan_setdata(new_chan, newas); - iochan_settimeout(new_chan, control_block.idle_timeout * 60); - a = cs_addrstr(new_line); - logf(LOG_LOG, "Accepted connection from %s", a ? a : "[Unknown]"); + else + new_session(new_line); +#else + new_session(new_line); +#endif } else { - logf(LOG_FATAL, "Bad event on listener."); + yaz_log(LOG_FATAL, "Bad event on listener."); iochan_destroy(h); return; } } +static void *new_session (void *vp) +{ + char *a; + association *newas; + IOCHAN new_chan; + COMSTACK new_line = (COMSTACK) vp; + if (!(new_chan = iochan_create(cs_fileno(new_line), ir_session, + EVENT_INPUT))) + { + yaz_log(LOG_FATAL, "Failed to create iochan"); + return 0; + } + if (!(newas = create_association(new_chan, new_line))) + { + yaz_log(LOG_FATAL, "Failed to create new assoc."); + return 0; + } + iochan_setdata(new_chan, newas); + iochan_settimeout(new_chan, control_block.idle_timeout * 60); + a = cs_addrstr(new_line); + yaz_log(LOG_LOG, "Accepted connection from %s", a ? a : "[Unknown]"); + if (control_block.threads) + { + event_loop(&new_chan); + } + else + { + new_chan->next = pListener; + pListener = new_chan; + } + return 0; +} + #endif /* WIN32 */ static void inetd_connection(int what) @@ -684,23 +739,23 @@ static void inetd_connection(int what) iochan_setdata(chan, assoc); iochan_settimeout(chan, control_block.idle_timeout * 60); addr = cs_addrstr(line); - logf(LOG_LOG, "Inetd association from %s", addr ? addr : "[UNKNOWN]"); + yaz_log(LOG_LOG, "Inetd association from %s", addr ? addr : "[UNKNOWN]"); } else { - logf(LOG_FATAL, "Failed to create association structure"); + yaz_log(LOG_FATAL, "Failed to create association structure"); } chan->next = pListener; pListener = chan; } else { - logf(LOG_FATAL, "Failed to create iochan"); + yaz_log(LOG_FATAL, "Failed to create iochan"); } } else { - logf(LOG_ERRNO|LOG_FATAL, "Failed to create comstack on socket 0"); + yaz_log(LOG_ERRNO|LOG_FATAL, "Failed to create comstack on socket 0"); } } @@ -717,7 +772,7 @@ static void add_listener(char *where, int what) if (!where || sscanf(where, "%[^:]:%s", mode, addr) != 2) { - logf (LOG_WARN, "%s: Address format: ('tcp'|'osi')':'
", me); + yaz_log (LOG_WARN, "%s: Address format: ('tcp'|'osi')':'
", me); return; } if (!strcmp(mode, "tcp")) @@ -727,21 +782,22 @@ static void add_listener(char *where, int what) #ifdef USE_XTIMOSI type = mosi_type; #else - logf (LOG_WARN, "OSI Transport not allowed by configuration."); + yaz_log (LOG_WARN, "OSI Transport not allowed by configuration."); return; #endif } else { - logf (LOG_WARN, "You must specify either 'osi:' or 'tcp:'"); + yaz_log (LOG_WARN, "You must specify either 'osi:' or 'tcp:'"); return; } - logf(LOG_LOG, "Adding %s %s listener on %s", - control_block.dynamic ? "dynamic" : "static", + yaz_log(LOG_LOG, "Adding %s %s listener on %s", + control_block.dynamic ? "dynamic" : + (control_block.threads ? "threaded" : "static"), what == PROTO_SR ? "SR" : "Z3950", where); if (!(l = cs_create(type, 0, what))) { - logf(LOG_FATAL|LOG_ERRNO, "Failed to create listener"); + yaz_log(LOG_FATAL|LOG_ERRNO, "Failed to create listener"); return; } ap = cs_straddr (l, addr); @@ -753,14 +809,14 @@ static void add_listener(char *where, int what) } if (cs_bind(l, ap, CS_SERVER) < 0) { - logf(LOG_FATAL|LOG_ERRNO, "Failed to bind to %s", where); + yaz_log(LOG_FATAL|LOG_ERRNO, "Failed to bind to %s", where); cs_close (l); return; } if (!(lst = iochan_create(cs_fileno(l), listener, EVENT_INPUT | EVENT_EXCEPT))) { - logf(LOG_FATAL|LOG_ERRNO, "Failed to create IOCHAN-type"); + yaz_log(LOG_FATAL|LOG_ERRNO, "Failed to create IOCHAN-type"); cs_close (l); return; } @@ -809,8 +865,10 @@ int statserv_start(int argc, char **argv) me++; else me = argv[0]; + logf (LOG_LOG, "Starting server %s", me); #else me = argv[0]; + logf (LOG_LOG, "Starting server %s pid=%d", me, getpid()); #endif if (control_block.options_func(argc, argv)) return(1); @@ -825,18 +883,19 @@ int statserv_start(int argc, char **argv) if (control_block.dynamic) signal(SIGCHLD, catchchld); } + signal (SIGTERM, sigterm); if (*control_block.setuid) { struct passwd *pw; if (!(pw = getpwnam(control_block.setuid))) { - logf(LOG_FATAL, "%s: Unknown user", control_block.setuid); + yaz_log(LOG_FATAL, "%s: Unknown user", control_block.setuid); return(1); } if (setuid(pw->pw_uid) < 0) { - logf(LOG_FATAL|LOG_ERRNO, "setuid"); + yaz_log(LOG_FATAL|LOG_ERRNO, "setuid"); exit(1); } } @@ -850,7 +909,7 @@ int statserv_start(int argc, char **argv) ret = 1; else { - logf(LOG_LOG, "Entering event loop."); + yaz_log(LOG_LOG, "Entering event loop."); ret = event_loop(&pListener); } nmem_exit (); @@ -862,7 +921,7 @@ int check_options(int argc, char **argv) int ret = 0, r; char *arg; - while ((ret = options("1a:iszSl:v:u:c:w:t:k:d:", argv, argc, &arg)) != -2) + while ((ret = options("1a:iszSTl:v:u:c:w:t:k:d:", argv, argc, &arg)) != -2) { switch (ret) { @@ -882,6 +941,15 @@ int check_options(int argc, char **argv) case 'S': control_block.dynamic = 0; break; + case 'T': +#if HAVE_PTHREAD_H + control_block.dynamic = 0; + control_block.threads = 1; +#else + fprintf(stderr, "%s: Threaded mode not available.\n", me); + return 1; +#endif + break; case 'l': strcpy(control_block.logfile, arg ? arg : ""); log_init(control_block.loglevel, me, control_block.logfile); @@ -925,15 +993,15 @@ int check_options(int argc, char **argv) if (chdir(arg)) { perror(arg); - return(1); + return 1; } break; default: - fprintf(stderr, "Usage: %s [ -i -a -v " + fprintf(stderr, "Usage: %s [ -a -v " " -l -u -c -t " " -k -d " - " -zsS -w ... ]\n", me); - return(1); + " -zsiST -w ... ]\n", me); + return 1; } } return 0;