diff options
Diffstat (limited to 'event-internal.h')
| -rw-r--r-- | event-internal.h | 205 |
1 files changed, 47 insertions, 158 deletions
diff --git a/event-internal.h b/event-internal.h index 66dcfc3..2f86b46 100644 --- a/event-internal.h +++ b/event-internal.h @@ -24,16 +24,14 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef EVENT_INTERNAL_H_INCLUDED_ -#define EVENT_INTERNAL_H_INCLUDED_ +#ifndef _EVENT_INTERNAL_H_ +#define _EVENT_INTERNAL_H_ #ifdef __cplusplus extern "C" { #endif #include "event2/event-config.h" -#include "evconfig-private.h" - #include <time.h> #include <sys/queue.h> #include "event2/event_struct.h" @@ -45,42 +43,18 @@ extern "C" { /* map union members back */ /* mutually exclusive */ -#define ev_signal_next ev_.ev_signal.ev_signal_next -#define ev_io_next ev_.ev_io.ev_io_next -#define ev_io_timeout ev_.ev_io.ev_timeout +#define ev_signal_next _ev.ev_signal.ev_signal_next +#define ev_io_next _ev.ev_io.ev_io_next +#define ev_io_timeout _ev.ev_io.ev_timeout /* used only by signals */ -#define ev_ncalls ev_.ev_signal.ev_ncalls -#define ev_pncalls ev_.ev_signal.ev_pncalls - -#define ev_pri ev_evcallback.evcb_pri -#define ev_flags ev_evcallback.evcb_flags -#define ev_closure ev_evcallback.evcb_closure -#define ev_callback ev_evcallback.evcb_cb_union.evcb_callback -#define ev_arg ev_evcallback.evcb_arg - -/** @name Event closure codes +#define ev_ncalls _ev.ev_signal.ev_ncalls +#define ev_pncalls _ev.ev_signal.ev_pncalls - Possible values for evcb_closure in struct event_callback - - @{ - */ -/** A regular event. Uses the evcb_callback callback */ -#define EV_CLOSURE_EVENT 0 -/** A signal event. Uses the evcb_callback callback */ -#define EV_CLOSURE_EVENT_SIGNAL 1 -/** A persistent non-signal event. Uses the evcb_callback callback */ -#define EV_CLOSURE_EVENT_PERSIST 2 -/** A simple callback. Uses the evcb_selfcb callback. */ -#define EV_CLOSURE_CB_SELF 3 -/** A finalizing callback. Uses the evcb_cbfinalize callback. */ -#define EV_CLOSURE_CB_FINALIZE 4 -/** A finalizing event. Uses the evcb_evfinalize callback. */ -#define EV_CLOSURE_EVENT_FINALIZE 5 -/** A finalizing event that should get freed after. Uses the evcb_evfinalize - * callback. */ -#define EV_CLOSURE_EVENT_FINALIZE_FREE 6 -/** @} */ +/* Possible values for ev_closure in struct event. */ +#define EV_CLOSURE_NONE 0 +#define EV_CLOSURE_SIGNAL 1 +#define EV_CLOSURE_PERSIST 2 /** Structure to define the backend of a given event_base. */ struct eventop { @@ -125,7 +99,7 @@ struct eventop { size_t fdinfo_len; }; -#ifdef _WIN32 +#ifdef WIN32 /* If we're on win32, then file descriptors are not nice low densely packed integers. Instead, they are pointer-like windows handles, and we want to use a hashtable instead of an array to map fds to events. @@ -136,7 +110,6 @@ struct eventop { /* #define HT_CACHE_HASH_VALS */ #ifdef EVMAP_USE_HT -#define HT_NO_CACHE_HASH_VALUES #include "ht-internal.h" struct event_map_entry; HT_HEAD(event_io_map, event_map_entry); @@ -186,25 +159,14 @@ struct event_changelist { int changes_size; }; -#ifndef EVENT__DISABLE_DEBUG_MODE +#ifndef _EVENT_DISABLE_DEBUG_MODE /* Global internal flag: set to one if debug mode is on. */ -extern int event_debug_mode_on_; -#define EVENT_DEBUG_MODE_IS_ON() (event_debug_mode_on_) +extern int _event_debug_mode_on; +#define EVENT_DEBUG_MODE_IS_ON() (_event_debug_mode_on) #else #define EVENT_DEBUG_MODE_IS_ON() (0) #endif -TAILQ_HEAD(evcallback_list, event_callback); - -/* Sets up an event for processing once */ -struct event_once { - LIST_ENTRY(event_once) next_once; - struct event ev; - - void (*cb)(evutil_socket_t, short, void *); - void *arg; -}; - struct event_base { /** Function pointers and other data to describe this event_base's * backend. */ @@ -224,16 +186,10 @@ struct event_base { /** Number of virtual events */ int virtual_event_count; - /** Maximum number of virtual events active */ - int virtual_event_count_max; /** Number of total events added to this event_base */ int event_count; - /** Maximum number of total events added to this event_base */ - int event_count_max; /** Number of total events active in this event_base */ int event_count_active; - /** Maximum number of total events active in this event_base */ - int event_count_active_max; /** Set if we should terminate the loop once we're done processing * events. */ @@ -250,23 +206,14 @@ struct event_base { * reentrant invocation. */ int running_loop; - /** Set to the number of deferred_cbs we've made 'active' in the - * loop. This is a hack to prevent starvation; it would be smarter - * to just use event_config_set_max_dispatch_interval's max_callbacks - * feature */ - int n_deferreds_queued; - /* Active event management. */ - /** An array of nactivequeues queues for active event_callbacks (ones - * that have triggered, and whose callbacks need to be called). Low + /** An array of nactivequeues queues for active events (ones that + * have triggered, and whose callbacks need to be called). Low * priority numbers are more important, and stall higher ones. */ - struct evcallback_list *activequeues; + struct event_list *activequeues; /** The length of the activequeues array */ int nactivequeues; - /** A list of event_callbacks that should become active the next time - * we process events, but not this time. */ - struct evcallback_list active_later_queue; /* common timeout logic */ @@ -278,12 +225,22 @@ struct event_base { /** The total size of common_timeout_queues. */ int n_common_timeouts_allocated; + /** List of defered_cb that are active. We run these after the active + * events. */ + struct deferred_cb_queue defer_queue; + /** Mapping from file descriptors to enabled (added) events */ struct event_io_map io; /** Mapping from signal numbers to enabled (added) events. */ struct event_signal_map sigmap; + /** All events that have been enabled (added) in this event_base */ + struct event_list eventqueue; + + /** Stored timeval; used to detect when time is running backwards. */ + struct timeval event_tv; + /** Priority queue of events with timeouts. */ struct min_heap timeheap; @@ -291,30 +248,30 @@ struct event_base { * too often. */ struct timeval tv_cache; - struct evutil_monotonic_timer monotonic_timer; - +#if defined(_EVENT_HAVE_CLOCK_GETTIME) && defined(CLOCK_MONOTONIC) /** Difference between internal time (maybe from clock_gettime) and * gettimeofday. */ struct timeval tv_clock_diff; /** Second in which we last updated tv_clock_diff, in monotonic time. */ time_t last_updated_clock_diff; +#endif -#ifndef EVENT__DISABLE_THREAD_SUPPORT +#ifndef _EVENT_DISABLE_THREAD_SUPPORT /* threading support */ /** The thread currently running the event_loop for this base */ unsigned long th_owner_id; /** A lock to prevent conflicting accesses to this event_base */ 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 * event with waiters on it. */ void *current_event_cond; /** Number of threads blocking on current_event_cond. */ int current_event_waiters; #endif - /** The event whose callback is executing right now */ - struct event_callback *current_event; -#ifdef _WIN32 +#ifdef WIN32 /** IOCP support structure, if IOCP is enabled. */ struct event_iocp_port *iocp; #endif @@ -322,10 +279,6 @@ struct event_base { /** Flags that this base was configured with */ enum event_base_config_flag flags; - struct timeval max_dispatch_time; - int max_dispatch_callbacks; - int limit_callbacks_after_prio; - /* Notify main thread to wake up break, etc. */ /** True if the base already has a pending notify, and we don't need * to add any more. */ @@ -338,14 +291,6 @@ struct event_base { struct event th_notify; /** A function used to wake up the main thread from another thread. */ int (*th_notify_fn)(struct event_base *base); - - /** Saved seed for weak random number generator. Some backends use - * this to produce fairness among sockets. Protected by th_base_lock. */ - struct evutil_weakrand_state weakrand_seed; - - /** List of event_onces that have not yet fired. */ - LIST_HEAD(once_event_list, event_once) once_events; - }; struct event_config_entry { @@ -360,14 +305,12 @@ struct event_config { TAILQ_HEAD(event_configq, event_config_entry) entries; int n_cpus_hint; - struct timeval max_dispatch_interval; - int max_dispatch_callbacks; - int limit_callbacks_after_prio; enum event_method_feature require_features; enum event_base_config_flag flags; }; /* Internal use only: Functions that might be missing from <sys/queue.h> */ +#if defined(_EVENT_HAVE_SYS_QUEUE_H) #ifndef TAILQ_FIRST #define TAILQ_FIRST(head) ((head)->tqh_first) #endif @@ -393,56 +336,21 @@ struct event_config { (listelm)->field.tqe_prev = &(elm)->field.tqe_next; \ } while (0) #endif +#endif /* HAVE_SYS_QUEUE_H */ #define N_ACTIVE_CALLBACKS(base) \ - ((base)->event_count_active) + ((base)->event_count_active + (base)->defer_queue.active_count) -int evsig_set_handler_(struct event_base *base, int evsignal, +int _evsig_set_handler(struct event_base *base, int evsignal, void (*fn)(int)); -int evsig_restore_handler_(struct event_base *base, int evsignal); - -int event_add_nolock_(struct event *ev, - const struct timeval *tv, int tv_is_absolute); -/** Argument for event_del_nolock_. Tells event_del not to block on the event - * if it's running in another thread. */ -#define EVENT_DEL_NOBLOCK 0 -/** Argument for event_del_nolock_. Tells event_del to block on the event - * if it's running in another thread, regardless of its value for EV_FINALIZE - */ -#define EVENT_DEL_BLOCK 1 -/** Argument for event_del_nolock_. Tells event_del to block on the event - * if it is running in another thread and it doesn't have EV_FINALIZE set. - */ -#define EVENT_DEL_AUTOBLOCK 2 -/** Argument for event_del_nolock_. Tells event_del to procede even if the - * event is set up for finalization rather for regular use.*/ -#define EVENT_DEL_EVEN_IF_FINALIZING 3 -int event_del_nolock_(struct event *ev, int blocking); -int event_remove_timer_nolock_(struct event *ev); - -void event_active_nolock_(struct event *ev, int res, short count); -int event_callback_activate_(struct event_base *, struct event_callback *); -int event_callback_activate_nolock_(struct event_base *, struct event_callback *); -int event_callback_cancel_(struct event_base *base, - struct event_callback *evcb); - -void event_callback_finalize_nolock_(struct event_base *base, unsigned flags, struct event_callback *evcb, void (*cb)(struct event_callback *, void *)); -void event_callback_finalize_(struct event_base *base, unsigned flags, struct event_callback *evcb, void (*cb)(struct event_callback *, void *)); -int event_callback_finalize_many_(struct event_base *base, int n_cbs, struct event_callback **evcb, void (*cb)(struct event_callback *, void *)); - - -void event_active_later_(struct event *ev, int res); -void event_active_later_nolock_(struct event *ev, int res); -int event_callback_activate_later_nolock_(struct event_base *base, - struct event_callback *evcb); -int event_callback_cancel_nolock_(struct event_base *base, - struct event_callback *evcb, int even_if_finalizing); -void event_callback_init_(struct event_base *base, - struct event_callback *cb); +int _evsig_restore_handler(struct event_base *base, int evsignal); + + +void event_active_nolock(struct event *ev, int res, short count); /* FIXME document. */ -void event_base_add_virtual_(struct event_base *base); -void event_base_del_virtual_(struct event_base *base); +void event_base_add_virtual(struct event_base *base); +void event_base_del_virtual(struct event_base *base); /** For debugging: unless assertions are disabled, verify the referential integrity of the internal data structures of 'base'. This operation can @@ -450,30 +358,11 @@ void event_base_del_virtual_(struct event_base *base); Returns on success; aborts on failure. */ -void event_base_assert_ok_(struct event_base *base); -void event_base_assert_ok_nolock_(struct event_base *base); - - -/* Helper function: Call 'fn' exactly once every inserted or active event in - * the event_base 'base'. - * - * If fn returns 0, continue on to the next event. Otherwise, return the same - * value that fn returned. - * - * Requires that 'base' be locked. - */ -int event_base_foreach_event_nolock_(struct event_base *base, - event_base_foreach_event_cb cb, void *arg); - -/* Cleanup function to reset debug mode during shutdown. - * - * Calling this function doesn't mean it'll be possible to re-enable - * debug mode if any events were added. - */ -void event_disable_debug_mode(void); +void event_base_assert_ok(struct event_base *base); #ifdef __cplusplus } #endif -#endif /* EVENT_INTERNAL_H_INCLUDED_ */ +#endif /* _EVENT_INTERNAL_H_ */ + |