Changeset 745 for trunk/server/source3/lib/g_lock.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/lib/g_lock.c (modified) (11 diffs)

trunk/server/source3/lib/g_lock.c

@@ -19 +19 @@
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "g_lock.h"
+#include "util_tdb.h"
+#include "ctdbd_conn.h"
+#include "../lib/util/select.h"
+#include "system/select.h"
+#include "messages.h"
 
 static NTSTATUS g_lock_force_unlock(struct g_lock_ctx *ctx, const char *name,
@@ -52 +58 @@
 
         result->db = db_open(result, lock_path("g_lock.tdb"), 0,
-                             TDB_CLEAR_IF_FIRST, O_RDWR|O_CREAT, 0700);
+                             TDB_CLEAR_IF_FIRST|TDB_INCOMPATIBLE_HASH, O_RDWR|O_CREAT, 0700);
         if (result->db == NULL) {
                 DEBUG(1, ("g_lock_init: Could not open g_lock.tdb"));
@@ -206 +212 @@
         }
 
-        self = procid_self();
+        self = messaging_server_id(ctx->msg);
         our_index = -1;
 
@@ -333 +339 @@
 
         while (true) {
-#ifdef CLUSTER_SUPPORT
-                fd_set _r_fds;
-#endif
-                fd_set *r_fds = NULL;
-                int max_fd = 0;
+                struct pollfd *pollfds;
+                int num_pollfds;
+                int saved_errno;
                 int ret;
                 struct timeval timeout_remaining, select_timeout;
@@ -385 +389 @@
                  */
 
+                /*
+                 * We allocate 2 entries here. One is needed anyway for
+                 * sys_poll and in the clustering case we might have to add
+                 * the ctdb fd. This avoids the realloc then.
+                 */
+                pollfds = TALLOC_ARRAY(talloc_tos(), struct pollfd, 2);
+                if (pollfds == NULL) {
+                        status = NT_STATUS_NO_MEMORY;
+                        break;
+                }
+                num_pollfds = 0;
+
 #ifdef CLUSTER_SUPPORT
                 if (lp_clustering()) {
-                        struct ctdbd_connection *conn = messaging_ctdbd_connection();
-
-                        r_fds = &_r_fds;
-                        FD_ZERO(r_fds);
-                        max_fd = ctdbd_conn_get_fd(conn);
-                        if (max_fd >= 0 && max_fd < FD_SETSIZE) {
-                                FD_SET(max_fd, r_fds);
-                        }
+                        struct ctdbd_connection *conn;
+                        conn = messaging_ctdbd_connection();
+
+                        pollfds[0].fd = ctdbd_conn_get_fd(conn);
+                        pollfds[0].events = POLLIN|POLLHUP;
+
+                        num_pollfds += 1;
                 }
 #endif
@@ -405 +420 @@
                                              &timeout_remaining);
 
-                ret = sys_select(max_fd + 1, r_fds, NULL, NULL,
-                                 &select_timeout);
+                ret = sys_poll(pollfds, num_pollfds,
+                               timeval_to_msec(select_timeout));
+
+                /*
+                 * We're not *really interested in the actual flags. We just
+                 * need to retry this whole thing.
+                 */
+                saved_errno = errno;
+                TALLOC_FREE(pollfds);
+                errno = saved_errno;
+
                 if (ret == -1) {
                         if (errno != EINTR) {
@@ -590 +614 @@
         NTSTATUS status;
 
-        status = g_lock_force_unlock(ctx, name, procid_self());
+        status = g_lock_force_unlock(ctx, name, messaging_server_id(ctx->msg));
 
 #ifdef CLUSTER_SUPPORT
@@ -707 +731 @@
                             struct tevent_context **pev,
                             struct messaging_context **pmsg,
+                            const struct server_id self,
                             struct g_lock_ctx **pg_ctx)
 {
@@ -718 +743 @@
                 goto fail;
         }
-        msg = messaging_init(mem_ctx, procid_self(), ev);
+        msg = messaging_init(mem_ctx, self, ev);
         if (msg == NULL) {
                 d_fprintf(stderr, "ERROR: could not init messaging context\n");
@@ -741 +766 @@
 
 NTSTATUS g_lock_do(const char *name, enum g_lock_type lock_type,
-                   struct timeval timeout,
+                   struct timeval timeout, const struct server_id self,
                    void (*fn)(void *private_data), void *private_data)
 {
@@ -749 +774 @@
         NTSTATUS status;
 
-        if (!g_lock_init_all(talloc_tos(), &ev, &msg, &g_ctx)) {
+        if (!g_lock_init_all(talloc_tos(), &ev, &msg, self, &g_ctx)) {
                 status = NT_STATUS_ACCESS_DENIED;
                 goto done;