From 27a2ef5c8bd52f4ce5a59038e12105263d7a5794 Mon Sep 17 00:00:00 2001 From: Azat Khuzhin Date: Fri, 24 Mar 2017 16:49:59 +0800 Subject: [PATCH] Make event_count macros cleaner Fixes: #489 (cherry picked from commit 177e2171cb44e3929fbb0ec43b1bffb325b0e8ed) --- event.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/event.c b/event.c index 89579a6b..918b412d 100644 --- a/event.c +++ b/event.c @@ -3150,10 +3150,6 @@ timeout_process(struct event_base *base) } } -#if (EVLIST_INTERNAL >> 4) != 1 -#error "Mismatch for value of EVLIST_INTERNAL" -#endif - #ifndef MAX #define MAX(a,b) (((a)>(b))?(a):(b)) #endif @@ -3161,13 +3157,13 @@ timeout_process(struct event_base *base) #define MAX_EVENT_COUNT(var, v) var = MAX(var, v) /* These are a fancy way to spell - if (flags & EVLIST_INTERNAL) + if (~flags & EVLIST_INTERNAL) base->event_count--/++; */ #define DECR_EVENT_COUNT(base,flags) \ - ((base)->event_count -= (~((flags) >> 4) & 1)) + ((base)->event_count -= !((flags) & EVLIST_INTERNAL)) #define INCR_EVENT_COUNT(base,flags) do { \ - ((base)->event_count += (~((flags) >> 4) & 1)); \ + ((base)->event_count += !((flags) & EVLIST_INTERNAL)); \ MAX_EVENT_COUNT((base)->event_count_max, (base)->event_count); \ } while (0) -- 2.40.0