Changes in lib/events_libevent.c [9ff5737:04026d4]

File:

• lib/events_libevent.c (modified) (4 diffs)

lib/events_libevent.c

@@ -32 +32 @@
 #include <unistd.h>
 #include <sys/types.h>
+#include "proxy.h"
+
 #include <sys/time.h>
 #include <event.h>
-#include "proxy.h"
-
-static void b_main_restart();
-static guint id_next = 1;
+
+static guint id_next;
 static GHashTable *id_hash;
 static int quitting = 0;
@@ -48 +48 @@
 static GHashTable *write_hash;
 
-struct event_base *leh;
-struct event_base *old_leh;
-
 struct b_event_data
 {
@@ -62 +59 @@
 void b_main_init()
 {
-        if( leh != NULL )
-        {
-                /* Clean up the hash tables? */
-                
-                b_main_restart();
-                old_leh = leh;
-        }
-        
-        leh = event_init();
-        
+        event_init();
+        
+        id_next = 1;
         id_hash = g_hash_table_new( g_int_hash, g_int_equal );
         read_hash = g_hash_table_new( g_int_hash, g_int_equal );
@@ -79 +69 @@
 void b_main_run()
 {
-        /* This while loop is necessary to exit the event loop and start a
-           different one (necessary for ForkDaemon mode). */
-        while( event_base_dispatch( leh ) == 0 && !quitting )
-        {
-                if( old_leh != NULL )
-                {
-                        /* For some reason this just isn't allowed...
-                           Possibly a bug in older versions, will see later.
-                        event_base_free( old_leh ); */
-                        old_leh = NULL;
-                }
-                
-                event_debug( "New event loop.\n" );
-        }
-}
-
-static void b_main_restart()
+        event_dispatch();
+}
+
+void b_main_quit()
 {
         struct timeval tv;
         
-        memset( &tv, 0, sizeof( struct timeval ) );
-        event_base_loopexit( leh, &tv );
-        
-        event_debug( "b_main_restart()\n" );
-}
-
-void b_main_quit()
-{
-        /* Tell b_main_run() that it shouldn't restart the loop. Also,
-           libevent sometimes generates events before really quitting,
+        /* libevent sometimes generates events before really quitting,
            we want to stop them. */
         quitting = 1;
         
-        b_main_restart();
+        memset( &tv, 0, sizeof( struct timeval ) );
+        event_loopexit( &tv );
 }