Index: base/third_party/libevent/event.c |
diff --git a/base/third_party/libevent/event.c b/base/third_party/libevent/event.c |
index 36b1c51bcad1b46ad353cded7b355961f6d4582b..4aa326e0e46d3d98e780df0bd6ba1ac1038efd7d 100644 |
--- a/base/third_party/libevent/event.c |
+++ b/base/third_party/libevent/event.c |
@@ -109,10 +109,6 @@ struct event_base *current_base = NULL; |
extern struct event_base *evsignal_base; |
static int use_monotonic = 1; |
-/* Handle signals - This is a deprecated interface */ |
-int (*event_sigcb)(void); /* Signal callback when gotsig is set */ |
-volatile sig_atomic_t event_gotsig; /* Set in signal handler */ |
- |
/* Prototypes */ |
static void event_queue_insert(struct event_base *, struct event *, int); |
static void event_queue_remove(struct event_base *, struct event *, int); |
@@ -168,9 +164,6 @@ event_base_new(void) |
if ((base = calloc(1, sizeof(struct event_base))) == NULL) |
event_err(1, "%s: calloc", __func__); |
- event_sigcb = NULL; |
- event_gotsig = 0; |
- |
gettime(base, &base->event_tv); |
min_heap_ctor(&base->timeheap); |
@@ -386,7 +379,7 @@ event_process_active(struct event_base *base) |
ncalls--; |
ev->ev_ncalls = ncalls; |
(*ev->ev_callback)((int)ev->ev_fd, ev->ev_res, ev->ev_arg); |
- if (event_gotsig || base->event_break) |
+ if (base->event_break) |
return; |
} |
} |
@@ -491,18 +484,6 @@ event_base_loop(struct event_base *base, int flags) |
break; |
} |
- /* You cannot use this interface for multi-threaded apps */ |
- while (event_gotsig) { |
- event_gotsig = 0; |
- if (event_sigcb) { |
- res = (*event_sigcb)(); |
- if (res == -1) { |
- errno = EINTR; |
- return (-1); |
- } |
- } |
- } |
- |
timeout_correct(base, &tv); |
tv_p = &tv; |