diff options
| author | Jeremy Allison <jra@samba.org> | 2017-11-10 19:26:55 -0800 |
|---|---|---|
| committer | Ralph Boehme <slow@samba.org> | 2017-11-17 12:43:01 +0100 |
| commit | 993fa5793fd6a95173eda574562661ab8959c544 (patch) | |
| tree | 289c86923ee569c09550470f1e9b2eff78a0e133 /lib | |
| parent | 3b16bfe483da19c500ab511fd3d8c81528cfe608 (diff) | |
| download | samba-993fa5793fd6a95173eda574562661ab8959c544.tar.gz | |
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 <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
Autobuild-User(master): Ralph Böhme <slow@samba.org>
Autobuild-Date(master): Fri Nov 17 12:43:01 CET 2017 on sn-devel-144
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/tevent/tevent_internal.h | 1 | ||||
| -rw-r--r-- | lib/tevent/tevent_threads.c | 4 |
2 files changed, 1 insertions, 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(); |