Changeset: 771f2dca833f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=771f2dca833f
Modified Files:
sql/backends/monet5/merovingian/client/Makefile.ag
sql/backends/monet5/merovingian/client/monetdb.c
sql/backends/monet5/merovingian/daemon/Makefile.ag
sql/backends/monet5/merovingian/daemon/merovingian.c
sql/backends/monet5/merovingian/utils/utils.c
sql/backends/monet5/merovingian/utils/utils.h
Branch: default
Log Message:
Get completely rid of all copies of gdk_lockf.
diffs (101 lines):
diff --git a/sql/backends/monet5/merovingian/client/Makefile.ag
b/sql/backends/monet5/merovingian/client/Makefile.ag
--- a/sql/backends/monet5/merovingian/client/Makefile.ag
+++ b/sql/backends/monet5/merovingian/client/Makefile.ag
@@ -21,6 +21,7 @@
# COMMON: stream
INCLUDES = ../../../../../monetdb5/misc \
../../../../../common/stream \
+ ../../../../../common/utils \
../utils
EXTRA_DIST = $(man_MANS)
diff --git a/sql/backends/monet5/merovingian/client/monetdb.c
b/sql/backends/monet5/merovingian/client/monetdb.c
--- a/sql/backends/monet5/merovingian/client/monetdb.c
+++ b/sql/backends/monet5/merovingian/client/monetdb.c
@@ -39,6 +39,7 @@
#include "database.h"
#include "control.h"
#include <msabaoth.h>
+#include <mutils.h>
#include <stdlib.h> /* exit, getenv, qsort */
#include <stdarg.h> /* variadic stuff */
#include <stdio.h> /* fprintf, rename */
@@ -1401,7 +1402,7 @@
mero_running = 1;
snprintf(buf, 1024, "%s/.merovingian_lock", dbfarm);
- fd = gdk_lockf(buf);
+ fd = MT_lockf(buf, F_TLOCK, 4, 1);
if (fd >= 0 || fd <= -2) {
if (fd >= 0) {
close(fd);
diff --git a/sql/backends/monet5/merovingian/daemon/Makefile.ag
b/sql/backends/monet5/merovingian/daemon/Makefile.ag
--- a/sql/backends/monet5/merovingian/daemon/Makefile.ag
+++ b/sql/backends/monet5/merovingian/daemon/Makefile.ag
@@ -21,6 +21,7 @@
INCLUDES = .. \
../../../../../monetdb5/misc \
../../../../../common/stream \
+ ../../../../../common/utils \
../../../../../clients/mapilib
EXTRA_DIST = $(man_MANS) \
diff --git a/sql/backends/monet5/merovingian/daemon/merovingian.c
b/sql/backends/monet5/merovingian/daemon/merovingian.c
--- a/sql/backends/monet5/merovingian/daemon/merovingian.c
+++ b/sql/backends/monet5/merovingian/daemon/merovingian.c
@@ -52,6 +52,7 @@
#include "monetdb_config.h"
#include <msabaoth.h>
+#include <mutils.h>
#include <utils/utils.h>
#include <utils/properties.h>
#include <utils/glob.h>
@@ -692,7 +693,7 @@
}
/* lock such that we are alone on this world */
- if ((ret = gdk_lockf(".merovingian_lock")) == -1) {
+ if ((ret = MT_lockf(".merovingian_lock", F_TLOCK, 4, 1)) == -1) {
/* locking failed */
Mfprintf(stderr, "another merovingian is already running\n");
MERO_EXIT(1);
diff --git a/sql/backends/monet5/merovingian/utils/utils.c
b/sql/backends/monet5/merovingian/utils/utils.c
--- a/sql/backends/monet5/merovingian/utils/utils.c
+++ b/sql/backends/monet5/merovingian/utils/utils.c
@@ -397,24 +397,4 @@
(void) select(0, NULL, NULL, NULL, &tv);
}
-/* returns -1 when locking failed,
- * returns -2 when the lock file could not be opened/created
- * returns the (open) file descriptor to the file otherwise */
-int
-gdk_lockf(const char *filename)
-{
- int fd = open(filename, O_CREAT | O_RDWR,
- S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH |
S_IWOTH);
-
- if (fd < 0)
- return -2;
-
- if (lseek(fd, 4, SEEK_SET) == 4 && lockf(fd, 2, 1) == 0) {
- /* do not close else we lose the lock we want */
- return fd;
- }
- close(fd);
- return -1;
-}
-
/* vim:set ts=4 sw=4 noexpandtab: */
diff --git a/sql/backends/monet5/merovingian/utils/utils.h
b/sql/backends/monet5/merovingian/utils/utils.h
--- a/sql/backends/monet5/merovingian/utils/utils.h
+++ b/sql/backends/monet5/merovingian/utils/utils.h
@@ -49,7 +49,6 @@
char *generatePassphraseFile(char *path);
char *generateUUID(void);
void sleep_ms(size_t ms);
-int gdk_lockf(const char *filename);
#endif
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
