darn, forgot this

(This used to be ctdb commit 0feb5da60c0331f6c391622910ca1f436263ce46)

diff --git a/ctdb/common/ctdb_lockwait.c b/ctdb/common/ctdb_lockwait.c
new file mode 100644 (file)
index 0000000..11d9cd3
--- /dev/null
+++ b/ctdb/common/ctdb_lockwait.c
@@ -0,0 +1,108 @@
+/* 
+   wait for a tdb chain lock
+
+   Copyright (C) Andrew Tridgell  2006
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This library 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
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with this library; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+#include "includes.h"
+#include "lib/events/events.h"
+#include "system/filesys.h"
+#include "system/wait.h"
+#include "popt.h"
+#include "../include/ctdb_private.h"
+#include "db_wrap.h"
+#include "lib/tdb/include/tdb.h"
+
+
+struct lockwait_handle {
+       struct fd_event *fde;
+       int fd[2];
+       pid_t child;
+       void *private_data;
+       void (*callback)(void *);
+};
+
+static void lockwait_handler(struct event_context *ev, struct fd_event *fde, 
+                            uint16_t flags, void *private_data)
+{
+       struct lockwait_handle *h = talloc_get_type(private_data, 
+                                                    struct lockwait_handle);
+       void (*callback)(void *) = h->callback;
+       void *p = h->private_data;
+       talloc_set_destructor(h, NULL);
+       close(h->fd[0]);
+       talloc_free(h); 
+       callback(p);
+       waitpid(h->child, NULL, 0);
+}
+
+static int lockwait_destructor(struct lockwait_handle *h)
+{
+       close(h->fd[0]);
+       kill(h->child, SIGKILL);
+       waitpid(h->child, NULL, 0);
+       return 0;
+}
+
+
+struct lockwait_handle *ctdb_lockwait(struct ctdb_db_context *ctdb_db,
+                                     TDB_DATA key,
+                                     void (*callback)(void *), void *private_data)
+{
+       struct lockwait_handle *h;
+       int ret;
+
+       h = talloc_zero(ctdb_db, struct lockwait_handle);
+       if (h == NULL) {
+               return NULL;
+       }
+
+       ret = pipe(h->fd);
+       if (ret != 0) {
+               talloc_free(h);
+               return NULL;
+       }
+
+       h->child = fork();
+       if (h->child == (pid_t)-1) {
+               close(h->fd[0]);
+               close(h->fd[1]);
+               talloc_free(h);
+               return NULL;
+       }
+
+       h->callback = callback;
+       h->private_data = private_data;
+
+       if (h->child == 0) {
+               struct tdb_context *tdb = ctdb_db->ltdb->tdb;
+               /* in child */
+               tdb_chainlock(tdb, key);
+               _exit(0);
+       }
+
+       close(h->fd[1]);
+       talloc_set_destructor(h, lockwait_destructor);
+
+       h->fde = event_add_fd(ctdb_db->ctdb->ev, h, h->fd[0], EVENT_FD_READ, lockwait_handler, h);
+       if (h->fde == NULL) {
+               talloc_free(h);
+               return NULL;
+       }
+
+       return h;
+}

diff --git a/ctdb/tests/lockwait.c b/ctdb/tests/lockwait.c
index bb47bfdec0345734748ef8273d44445c2490a49f..b1c699fe2c544169c73a3c5d92c6c9581a1d55f0 100644 (file)
--- a/ctdb/tests/lockwait.c
+++ b/ctdb/tests/lockwait.c
@@ -41,7 +41,6 @@ static void lockwait_handler(struct event_context *ev, struct fd_event *fde,
                                                     struct lockwait_handle);
        void (*callback)(void *) = h->callback;
        void *p = h->private_data;
-       printf("%s\n", __location__);
        talloc_set_destructor(h, NULL);
        close(h->fd[0]);
        talloc_free(h);