cuberite/libevent
1
0
Fork 0
mirror of https://github.com/cuberite/libevent.git synced 2025-09-14 06:49:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make the event_finalize* functions return an error code

Browse Source
This commit is contained in:
Nick Mathewson 2013-04-26 11:57:40 -04:00
parent a800b913ac
commit 5d11f4f39a
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
event.c
View File

@ -2044,7 +2044,7 @@ event_debug_unassign(struct event *ev)
} }
#define EVENT_FINALIZE_FREE_ 0x10000 #define EVENT_FINALIZE_FREE_ 0x10000
static void static int
event_finalize_nolock_(struct event_base *base, unsigned flags, struct event *ev, event_finalize_callback_fn cb) event_finalize_nolock_(struct event_base *base, unsigned flags, struct event *ev, event_finalize_callback_fn cb)
{ {
uint8_t closure = (flags & EVENT_FINALIZE_FREE_) ? uint8_t closure = (flags & EVENT_FINALIZE_FREE_) ?
@ -2055,29 +2055,32 @@ event_finalize_nolock_(struct event_base *base, unsigned flags, struct event *ev
ev->ev_evcallback.evcb_cb_union.evcb_evfinalize = cb; ev->ev_evcallback.evcb_cb_union.evcb_evfinalize = cb;
event_active_nolock_(ev, EV_FINALIZE, 1); event_active_nolock_(ev, EV_FINALIZE, 1);
ev->ev_flags |= EVLIST_FINALIZING; ev->ev_flags |= EVLIST_FINALIZING;
return 0;
} }
static void static int
event_finalize_impl_(unsigned flags, struct event *ev, event_finalize_callback_fn cb) event_finalize_impl_(unsigned flags, struct event *ev, event_finalize_callback_fn cb)
{ {
int r;
struct event_base *base = ev->ev_base; struct event_base *base = ev->ev_base;
if (EVUTIL_FAILURE_CHECK(!base)) { if (EVUTIL_FAILURE_CHECK(!base)) {
event_warnx("%s: event has no event_base set.", __func__); event_warnx("%s: event has no event_base set.", __func__);
return; return -1;
} }
EVBASE_ACQUIRE_LOCK(base, th_base_lock); EVBASE_ACQUIRE_LOCK(base, th_base_lock);
event_finalize_nolock_(base, flags, ev, cb); r = event_finalize_nolock_(base, flags, ev, cb);
EVBASE_RELEASE_LOCK(base, th_base_lock); EVBASE_RELEASE_LOCK(base, th_base_lock);
return r;
} }
void int
event_finalize(unsigned flags, struct event *ev, event_finalize_callback_fn cb) event_finalize(unsigned flags, struct event *ev, event_finalize_callback_fn cb)
{ {
return event_finalize_impl_(flags, ev, cb); return event_finalize_impl_(flags, ev, cb);
} }
void int
event_free_finalize(unsigned flags, struct event *ev, event_finalize_callback_fn cb) event_free_finalize(unsigned flags, struct event *ev, event_finalize_callback_fn cb)
{ {
return event_finalize_impl_(flags|EVENT_FINALIZE_FREE_, ev, cb); return event_finalize_impl_(flags|EVENT_FINALIZE_FREE_, ev, cb);

6
include/event2/event.h
View File

@ -1046,10 +1046,12 @@ typedef void (*event_finalize_callback_fn)(struct event *, void *);
A finalizer callback must not make events pending or active. It must not A finalizer callback must not make events pending or active. It must not
add events, activate events, or attempt to "resucitate" the event being add events, activate events, or attempt to "resucitate" the event being
finalized in any way. finalized in any way.
@return 0 on succes, -1 on failure.
*/ */
/**@{*/ /**@{*/
void event_finalize(unsigned, struct event *, event_finalize_callback_fn); int event_finalize(unsigned, struct event *, event_finalize_callback_fn);
void event_free_finalize(unsigned, struct event *, event_finalize_callback_fn); int event_free_finalize(unsigned, struct event *, event_finalize_callback_fn);
/**@}*/ /**@}*/
/** /**