Remove deprecated global variables in libevent that cause tsan errors.

base/third_party/libevent/event.c

 /*
  * Copyright (c) 2000-2004 Niels Provos <provos@citi.umich.edu>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 91 matching lines @@
         &win32ops,
 #endif
         NULL
 };
 
 /* Global state */
 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);
 static int      event_haveevents(struct event_base *);
 
 static void     event_process_active(struct event_base *);
 
 static int      timeout_next(struct event_base *, struct timeval **);
 static void     timeout_process(struct event_base *);
 static void     timeout_correct(struct event_base *, struct timeval *);
@@ skipping 35 matching lines @@
 
 struct event_base *
 event_base_new(void)
 {
         int i;
         struct event_base *base;
 
         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);
         TAILQ_INIT(&base->eventqueue);
         base->sig.ev_signal_pair[0] = -1;
         base->sig.ev_signal_pair[1] = -1;
         
         base->evbase = NULL;
         for (i = 0; eventops[i] && !base->evbase; i++) {
                 base->evsel = eventops[i];
@@ skipping 195 matching lines @@
                 else
                         event_del(ev);
                 
                 /* Allows deletes to work */
                 ncalls = ev->ev_ncalls;
                 ev->ev_pncalls = &ncalls;
                 while (ncalls) {
                         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;
                 }
         }
 }
 
 /*
  * Wait continously for events.  We exit only if no events are left.
  */
 
 int
@@ skipping 84 matching lines @@
                 if (base->event_gotterm) {
                         base->event_gotterm = 0;
                         break;
                 }
 
                 if (base->event_break) {
                         base->event_break = 0;
                         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;
                 if (!base->event_count_active && !(flags & EVLOOP_NONBLOCK)) {
                         timeout_next(base, &tv_p);
                 } else {
                         /* 
                          * if we have active events, we just poll new events
                          * without waiting.
                          */
@@ skipping 492 matching lines @@
 /* 
  * No thread-safe interface needed - the information should be the same
  * for all threads.
  */
 
 const char *
 event_get_method(void)
 {
         return (current_base->evsel->name);
 }