From: Adam Dickmeiss Date: Thu, 29 Jan 1998 13:30:23 +0000 (+0000) Subject: Better event handle system for NT/Unix. X-Git-Tag: YAZ.1.8~533 X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=7574c044d6c2dc8ede5c7c406f9939215a220260;p=yaz-moved-to-github.git Better event handle system for NT/Unix. --- diff --git a/CHANGELOG b/CHANGELOG index fb8a793..7de0b4a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,7 @@ Possible compatibility problems with earlier versions marked with '*'. +Added sort facility in client and backend server interface. + Fixed problem with dependencies in Makefile(s). Fixed bugs for encoders/decoders of extended services and @@ -29,8 +31,8 @@ Made NT service interface part of the server library. The function statserv_main uses the NT service when required and calls the statserv_start / statserv_close routines. -Routine zget_SearchRequest fills resultSetName member with "default" -instead of "Default". +Routine zget_SearchRequest and zget_PresentRequest fills +resultSetName/Id member with "default" instead of "Default". Fixed memory leak in server. Request queue member wasn't freed. diff --git a/README b/README index 054c9bd..7bed44f 100644 --- a/README +++ b/README @@ -4,7 +4,7 @@ * Sebastian Hammer, Adam Dickmeiss Compilation and installation for YAZ - $Id: README,v 1.19 1998-01-07 12:59:27 adam Exp $ + $Id: README,v 1.20 1998-01-29 13:30:23 adam Exp $ The primary output of the source here is the lib/libyaz.a library, which contains support functions for implementing the server or client @@ -119,4 +119,7 @@ To get more information or assistance, send mail to yaz-help@indexdata.dk. We maintain a mailing-list for the purpose of announcing new versions of the software, bug-reports, discussion etc. You can sign up by sending -mail to yaz-request@indexdata.dk. +mail to yaz-request@indexdata.dk and include the following command +command in your email: + subscribe yaz-l + diff --git a/server/eventl.c b/server/eventl.c index 2b4ce26..76a80be 100644 --- a/server/eventl.c +++ b/server/eventl.c @@ -1,10 +1,13 @@ /* - * Copyright (c) 1995-1997, Index Data + * Copyright (c) 1995-1998, Index Data * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: eventl.c,v $ - * Revision 1.24 1997-09-04 14:19:13 adam + * Revision 1.25 1998-01-29 13:30:23 adam + * Better event handle system for NT/Unix. + * + * Revision 1.24 1997/09/04 14:19:13 adam * Added credits. * * Revision 1.23 1997/09/01 08:52:59 adam @@ -93,23 +96,12 @@ #include #include +#include +#include +#include #include "eventl.h" -#include "log.h" -#include "comstack.h" #include "session.h" -#include "statserv.h" -#include - -#ifndef WINDOWS - -static IOCHAN iochans = 0; - -IOCHAN iochan_getchan(void) -{ - return iochans; -} - -#endif /* WINDOWS */ +#include IOCHAN iochan_create(int fd, IOC_CALLBACK cb, int flags) { @@ -123,127 +115,116 @@ IOCHAN iochan_create(int fd, IOC_CALLBACK cb, int flags) new_iochan->fun = cb; new_iochan->force_event = 0; new_iochan->last_event = new_iochan->max_idle = 0; - -#ifdef WINDOWS - /* For windows we don't have a linklist of iochans */ new_iochan->next = NULL; -#else /* WINDOWS */ - new_iochan->next = iochans; - iochans = new_iochan; -#endif /* WINDOWS */ - return new_iochan; } -/* Event loop now takes an iochan as a parameter */ -#ifdef WINDOWS -int __stdcall event_loop(IOCHAN iochans) -#else -int event_loop(IOCHAN dummylistener) -#endif +int event_loop(IOCHAN *iochans) { do /* loop as long as there are active associations to process */ { IOCHAN p, nextp; - fd_set in, out, except; - int res, max; - static struct timeval nullto = {0, 0}, to; - struct timeval *timeout; - - FD_ZERO(&in); - FD_ZERO(&out); - FD_ZERO(&except); - timeout = &to; /* hang on select */ - to.tv_sec = 5*60; - to.tv_usec = 0; - max = 0; - for (p = iochans; p; p = p->next) + fd_set in, out, except; + int res, max; + static struct timeval nullto = {0, 0}, to; + struct timeval *timeout; + + FD_ZERO(&in); + FD_ZERO(&out); + FD_ZERO(&except); + timeout = &to; /* hang on select */ + to.tv_sec = 5*60; + to.tv_usec = 0; + max = 0; + for (p = *iochans; p; p = p->next) { - if (p->force_event) - timeout = &nullto; /* polling select */ - if (p->flags & EVENT_INPUT) - FD_SET(p->fd, &in); - if (p->flags & EVENT_OUTPUT) - FD_SET(p->fd, &out); - if (p->flags & EVENT_EXCEPT) - FD_SET(p->fd, &except); - if (p->fd > max) - max = p->fd; - } - if ((res = select(max + 1, &in, &out, &except, timeout)) < 0) - { - if (errno == EINTR) - continue; + if (p->force_event) + timeout = &nullto; /* polling select */ + if (p->flags & EVENT_INPUT) + FD_SET(p->fd, &in); + if (p->flags & EVENT_OUTPUT) + FD_SET(p->fd, &out); + if (p->flags & EVENT_EXCEPT) + FD_SET(p->fd, &except); + if (p->fd > max) + max = p->fd; + } + if ((res = select(max + 1, &in, &out, &except, timeout)) < 0) + { + if (errno == EINTR) + continue; else { /* Destroy the first member in the chain, and try again */ - association *assoc = iochan_getdata(iochans); + association *assoc = iochan_getdata(*iochans); COMSTACK conn = assoc->client_link; cs_close(conn); - destroy_association(assoc); - iochan_destroy(iochans); - logf(LOG_DEBUG, "error while selecting, destroying iochan %p", iochans); + destroy_association(assoc); + iochan_destroy(*iochans); + logf(LOG_DEBUG, "error while selecting, destroying iochan %p", + *iochans); } - } - for (p = iochans; p; p = p->next) + } + for (p = *iochans; p; p = p->next) { - int force_event = p->force_event; - time_t now = time(0); + int force_event = p->force_event; + time_t now = time(0); - p->force_event = 0; - if (!p->destroyed && (FD_ISSET(p->fd, &in) || force_event == EVENT_INPUT)) - { - p->last_event = now; - (*p->fun)(p, EVENT_INPUT); - } - if (!p->destroyed && (FD_ISSET(p->fd, &out) || - force_event == EVENT_OUTPUT)) - { - p->last_event = now; - (*p->fun)(p, EVENT_OUTPUT); - } - if (!p->destroyed && (FD_ISSET(p->fd, &except) || - force_event == EVENT_EXCEPT)) - { - p->last_event = now; - (*p->fun)(p, EVENT_EXCEPT); - } - if (!p->destroyed && ((p->max_idle && now - p->last_event > - p->max_idle) || force_event == EVENT_TIMEOUT)) - { - p->last_event = now; - (*p->fun)(p, EVENT_TIMEOUT); - } + p->force_event = 0; + if (!p->destroyed && (FD_ISSET(p->fd, &in) || + force_event == EVENT_INPUT)) + { + p->last_event = now; + (*p->fun)(p, EVENT_INPUT); } - for (p = iochans; p; p = nextp) + if (!p->destroyed && (FD_ISSET(p->fd, &out) || + force_event == EVENT_OUTPUT)) { - nextp = p->next; + p->last_event = now; + (*p->fun)(p, EVENT_OUTPUT); + } + if (!p->destroyed && (FD_ISSET(p->fd, &except) || + force_event == EVENT_EXCEPT)) + { + p->last_event = now; + (*p->fun)(p, EVENT_EXCEPT); + } + if (!p->destroyed && ((p->max_idle && now - p->last_event > + p->max_idle) || force_event == EVENT_TIMEOUT)) + { + p->last_event = now; + (*p->fun)(p, EVENT_TIMEOUT); + } + } + for (p = *iochans; p; p = nextp) + { + nextp = p->next; - if (p->destroyed) - { - IOCHAN tmp = p, pr; + if (p->destroyed) + { + IOCHAN tmp = p, pr; /* We need to inform the threadlist that this channel has been destroyed */ statserv_remove(p); - /* Now reset the pointers */ - if (p == iochans) - iochans = p->next; - else - { - for (pr = iochans; pr; pr = pr->next) - if (pr->next == p) - break; - assert(pr); /* grave error if it weren't there */ - pr->next = p->next; - } - if (nextp == p) - nextp = p->next; - xfree(tmp); - } + /* Now reset the pointers */ + if (p == *iochans) + *iochans = p->next; + else + { + for (pr = *iochans; pr; pr = pr->next) + if (pr->next == p) + break; + assert(pr); /* grave error if it weren't there */ + pr->next = p->next; + } + if (nextp == p) + nextp = p->next; + xfree(tmp); } + } } - while (iochans); + while (*iochans); return 0; } diff --git a/server/eventl.h b/server/eventl.h index 7288841..17dae69 100644 --- a/server/eventl.h +++ b/server/eventl.h @@ -4,7 +4,10 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: eventl.h,v $ - * Revision 1.9 1997-09-01 09:31:48 adam + * Revision 1.10 1998-01-29 13:30:23 adam + * Better event handle system for NT/Unix. + * + * Revision 1.9 1997/09/01 09:31:48 adam * Removed definition statserv_remove from statserv.h to eventl.h. * * Revision 1.8 1995/06/19 12:39:09 quinn @@ -78,13 +81,7 @@ int force_event; #define iochan_getnext(i) ((i)->next) #define iochan_settimeout(i, t) ((i)->max_idle = (t), (i)->last_event = time(0)) -IOCHAN iochan_getchan(void); IOCHAN iochan_create(int fd, IOC_CALLBACK cb, int flags); -#ifdef WINDOWS -int __stdcall event_loop(IOCHAN iochans); -#else -int event_loop(IOCHAN dummylistener); -#endif - +int event_loop(IOCHAN *iochans); void statserv_remove (IOCHAN pIOChannel); #endif diff --git a/server/session.h b/server/session.h index aefe3da..084da36 100644 --- a/server/session.h +++ b/server/session.h @@ -1,10 +1,13 @@ /* - * Copyright (C) 1995, Index Data I/S + * Copyright (C) 1995-1998, Index Data I/S * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: session.h,v $ - * Revision 1.12 1997-09-01 08:53:01 adam + * Revision 1.13 1998-01-29 13:30:23 adam + * Better event handle system for NT/Unix. + * + * Revision 1.12 1997/09/01 08:53:01 adam * New windows NT/95 port using MSV5.0. The test server 'ztest' was * moved a separate directory. MSV5.0 project server.dsp created. * As an option, the server can now operate as an NT service. @@ -115,6 +118,8 @@ typedef struct association int preferredMessageSize; int maximumRecordSize; int version; /* highest version-bit set (2 or 3) */ + + int (*bend_sort) (); } association; association *create_association(IOCHAN channel, COMSTACK link); diff --git a/server/statserv.c b/server/statserv.c index 9246daa..9cf20c8 100644 --- a/server/statserv.c +++ b/server/statserv.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995-1997, Index Data + * Copyright (c) 1995-1998, Index Data * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * @@ -7,7 +7,10 @@ * Chas Woodfield, Fretwell Downing Datasystem. * * $Log: statserv.c,v $ - * Revision 1.44 1997-11-07 13:31:52 adam + * Revision 1.45 1998-01-29 13:30:23 adam + * Better event handle system for NT/Unix. + * + * Revision 1.44 1997/11/07 13:31:52 adam * Added NT Service name part of statserv_options_block. Moved NT * service utility to server library. * @@ -170,17 +173,17 @@ #include #include -#include "eventl.h" -#include "session.h" #include #include #ifdef USE_XTIMOSI #include #endif #include +#include "eventl.h" +#include "session.h" #include -static IOCHAN pListener; +static IOCHAN pListener = NULL; static char *me = "statserver"; /* @@ -211,12 +214,12 @@ static statserv_options_block control_block = { typedef struct _ThreadList ThreadList; -typedef struct _ThreadList +struct _ThreadList { HANDLE hThread; IOCHAN pIOChannel; ThreadList *pNext; -} ThreadList; +}; static ThreadList *pFirstThread; static CRITICAL_SECTION Thread_CritSect; @@ -359,6 +362,11 @@ void statserv_closedown() } } +int __stdcall event_loop_thread (IOCHAN iochan) +{ + return event_loop (&iochan); +} + static void listener(IOCHAN h, int event) { COMSTACK line = (COMSTACK) iochan_getdata(h); @@ -418,11 +426,12 @@ static void listener(IOCHAN h, int event) #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, new_chan, - 0, &ThreadId) == NULL) */ + /* 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, new_chan, 0, &ThreadId); + NewHandle = (HANDLE)_beginthreadex(NULL, 0, event_loop_thread, + new_chan, 0, &ThreadId); if (NewHandle == (HANDLE)-1) { @@ -453,9 +462,9 @@ void statserv_remove(IOCHAN pIOChannel) void statserv_closedown() { - /* We don't need todoanything here - or do we */ - if (pListener != NULL) - iochan_destroy(pListener); + IOCHAN p; + for (p = pListener; p; p = p->next) + iochan_destroy(p); } static void listener(IOCHAN h, int event) @@ -491,7 +500,7 @@ static void listener(IOCHAN h, int event) close(hand[0]); child = 1; - for (pp = iochan_getchan(); pp; pp = iochan_getnext(pp)) + for (pp = pListener; pp; pp = iochan_getnext(pp)) { if (pp != h) { @@ -554,7 +563,7 @@ static void listener(IOCHAN h, int event) { IOCHAN pp; /* close our half of the listener socket */ - for (pp = iochan_getchan(); pp; pp = iochan_getnext(pp)) + for (pp = pListener; pp; pp = iochan_getnext(pp)) { COMSTACK l = iochan_getdata(pp); cs_close(l); @@ -574,6 +583,8 @@ static void listener(IOCHAN h, int event) iochan_destroy(h); return; } + new_chan->next = pListener; + pListener = new_chan; if (!(newas = create_association(new_chan, new_line))) { logf(LOG_FATAL, "Failed to create new assoc."); @@ -714,7 +725,6 @@ void statserv_setcontrol(statserv_options_block *block) memcpy(&control_block, block, sizeof(*block)); } - int statserv_start(int argc, char **argv) { int ret, listeners = 0, inetd = 0, r; @@ -798,7 +808,7 @@ int statserv_start(int argc, char **argv) } if ((pListener == NULL) && *control_block.default_listen) - add_listener(control_block.default_listen, protocol); + add_listener(control_block.default_listen, protocol); #ifndef WINDOWS if (inetd) @@ -832,7 +842,7 @@ int statserv_start(int argc, char **argv) if (pListener == NULL) ret = 1; else - ret = event_loop(pListener); + ret = event_loop(&pListener); nmem_exit (); return ret; }