Changeset 988 for vendor/current/lib/tevent/tevent.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/lib/tevent/tevent.c (modified) (9 diffs)

vendor/current/lib/tevent/tevent.c

@@ -113 +113 @@
 static void tevent_backend_init(void)
 {
+        static bool done;
+
+        if (done) {
+                return;
+        }
+
+        done = true;
+
         tevent_select_init();
         tevent_poll_init();
+        tevent_poll_mt_init();
+#if defined(HAVE_EPOLL)
+        tevent_epoll_init();
+#elif defined(HAVE_SOLARIS_PORTS)
+        tevent_port_init();
+#endif
+
         tevent_standard_init();
-#ifdef HAVE_EPOLL
-        tevent_epoll_init();
-#endif
+}
+
+_PRIVATE_ const struct tevent_ops *tevent_find_ops_byname(const char *name)
+{
+        struct tevent_ops_list *e;
+
+        tevent_backend_init();
+
+        if (name == NULL) {
+                name = tevent_default_backend;
+        }
+        if (name == NULL) {
+                name = "standard";
+        }
+
+        for (e = tevent_backends; e != NULL; e = e->next) {
+                if (0 == strcmp(e->name, name)) {
+                        return e->ops;
+                }
+        }
+
+        return NULL;
 }
 
@@ -160 +194 @@
         }
 
+        ev->last_zero_timer = NULL;
         for (te = ev->timer_events; te; te = tn) {
                 tn = te->next;
@@ -186 +221 @@
         }
 
+        /* removing nesting hook or we get an abort when nesting is
+         * not allowed. -- SSS
+         * Note that we need to leave the allowed flag at its current
+         * value, otherwise the use in tevent_re_initialise() will
+         * leave the event context with allowed forced to false, which
+         * will break users that expect nesting to be allowed
+         */
+        ev->nesting.level = 0;
+        ev->nesting.hook_fn = NULL;
+        ev->nesting.hook_private = NULL;
+
         return 0;
 }
@@ -200 +246 @@
   NOTE: use tevent_context_init() inside of samba!
 */
-static struct tevent_context *tevent_context_init_ops(TALLOC_CTX *mem_ctx,
-                                                      const struct tevent_ops *ops)
+struct tevent_context *tevent_context_init_ops(TALLOC_CTX *mem_ctx,
+                                               const struct tevent_ops *ops,
+                                               void *additional_data)
 {
         struct tevent_context *ev;
@@ -212 +259 @@
 
         ev->ops = ops;
+        ev->additional_data = additional_data;
 
         ret = ev->ops->context_init(ev);
@@ -230 +278 @@
                                                   const char *name)
 {
-        struct tevent_ops_list *e;
-
-        tevent_backend_init();
-
-        if (name == NULL) {
-                name = tevent_default_backend;
-        }
-        if (name == NULL) {
-                name = "standard";
-        }
-
-        for (e=tevent_backends;e;e=e->next) {
-                if (strcmp(name, e->name) == 0) {
-                        return tevent_context_init_ops(mem_ctx, e->ops);
-                }
-        }
-        return NULL;
+        const struct tevent_ops *ops;
+
+        ops = tevent_find_ops_byname(name);
+        if (ops == NULL) {
+                return NULL;
+        }
+
+        return tevent_context_init_ops(mem_ctx, ops, NULL);
 }
 
@@ -392 +431 @@
 /*
   schedule an immediate event
-  return NULL on failure
 */
 void _tevent_schedule_immediate(struct tevent_immediate *im,
@@ -492 +530 @@
         }
 
+        tevent_trace_point_callback(ev, TEVENT_TRACE_BEFORE_LOOP_ONCE);
         ret = ev->ops->loop_once(ev, location);
+        tevent_trace_point_callback(ev, TEVENT_TRACE_AFTER_LOOP_ONCE);
 
         if (ev->nesting.level > 0) {
@@ -552 +592 @@
 
         while (!finished(private_data)) {
+                tevent_trace_point_callback(ev, TEVENT_TRACE_BEFORE_LOOP_ONCE);
                 ret = ev->ops->loop_once(ev, location);
+                tevent_trace_point_callback(ev, TEVENT_TRACE_AFTER_LOOP_ONCE);
                 if (ret != 0) {
                         break;