From e1198997bc58403376ec5909ebd8ef872ee48591 Mon Sep 17 00:00:00 2001 From: Nick Mathewson <nickm@torproject.org> Date: Tue, 21 Sep 2010 22:44:39 -0400 Subject: [PATCH] Make event.c debugging messages report fds --- event.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/event.c b/event.c index 466b938c..c5f88096 100644 --- a/event.c +++ b/event.c @@ -1958,8 +1958,9 @@ event_add_internal(struct event *ev, const struct timeval *tv, _event_debug_assert_is_setup(ev); event_debug(( - "event_add: event: %p, %s%s%scall %p", + "event_add: event: %p (fd %d), %s%s%scall %p", ev, + (int)ev->ev_fd, ev->ev_events & EV_READ ? "EV_READ " : " ", ev->ev_events & EV_WRITE ? "EV_WRITE " : " ", tv ? "EV_TIMEOUT " : " ", @@ -2121,8 +2122,8 @@ event_del_internal(struct event *ev) struct event_base *base; int res = 0, notify = 0; - event_debug(("event_del: %p, callback %p", - ev, ev->ev_callback)); + event_debug(("event_del: %p (fd %d), callback %p", + ev, (int)ev->ev_fd, ev->ev_callback)); /* An event without a base has not been added */ if (ev->ev_base == NULL) @@ -2212,6 +2213,10 @@ event_active_nolock(struct event *ev, int res, short ncalls) { struct event_base *base; + event_debug(("event_active: %p (fd %d), res %d, callback %p", + ev, (int)ev->ev_fd, (int)res, ev->ev_callback)); + + /* We get different kinds of events, add them together */ if (ev->ev_flags & EVLIST_ACTIVE) { ev->ev_res |= res; -- 2.40.0