X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=server%2Fstatserv.c;h=11a7b5471946e323eadce661efd26db0ad7b5648;hb=e0fea214f3bf8b0a75ae18c0e9c97c6d5e22df5f;hp=0ef6878b15364e218fe36c72a085cdc77a54ce17;hpb=2c77fc43bcc40cc4786a39b14c76a481dbe66ffe;p=yaz-moved-to-github.git diff --git a/server/statserv.c b/server/statserv.c index 0ef6878..11a7b54 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.60 2000-03-14 09:06:11 adam + * Revision 1.66 2000-10-06 12:00:28 adam + * Fixed Handle leak for WIN32. + * + * Revision 1.65 2000/09/04 08:58:15 adam + * Added prefix yaz_ for most logging utility functions. + * + * 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 @@ -264,8 +282,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 */ @@ -435,9 +455,9 @@ void statserv_closedown() } } -int __stdcall event_loop_thread (IOCHAN iochan) +void event_loop_thread (IOCHAN iochan) { - return event_loop (&iochan); + event_loop (&iochan); } static void listener(IOCHAN h, int event) @@ -445,7 +465,7 @@ static void listener(IOCHAN h, int event) COMSTACK line = (COMSTACK) iochan_getdata(h); association *newas; int res; - HANDLE NewHandle; + HANDLE newHandle; if (event == EVENT_INPUT) { @@ -465,7 +485,6 @@ static void listener(IOCHAN h, int event) COMSTACK new_line; IOCHAN new_chan; char *a = NULL; - DWORD ThreadId; if (!(new_line = cs_accept(line))) { @@ -493,20 +512,11 @@ static void listener(IOCHAN h, int event) 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 - yaz_log(LOG_DEBUG, "Determining client address"); - a = cs_addrstr(new_line); - 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 */ - /* if (CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)event_loop_thread, - new_chan, 0, &ThreadId) == NULL) */ - /* Somehow, somewhere we need to store this thread id, otherwise we - won't be able to close cleanly */ - NewHandle = (HANDLE)_beginthreadex(NULL, 0, event_loop_thread, - new_chan, 0, &ThreadId); - if (NewHandle == (HANDLE)-1) + newHandle = (HANDLE) _beginthread(event_loop_thread, 0, new_chan); + if (newHandle == (HANDLE) -1) { yaz_log(LOG_FATAL|LOG_ERRNO, "Failed to create new thread."); @@ -514,9 +524,9 @@ static void listener(IOCHAN h, int event) return; } /* We successfully created the thread, so add it to the list */ - statserv_add(NewHandle, new_chan); + statserv_add(newHandle, new_chan); - yaz_log(LOG_DEBUG, "Created new thread, iochan %p", new_chan); + yaz_log(LOG_DEBUG, "Created new thread, id = %ld iochan %p",(long) newHandle, new_chan); iochan_setflags(h, EVENT_INPUT | EVENT_EXCEPT); /* reset listener */ } else @@ -527,7 +537,7 @@ static void listener(IOCHAN h, int event) } } -#else /* WIN32 */ +#else /* ! WIN32 */ /* To save having an #ifdef in event_loop we need to define this empty function */ void statserv_remove(IOCHAN pIOChannel) @@ -537,10 +547,20 @@ 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) @@ -585,7 +605,7 @@ static void listener(IOCHAN h, int event) } } sprintf(nbuf, "%s(%d)", me, getpid()); - log_init(control_block.loglevel, nbuf, 0); + yaz_log_init(control_block.loglevel, nbuf, 0); } else /* parent */ { @@ -856,14 +876,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; @@ -927,15 +962,16 @@ int check_options(int argc, char **argv) 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); + yaz_log_init(control_block.loglevel, me, control_block.logfile); break; case 'v': - control_block.loglevel = log_mask_str(arg); - log_init(control_block.loglevel, me, control_block.logfile); + control_block.loglevel = yaz_log_mask_str(arg); + yaz_log_init(control_block.loglevel, me, control_block.logfile); break; case 'a': strcpy(control_block.apdufile, arg ? arg : ""); @@ -972,7 +1008,7 @@ int check_options(int argc, char **argv) if (chdir(arg)) { perror(arg); - return(1); + return 1; } break; default: @@ -980,7 +1016,7 @@ int check_options(int argc, char **argv) " -l -u -c -t " " -k -d " " -zsiST -w ... ]\n", me); - return(1); + return 1; } } return 0; @@ -1001,10 +1037,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; @@ -1037,9 +1080,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; }