summaryrefslogtreecommitdiff
path: root/source3/lib
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2002-03-26 22:36:27 +0000
committerJeremy Allison <jra@samba.org>2002-03-26 22:36:27 +0000
commit64d20453d97f08e412a2dc51d8d131d630f63999 (patch)
tree3298780ef5589839657dead5b5ba32ec636f187c /source3/lib
parent42cfc17700744bda2288d7067fea34d690852bb3 (diff)
downloadsamba-64d20453d97f08e412a2dc51d8d131d630f63999.tar.gz
samba-64d20453d97f08e412a2dc51d8d131d630f63999.tar.bz2
samba-64d20453d97f08e412a2dc51d8d131d630f63999.zip
Don't hold the mutex for more than 20 seconds.
Jeremy. (This used to be commit 1b9f1a368f2f37700cef357ab4bbc0389ec06378)
Diffstat (limited to 'source3/lib')
-rw-r--r--source3/lib/messages.c36
-rw-r--r--source3/lib/util_file.c2
2 files changed, 33 insertions, 5 deletions
diff --git a/source3/lib/messages.c b/source3/lib/messages.c
index b745cbaf8b..7d0da4b158 100644
--- a/source3/lib/messages.c
+++ b/source3/lib/messages.c
@@ -464,6 +464,17 @@ BOOL message_send_all(TDB_CONTEXT *conn_tdb, int msg_type,
return True;
}
+static VOLATILE sig_atomic_t gotalarm;
+
+/***************************************************************
+ Signal function to tell us we timed out.
+****************************************************************/
+
+static void gotalarm_sig(void)
+{
+ gotalarm = 1;
+}
+
/**
* Lock the messaging tdb based on a string - this is used as a primitive
* form of mutex between smbd instances.
@@ -471,16 +482,33 @@ BOOL message_send_all(TDB_CONTEXT *conn_tdb, int msg_type,
* @param name A string identifying the name of the mutex.
*/
-BOOL message_named_mutex(const char *name)
+BOOL message_named_mutex(char *name, unsigned int timeout)
{
TDB_DATA key;
+ int ret;
- if (!message_init()) return False;
+ if (!message_init())
+ return False;
key.dptr = name;
key.dsize = strlen(name)+1;
- return (tdb_chainlock(tdb, key) == 0);
+ if (timeout) {
+ gotalarm = 0;
+ CatchSignal(SIGALRM, SIGNAL_CAST gotalarm_sig);
+ alarm(timeout);
+ }
+
+ ret = tdb_chainlock(tdb, key);
+
+ if (timeout) {
+ alarm(0);
+ CatchSignal(SIGALRM, SIGNAL_CAST SIG_IGN);
+ if (gotalarm)
+ return False;
+ }
+
+ return (ret == 0);
}
/**
@@ -489,7 +517,7 @@ BOOL message_named_mutex(const char *name)
* @param name A string identifying the name of the mutex.
*/
-void message_named_mutex_release(const char *name)
+void message_named_mutex_release(char *name)
{
TDB_DATA key;
diff --git a/source3/lib/util_file.c b/source3/lib/util_file.c
index 88d03e7472..e80267f84b 100644
--- a/source3/lib/util_file.c
+++ b/source3/lib/util_file.c
@@ -53,7 +53,7 @@ BOOL do_file_lock(int fd, int waitsecs, int type)
alarm(waitsecs);
ret = fcntl(fd, SMB_F_SETLKW, &lock);
alarm(0);
- CatchSignal(SIGALRM, SIGNAL_CAST SIG_DFL);
+ CatchSignal(SIGALRM, SIGNAL_CAST SIG_IGN);
if (gotalarm) {
DEBUG(0, ("do_file_lock: failed to %s file.\n",