From 2095877927505565a77a9da5e7837cfc53602d7b Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 10 Nov 2017 19:26:55 -0800 Subject: [PATCH] lib: tevent: Minor cleanup. wakeup_fd can always be gotten from the event context. We don't need to store it. I prefer this as it shows that we must always get wakeup_fd from the event context at time of use, rather than possibly storing an out-of-date variable. Signed-off-by: Jeremy Allison --- lib/tevent/tevent_internal.h | 1 - lib/tevent/tevent_threads.c | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/tevent/tevent_internal.h b/lib/tevent/tevent_internal.h index 47ea39b3cd1..ec3955e70a4 100644 --- a/lib/tevent/tevent_internal.h +++ b/lib/tevent/tevent_internal.h @@ -235,7 +235,6 @@ struct tevent_threaded_context { pthread_mutex_t event_ctx_mutex; #endif struct tevent_context *event_ctx; - int wakeup_fd; }; struct tevent_debug_ops { diff --git a/lib/tevent/tevent_threads.c b/lib/tevent/tevent_threads.c index 2e83f1b66c2..2c6e66b0904 100644 --- a/lib/tevent/tevent_threads.c +++ b/lib/tevent/tevent_threads.c @@ -424,7 +424,6 @@ struct tevent_threaded_context *tevent_threaded_context_create( return NULL; } tctx->event_ctx = ev; - tctx->wakeup_fd = ev->wakeup_fd; ret = pthread_mutex_init(&tctx->event_ctx_mutex, NULL); if (ret != 0) { @@ -489,14 +488,13 @@ void _tevent_threaded_schedule_immediate(struct tevent_threaded_context *tctx, } DLIST_ADD_END(ev->scheduled_immediates, im); + wakeup_fd = ev->wakeup_fd; ret = pthread_mutex_unlock(&ev->scheduled_mutex); if (ret != 0) { abort(); } - wakeup_fd = tctx->wakeup_fd; - ret = pthread_mutex_unlock(&tctx->event_ctx_mutex); if (ret != 0) { abort(); -- 2.15.0.448.gf294e3d99a-goog