From 135a5102a3e5422a1c9c8ad28f58888eea4a2545 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 6 Dec 2011 19:49:20 -0500
Subject: Revert "Make pending libevent actions cancelable"

This reverts commit aba25a6939a5907d40dbcff7433a8c130ffd12ad.
---
 src/common/compat_libevent.c | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

(limited to 'src/common/compat_libevent.c')

diff --git a/src/common/compat_libevent.c b/src/common/compat_libevent.c
index 67f465927c..3a754bef70 100644
--- a/src/common/compat_libevent.c
+++ b/src/common/compat_libevent.c
@@ -558,17 +558,17 @@ tor_check_libevent_header_compatibility(void)
 #endif
 }
 
-struct tor_libevent_action_t {
+typedef struct runnable_t {
   struct event *ev;
   void (*cb)(void *arg);
   void *arg;
-};
+} runnable_t;
 
 /** Callback for tor_run_in_libevent_loop */
 static void
 run_runnable_cb(evutil_socket_t s, short what, void *arg)
 {
-  tor_libevent_action_t *r = arg;
+  runnable_t *r = arg;
   void (*cb)(void *) = r->cb;
   void *cb_arg = r->arg;
   (void)what;
@@ -584,32 +584,22 @@ run_runnable_cb(evutil_socket_t s, short what, void *arg)
  * deep inside a no-reentrant code and there's some function you want to call
  * without worrying about whether it might cause reeentrant invocation.
  */
-tor_libevent_action_t *
+int
 tor_run_in_libevent_loop(void (*cb)(void *arg), void *arg)
 {
-  tor_libevent_action_t *r = tor_malloc(sizeof(tor_libevent_action_t));
+  runnable_t *r = tor_malloc(sizeof(runnable_t));
   r->cb = cb;
   r->arg = arg;
   r->ev = tor_event_new(tor_libevent_get_base(), -1, EV_TIMEOUT,
                         run_runnable_cb, r);
   if (!r->ev) {
     tor_free(r);
-    return NULL;
+    return -1;
   }
   /* Make the event active immediately. */
   event_active(r->ev, EV_TIMEOUT, 1);
 
-  return r;
-}
-
-/**
- * Cancel <b>action</b> without running it.
- */
-void
-tor_cancel_libevent_action(tor_libevent_action_t *action)
-{
-  tor_event_free(action->ev);
-  tor_free(action);
+  return 0;
 }
 
 /*
-- 
cgit v1.2.3-54-g00ecf