-/*
- * Copyright (C) 1994-1996, Index Data I/S
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: locksrv.c,v $
- * Revision 1.8 1997-09-17 12:19:15 adam
- * Zebra version corresponds to YAZ version 1.4.
- * Changed Zebra server so that it doesn't depend on global common_resource.
- *
- * Revision 1.7 1997/09/04 13:58:04 adam
- * Added O_BINARY for open calls.
- *
- * Revision 1.6 1996/10/29 14:06:52 adam
- * Include zebrautl.h instead of alexutil.h.
- *
- * Revision 1.5 1996/05/15 11:58:18 adam
- * Changed some log messages.
- *
- * Revision 1.4 1996/04/10 16:01:27 quinn
- * Fixed order of path/filename.
- *
- * Revision 1.3 1995/12/11 11:43:29 adam
- * Locking based on fcntl instead of flock.
- * Setting commitEnable removed. Command line option -n can be used to
- * prevent commit if commit setting is defined in the configuration file.
- *
- * Revision 1.2 1995/12/08 16:22:55 adam
- * Work on update while servers are running. Three lock files introduced.
- * The servers reload their registers when necessary, but they don't
- * reestablish result sets yet.
- *
- * Revision 1.1 1995/12/07 17:38:47 adam
- * Work locking mechanisms for concurrent updates/commit.
- *
- */
+/* $Id: locksrv.c,v 1.17 2002-08-02 19:26:55 adam Exp $
+ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+ Index Data Aps
+
+This file is part of the Zebra server.
+
+Zebra is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Zebra; see the file LICENSE.zebra. If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
+*/
+
+
#include <stdio.h>
#include <assert.h>
+#ifdef WIN32
+#include <io.h>
+#else
#include <unistd.h>
+#endif
#include <sys/stat.h>
#include <fcntl.h>
#include <string.h>
#include "zserver.h"
-static int server_lock_cmt = -1;
-static int server_lock_org = -1;
+int zebra_server_lock_init (ZebraService zi)
+{
+ char path_prefix[1024];
+
+ zi->server_lock_cmt = NULL;
+ zi->server_lock_org = NULL;
+
+ zebra_lock_prefix (zi->res, path_prefix);
+ zi->server_path_prefix = (char *) xmalloc (strlen(path_prefix)+1);
+ strcpy (zi->server_path_prefix, path_prefix);
-int zebraServerLock (Res res, int commitPhase)
+ logf (LOG_DEBUG, "Locking system initialized");
+ return 0;
+}
+
+int zebra_server_lock_destroy (ZebraService zi)
{
- char pathPrefix[1024];
- char path[1024];
-
- zebraLockPrefix (res, pathPrefix);
+ xfree (zi->server_path_prefix);
+ zebra_lock_destroy (zi->server_lock_cmt);
+ zebra_lock_destroy (zi->server_lock_org);
+ logf (LOG_DEBUG, "Locking system destroyed");
+ return 0;
+}
- if (server_lock_cmt == -1)
+int zebra_server_lock (ZebraService zi, int commitPhase)
+{
+ if (!zi->server_lock_cmt)
{
- sprintf (path, "%s%s", pathPrefix, FNAME_COMMIT_LOCK);
- if ((server_lock_cmt = open (path, O_BINARY|O_CREAT|O_RDWR, 0666))
- == -1)
+ char path[1024];
+
+ strcpy (path, zi->server_path_prefix);
+ strcat (path, FNAME_COMMIT_LOCK);
+ if (!(zi->server_lock_cmt = zebra_lock_create (path, 0)))
{
logf (LOG_FATAL|LOG_ERRNO, "create %s", path);
return -1;
}
- assert (server_lock_org == -1);
+ assert (zi->server_lock_org == NULL);
- sprintf (path, "%s%s", pathPrefix, FNAME_ORG_LOCK);
- if ((server_lock_org = open (path, O_BINARY|O_CREAT|O_RDWR, 0666))
- == -1)
+ strcpy (path, zi->server_path_prefix);
+ strcat (path, FNAME_ORG_LOCK);
+ if (!(zi->server_lock_org = zebra_lock_create (path, 0)))
{
logf (LOG_FATAL|LOG_ERRNO, "create %s", path);
return -1;
if (commitPhase)
{
logf (LOG_DEBUG, "Server locks org");
- zebraLock (server_lock_org, 0);
+ zebra_lock (zi->server_lock_org);
}
else
{
logf (LOG_DEBUG, "Server locks cmt");
- zebraLock (server_lock_cmt, 0);
+ zebra_lock (zi->server_lock_cmt);
}
return 0;
}
-void zebraServerUnlock (int commitPhase)
+void zebra_server_unlock (ZebraService zi, int commitPhase)
{
- if (server_lock_org == -1)
+ if (zi->server_lock_org == NULL)
return;
- if (commitPhase)
- {
- logf (LOG_DEBUG, "Server unlocks org");
- zebraUnlock (server_lock_org);
- }
- else
- {
- logf (LOG_DEBUG, "Server unlocks cmt");
- zebraUnlock (server_lock_cmt);
- }
+ logf (LOG_DEBUG, "Server unlocks org");
+ zebra_unlock (zi->server_lock_org);
+ logf (LOG_DEBUG, "Server unlocks cmt");
+ zebra_unlock (zi->server_lock_cmt);
}
-int zebraServerLockGetState (Res res, time_t *timep)
+int zebra_server_lock_get_state (ZebraService zi, time_t *timep)
{
- char pathPrefix[1024];
char path[1024];
char buf[256];
int fd;
struct stat xstat;
- zebraLockPrefix (res, pathPrefix);
-
- sprintf (path, "%s%s", pathPrefix, FNAME_TOUCH_TIME);
+ strcpy (path, zi->server_path_prefix);
+ strcat (path, FNAME_TOUCH_TIME);
if (stat (path, &xstat) == -1)
*timep = 1;
else
- *timep = xstat.st_ctime;
-
- sprintf (path, "%s%s", pathPrefix, FNAME_MAIN_LOCK);
+ *timep = xstat.st_mtime;
+
+ strcpy (path, zi->server_path_prefix);
+ strcat (path, FNAME_MAIN_LOCK);
fd = open (path, O_BINARY|O_RDONLY);
if (fd == -1)
{