s3:messages: improve tevent_create_immediate recycling

[samba.git] / source3 / lib / messages.c

diff --git a/source3/lib/messages.c b/source3/lib/messages.c
index 45e210ff75eeaa268d0563a37e177cae627633b9..82a177856f60d0bed089ab589a9d93f7a4f22ee8 100644 (file)
--- a/source3/lib/messages.c
+++ b/source3/lib/messages.c
@@ -213,6 +213,13 @@ static bool messaging_register_event_context(struct messaging_context *ctx,
        }
 
        if (free_reg == NULL) {
+               struct tevent_immediate *im = NULL;
+
+               im = tevent_create_immediate(ctx);
+               if (im == NULL) {
+                       return false;
+               }
+
                tmp = talloc_realloc(ctx, ctx->event_contexts,
                                     struct messaging_registered_ev,
                                     num_event_contexts+1);
@@ -222,9 +229,14 @@ static bool messaging_register_event_context(struct messaging_context *ctx,
                ctx->event_contexts = tmp;
 
                free_reg = &ctx->event_contexts[num_event_contexts];
+               free_reg->im = talloc_move(ctx->event_contexts, &im);
        }
 
-       *free_reg = (struct messaging_registered_ev) { .ev = ev, .refcount = 1 };
+       /*
+        * free_reg->im might be cached
+        */
+       free_reg->ev = ev;
+       free_reg->refcount = 1;
 
        return true;
 }
@@ -247,6 +259,16 @@ static bool messaging_deregister_event_context(struct messaging_context *ctx,
                        reg->refcount -= 1;
 
                        if (reg->refcount == 0) {
+                               /*
+                                * The primary event context
+                                * is never unregistered using
+                                * messaging_deregister_event_context()
+                                * it's only registered using
+                                * messaging_register_event_context().
+                                */
+                               SMB_ASSERT(ev != ctx->event_ctx);
+                               SMB_ASSERT(reg->ev != ctx->event_ctx);
+
                                /*
                                 * Not strictly necessary, just
                                 * paranoia
@@ -256,7 +278,14 @@ static bool messaging_deregister_event_context(struct messaging_context *ctx,
                                /*
                                 * Do not talloc_free(reg->im),
                                 * recycle immediates events.
+                                *
+                                * We just invalidate it using
+                                * the primary event context,
+                                * which is never unregistered.
                                 */
+                               tevent_schedule_immediate(reg->im,
+                                                         ctx->event_ctx,
+                                                         NULL, NULL);
                        }
                        return true;
                }
@@ -329,15 +358,6 @@ static bool messaging_alert_event_contexts(struct messaging_context *ctx)
                        continue;
                }
 
-               if (reg->im == NULL) {
-                       reg->im = tevent_create_immediate(
-                               ctx->event_contexts);
-               }
-               if (reg->im == NULL) {
-                       DBG_WARNING("Could not create immediate\n");
-                       continue;
-               }
-
                /*
                 * We depend on schedule_immediate to work
                 * multiple times. Might be a bit inefficient,