Changeset 988 for vendor/current/source3/lib/fncall.c

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

• vendor/current/source3/lib/fncall.c (modified) (11 diffs)

vendor/current/source3/lib/fncall.c

@@ -21 +21 @@
 #include "../lib/util/tevent_unix.h"
 
-#if WITH_PTHREADPOOL
-
 #include "lib/pthreadpool/pthreadpool.h"
 
@@ -43 +41 @@
         int num_orphaned;
 
-        struct fd_event *fde;
+        struct tevent_fd *fde;
 };
 
@@ -125 +123 @@
 
 static void fncall_unset_pending(struct tevent_req *req);
-static int fncall_destructor(struct tevent_req *req);
+static void fncall_cleanup(struct tevent_req *req,
+                           enum tevent_req_state req_state);
 
 static bool fncall_set_pending(struct tevent_req *req,
@@ -144 +143 @@
         num_pending += 1;
         ctx->pending = pending;
-        talloc_set_destructor(req, fncall_destructor);
+        tevent_req_set_cleanup_fn(req, fncall_cleanup);
 
         /*
          * Make sure that the orphaned array of fncall_state structs has
          * enough space. A job can change from pending to orphaned in
-         * fncall_destructor, and to fail in a talloc destructor should be
+         * fncall_cleanup, and to fail in a talloc destructor should be
          * avoided if possible.
          */
@@ -187 +186 @@
         int i;
 
+        tevent_req_set_cleanup_fn(req, NULL);
+
         if (num_pending == 1) {
                 TALLOC_FREE(ctx->fde);
@@ -208 +209 @@
 }
 
-static int fncall_destructor(struct tevent_req *req)
+static void fncall_cleanup(struct tevent_req *req,
+                           enum tevent_req_state req_state)
 {
         struct fncall_state *state = tevent_req_data(
@@ -214 +216 @@
         struct fncall_context *ctx = state->ctx;
 
+        switch (req_state) {
+        case TEVENT_REQ_RECEIVED:
+                break;
+        default:
+                return;
+        }
+
         fncall_unset_pending(req);
 
         if (state->done) {
-                return 0;
+                return;
         }
 
@@ -226 +235 @@
         ctx->orphaned[ctx->num_orphaned] = talloc_move(ctx->orphaned, &state);
         ctx->num_orphaned += 1;
-
-        return 0;
 }
 
@@ -267 +274 @@
         }
         if (!fncall_set_pending(req, state->ctx, ev)) {
-                tevent_req_nomem(NULL, req);
+                tevent_req_oom(req);
                 return tevent_req_post(req, ev);
         }
@@ -281 +288 @@
         int job_id;
 
-        if (pthreadpool_finished_job(ctx->pool, &job_id) != 0) {
+        if (pthreadpool_finished_jobs(ctx->pool, &job_id, 1) < 0) {
                 return;
         }
@@ -324 +331 @@
         return 0;
 }
-
-#else  /* WITH_PTHREADPOOL */
-
-struct fncall_context {
-        uint8_t dummy;
-};
-
-struct fncall_context *fncall_context_init(TALLOC_CTX *mem_ctx,
-                                           int max_threads)
-{
-        return talloc(mem_ctx, struct fncall_context);
-}
-
-struct fncall_state {
-        uint8_t dummy;
-};
-
-struct tevent_req *fncall_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
-                               struct fncall_context *ctx,
-                               void (*fn)(void *private_data),
-                               void *private_data)
-{
-        struct tevent_req *req;
-        struct fncall_state *state;
-
-        req = tevent_req_create(mem_ctx, &state, struct fncall_state);
-        if (req == NULL) {
-                return NULL;
-        }
-        fn(private_data);
-        tevent_req_post(req, ev);
-        return req;
-}
-
-int fncall_recv(struct tevent_req *req, int *perr)
-{
-        return 0;
-}
-
-#endif