sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

tevent_poll: Use the poll_event_context_destructor always

Browse Source 
This is in preparation for the next patch to NULL out the event_ctx
pointers in the poll_ev->fresh list

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Volker Lendecke 2013-01-31 16:28:08 +01:00 committed by Jeremy Allison
parent e3309852f7
commit 3ce58cbcf3
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/tevent/tevent_poll.c
View File

@ -55,12 +55,18 @@ struct poll_event_context {
int exit_code;
};
static int poll_event_mt_destructor(struct poll_event_context *poll_ev)
static int poll_event_context_destructor(struct poll_event_context *poll_ev)
{
if (poll_ev->signal_fd != -1) {
close(poll_ev->signal_fd);
poll_ev->signal_fd = -1;
if (poll_ev->signal_fd == -1) {
/*
* Non-threaded, no signal pipe
*/
return 0;
}
close(poll_ev->signal_fd);
poll_ev->signal_fd = -1;
if (poll_ev->num_fds == 0) {
return 0;
}
@ -85,6 +91,7 @@ static int poll_event_context_init(struct tevent_context *ev)
poll_ev->ev = ev;
poll_ev->signal_fd = -1;
ev->additional_data = poll_ev;
talloc_set_destructor(poll_ev, poll_event_context_destructor);
return 0;
}
@ -140,7 +147,7 @@ static int poll_event_context_init_mt(struct tevent_context *ev)
poll_ev->num_fds = 1;
talloc_set_destructor(poll_ev, poll_event_mt_destructor);
talloc_set_destructor(poll_ev, poll_event_context_destructor);
return 0;
}