* Sebastian Hammer, Adam Dickmeiss
*
* $Log: zserver.c,v $
- * Revision 1.48 1997-09-17 12:19:19 adam
+ * Revision 1.51 1997-10-27 14:33:06 adam
+ * Moved towards generic character mapping depending on "structure"
+ * field in abstract syntax file. Fixed a few memory leaks. Fixed
+ * bug with negative integers when doing searches with relational
+ * operators.
+ *
+ * Revision 1.50 1997/09/29 09:08:36 adam
+ * Revised locking system to be thread safe for the server.
+ *
+ * Revision 1.49 1997/09/25 14:57:23 adam
+ * Windows NT port.
+ *
+ * Revision 1.48 1997/09/17 12:19:19 adam
* Zebra version corresponds to YAZ version 1.4.
* Changed Zebra server so that it doesn't depend on global common_resource.
*
*/
#include <stdio.h>
#include <assert.h>
+#ifdef WINDOWS
+#include <io.h>
+#include <process.h>
+#else
#include <unistd.h>
+#endif
#include <fcntl.h>
#include <data1.h>
#include <recctrl.h>
#include <dmalloc.h>
-#define USE_TIMES 1
-#ifdef __linux__
-#define USE_TIMES 1
-#endif
-
-#if USE_TIMES
-#include <sys/times.h>
-#endif
#include "zserver.h"
-
-#if USE_TIMES
-static struct tms tms1;
-static struct tms tms2;
-#endif
-
static int register_lock (ZServerInfo *zi)
{
time_t lastChange;
- int state = zebraServerLockGetState(zi->res, &lastChange);
+ int state = zebra_server_lock_get_state(zi, &lastChange);
switch (state)
{
default:
state = 0;
}
- zebraServerLock (zi->res, state);
+ zebra_server_lock (zi, state);
#if USE_TIMES
- times (&tms1);
+ times (&zi->tms1);
#endif
if (zi->registerState == state)
{
return -1;
}
zi->zti = zebTargetInfo_open (zi->records, 0);
- init_charmap (zi->res);
+
return 0;
}
static int waitSec = -1;
#if USE_TIMES
- times (&tms2);
+ times (&zi->tms2);
logf (LOG_LOG, "user/system: %ld/%ld",
- (long) (tms2.tms_utime - tms1.tms_utime),
- (long) (tms2.tms_stime - tms1.tms_stime));
+ (long) (zi->tms2.tms_utime - zi->tms1.tms_utime),
+ (long) (zi->tms2.tms_stime - zi->tms1.tms_stime));
#endif
if (waitSec == -1)
{
else
waitSec = 0;
}
+#ifdef WINDOWS
+#else
if (waitSec > 0)
sleep (waitSec);
+#endif
if (zi->registerState != -1)
- zebraServerUnlock (zi->registerState);
+ zebra_server_unlock (zi, zi->registerState);
}
bend_initresult *bend_init (bend_initrequest *q)
logf (LOG_FATAL, "Cannot open resource `%s'", sob->configname);
exit (1);
}
+ zebra_server_lock_init (zi);
zi->dh = data1_create ();
zi->bfs = bfs_create (res_get (zi->res, "register"));
bf_lockDir (zi->bfs, res_get (zi->res, "lockDir"));
zi->records = NULL;
zi->odr = odr_createmem (ODR_ENCODE);
zi->registered_sets = NULL;
+ zi->zebra_maps = zebra_maps_open (res_get(zi->res, "profilePath"));
return r;
}
void bend_close (void *handle)
{
ZServerInfo *zi = handle;
+
if (zi->records)
{
resultSetDestroy (zi);
+ zebTargetInfo_close (zi->zti, 0);
dict_close (zi->dict);
if (zi->isam)
is_close (zi->isam);
rec_close (&zi->records);
register_unlock (zi);
}
+ odr_destroy (zi->odr);
+ zebra_maps_close (zi->zebra_maps);
bfs_destroy (zi->bfs);
data1_destroy (zi->dh);
- return;
+ zebra_server_lock_destroy (zi);
+
+ res_close (zi->res);
+ xfree (zi);
+}
+
+#ifndef WINDOWS
+static void pre_init (struct statserv_options_block *sob)
+{
+ char *pidfile = "zebrasrv.pid";
+ int fd = creat (pidfile, 0666);
+
+ if (fd == -1)
+ logf (LOG_WARN|LOG_ERRNO, "creat %s", pidfile);
+ else
+ {
+ char pidstr[30];
+
+ sprintf (pidstr, "%ld", (long) getpid ());
+ write (fd, pidstr, strlen(pidstr));
+ close (fd);
+ }
}
+#endif
int main (int argc, char **argv)
{
sob = statserv_getcontrol ();
strcpy (sob->configname, FNAME_CONFIG);
+#ifndef WINDOWS
+ sob->pre_init = pre_init;
+#endif
statserv_setcontrol (sob);
return statserv_main (argc, argv);