GitHub/libevent
1
0
Fork 0
mirror of https://github.com/libevent/libevent.git synced 2025-01-31 09:12:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

make event_base_get_running_event build with threads disabled.

Browse Source
This commit is contained in:
Nick Mathewson 2012-04-03 14:53:00 -04:00
parent 55e8dc1ba2
commit 13dad99c2f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
event-internal.h
View File

@ -257,14 +257,14 @@ struct event_base {
unsigned long th_owner_id; unsigned long th_owner_id;
/** A lock to prevent conflicting accesses to this event_base */ /** A lock to prevent conflicting accesses to this event_base */
void *th_base_lock; void *th_base_lock;
/** The event whose callback is executing right now */
struct event *current_event;
/** A condition that gets signalled when we're done processing an /** A condition that gets signalled when we're done processing an
* event with waiters on it. */ * event with waiters on it. */
void *current_event_cond; void *current_event_cond;
/** Number of threads blocking on current_event_cond. */ /** Number of threads blocking on current_event_cond. */
int current_event_waiters; int current_event_waiters;
#endif #endif
/** The event whose callback is executing right now */
struct event *current_event;
#ifdef _WIN32 #ifdef _WIN32
/** IOCP support structure, if IOCP is enabled. */ /** IOCP support structure, if IOCP is enabled. */

4
event.c
View File

@ -1428,8 +1428,8 @@ event_process_active_single_queue(struct event_base *base,
ev->ev_res & EV_WRITE ? "EV_WRITE " : " ", ev->ev_res & EV_WRITE ? "EV_WRITE " : " ",
ev->ev_callback)); ev->ev_callback));
#ifndef EVENT__DISABLE_THREAD_SUPPORT
base->current_event = ev; base->current_event = ev;
#ifndef EVENT__DISABLE_THREAD_SUPPORT
base->current_event_waiters = 0; base->current_event_waiters = 0;
#endif #endif
@ -1449,8 +1449,8 @@ event_process_active_single_queue(struct event_base *base,
} }
EVBASE_ACQUIRE_LOCK(base, th_base_lock); EVBASE_ACQUIRE_LOCK(base, th_base_lock);
#ifndef EVENT__DISABLE_THREAD_SUPPORT
base->current_event = NULL; base->current_event = NULL;
#ifndef EVENT__DISABLE_THREAD_SUPPORT
if (base->current_event_waiters) { if (base->current_event_waiters) {
base->current_event_waiters = 0; base->current_event_waiters = 0;
EVTHREAD_COND_BROADCAST(base->current_event_cond); EVTHREAD_COND_BROADCAST(base->current_event_cond);