X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=server%2Fstatserv.c;h=f7d20254236a56d439fd8ea71528dc3c83db9bb4;hb=82780038a8dfa288d03d6e9c8ef9df5f4e67fbfe;hp=458f664a5fb9572c19be5c7bb1259717a9d10a69;hpb=8e4eabe621f8b8195faa6625a38a2e1ae7b68aa1;p=yaz-moved-to-github.git diff --git a/server/statserv.c b/server/statserv.c index 458f664..f7d2025 100644 --- a/server/statserv.c +++ b/server/statserv.c @@ -7,7 +7,15 @@ * Chas Woodfield, Fretwell Downing Informatics. * * $Log: statserv.c,v $ - * Revision 1.67 2000-11-23 10:58:32 adam + * Revision 1.69 2000-12-01 17:56:41 adam + * on WIN32 function statserv_closedown closes socket(s) to provoke close. + * + * Revision 1.68 2000/11/29 14:22:47 adam + * Implemented XML/SGML attributes for data1 so that d1_read reads them + * and d1_write generates proper attributes for XML/SGML records. Added + * register locking for threaded version. + * + * Revision 1.67 2000/11/23 10:58:32 adam * SSL comstack support. Separate POSIX thread support library. * * Revision 1.66 2000/10/06 12:00:28 adam @@ -416,6 +424,7 @@ void statserv_closedown() { /* Just destroy the IOCHAN, that should do the trick */ iochan_destroy(pCurrentThread->pIOChannel); + closesocket(pCurrentThread->pIOChannel->fd); /* Keep a running count of our handles */ iHandles++; @@ -445,6 +454,7 @@ void statserv_closedown() /* Now we can really do something */ if (iHandles > 0) { + logf (LOG_LOG, "waiting for %d to die", iHandles); /* This will now wait, until all the threads close */ WaitForMultipleObjects(iHandles, pThreadHandles, TRUE, INFINITE); @@ -714,13 +724,11 @@ static void *new_session (void *vp) if (mask) { - yaz_log (LOG_LOG, "new_session , accept incomplete"); cs_accept_mask = mask; /* accept didn't complete */ cs_get_mask = 0; } else { - yaz_log (LOG_LOG, "new_session , accept complete"); cs_accept_mask = 0; /* accept completed. */ cs_get_mask = mask = EVENT_INPUT; }