X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=server%2Fstatserv.c;h=c5228f546fe01f20da10521786f0bc71998b6eba;hb=bc0541635987ad8f35af9df6aacd5534d519ccb6;hp=7df2baa721c94cc36e876cbf0cc48f378c381a9c;hpb=b440dce0831a72bebe4f4821ab7771cc05e8facb;p=yaz-moved-to-github.git diff --git a/server/statserv.c b/server/statserv.c index 7df2baa..c5228f5 100644 --- a/server/statserv.c +++ b/server/statserv.c @@ -1,13 +1,31 @@ /* - * Copyright (c) 1995-1999, Index Data + * Copyright (c) 1995-2000, Index Data * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * NT server based on threads by - * Chas Woodfield, Fretwell Downing Datasystems. + * Chas Woodfield, Fretwell Downing Informatics. * * $Log: statserv.c,v $ - * Revision 1.58 1999-08-27 09:40:32 adam + * Revision 1.64 2000-04-05 07:39:55 adam + * Added shared library support (libtool). + * + * Revision 1.63 2000/03/20 19:06:25 adam + * Added Segment request for fronend server. Work on admin for client. + * + * 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 @@ -212,6 +230,9 @@ #include #include "service.h" #else +#if HAVE_PTHREAD_H +#include +#endif #include #include #endif @@ -219,16 +240,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; @@ -239,6 +260,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 */ @@ -254,8 +276,10 @@ 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) */ + 0, /* bend_init handle */ + 0 /* bend_close handle */ #ifdef WIN32 ,"Z39.50 Server", /* NT Service Name */ "Server", /* NT application Name */ @@ -527,14 +551,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; @@ -614,8 +649,6 @@ 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))) { @@ -640,26 +673,19 @@ static void listener(IOCHAN h, int event) } else iochan_setflags(h, EVENT_INPUT | EVENT_EXCEPT); /* reset listener */ - - if (!(new_chan = iochan_create(cs_fileno(new_line), ir_session, - EVENT_INPUT))) + +#if HAVE_PTHREAD_H + if (control_block.threads) { - yaz_log(LOG_FATAL, "Failed to create iochan"); - iochan_destroy(h); - return; + pthread_t child_thread; + pthread_create (&child_thread, 0, new_session, new_line); + pthread_detach (child_thread); } - new_chan->next = pListener; - pListener = new_chan; - if (!(newas = create_association(new_chan, new_line))) - { - yaz_log(LOG_FATAL, "Failed to create new assoc."); - iochan_destroy(h); - return; - } - 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]"); + else + new_session(new_line); +#else + new_session(new_line); +#endif } else { @@ -669,6 +695,39 @@ static void listener(IOCHAN h, int event) } } +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) @@ -740,7 +799,8 @@ static void add_listener(char *where, int what) return; } yaz_log(LOG_LOG, "Adding %s %s listener on %s", - control_block.dynamic ? "dynamic" : "static", + control_block.dynamic ? "dynamic" : + (control_block.threads ? "threaded" : "static"), what == PROTO_SR ? "SR" : "Z3950", where); if (!(l = cs_create(type, 0, what))) { @@ -820,14 +880,29 @@ int statserv_start(int argc, char **argv) if (control_block.bend_start) (*control_block.bend_start)(&control_block); -#ifndef WIN32 +#ifdef WIN32 + logf (LOG_LOG, "Starting server %s", me); +#else if (control_block.inetd) inetd_connection(control_block.default_proto); else { + logf (LOG_LOG, "Starting server %s pid=%d", me, getpid()); +#if 0 + sigset_t sigs_to_block; + + sigemptyset(&sigs_to_block); + sigaddset (&sigs_to_block, SIGTERM); + pthread_sigmask (SIG_BLOCK, &sigs_to_block, 0); + pthread_create (& + + +#endif if (control_block.dynamic) signal(SIGCHLD, catchchld); } + + signal (SIGTERM, sigterm); if (*control_block.setuid) { struct passwd *pw; @@ -865,7 +940,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) { @@ -885,6 +960,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); @@ -928,15 +1012,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; @@ -957,10 +1041,17 @@ static Args ArgDetails; /* list of service dependencies - "dep1\0dep2\0\0" */ #define SZDEPENDENCIES "" -int statserv_main(int argc, char **argv) +int statserv_main(int argc, char **argv, + bend_initresult *(*bend_init)(bend_initrequest *r), + void (*bend_close)(void *handle)) { statserv_options_block *cb = statserv_getcontrol(); + cb->bend_init = bend_init; + cb->bend_close = bend_close; + + statserv_setcontrol(cb); + /* Lets setup the Arg structure */ ArgDetails.argc = argc; ArgDetails.argv = argv; @@ -993,9 +1084,18 @@ void StopAppService(void *pHandle) statserv_closedown(); } #else -int statserv_main(int argc, char **argv) +int statserv_main(int argc, char **argv, + bend_initresult *(*bend_init)(bend_initrequest *r), + void (*bend_close)(void *handle)) { - int ret = statserv_start (argc, argv); + int ret; + statserv_options_block *cb = statserv_getcontrol(); + + cb->bend_init = bend_init; + cb->bend_close = bend_close; + + statserv_setcontrol(cb); + ret = statserv_start (argc, argv); statserv_closedown (); return ret; }