Changeset b6a2373

Timestamp:

2007-11-28T23:24:26Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

9ff5737

Parents:

221a273

Message:

Fixed the epoll+ForkDaemon combination. The libevent event handling
didn't work very well on Linux 2.6 (and possibly others) in ForkDaemon
mode.

Files:

• bitlbee.c (modified) (1 diff)
• lib/events_libevent.c (modified) (4 diffs)

bitlbee.c

@@ -293 +293 @@
                         srand( time( NULL ) ^ getpid() );
                         
+                        b_main_init();
+                        
                         /* Close the listening socket, we're a client. */
                         close( global.listen_socket );

lib/events_libevent.c

@@ -37 +37 @@
 #include <event.h>
 
-static guint id_next;
+static void b_main_restart();
+
+static guint id_next = 1;
 static GHashTable *id_hash;
 static int quitting = 0;
@@ -48 +50 @@
 static GHashTable *write_hash;
 
+struct event_base *leh;
+struct event_base *old_leh;
+
 struct b_event_data
 {
@@ -59 +64 @@
 void b_main_init()
 {
-        event_init();
-        
-        id_next = 1;
+        if( leh != NULL )
+        {
+                /* Clean up the hash tables? */
+                
+                b_main_restart();
+                old_leh = leh;
+        }
+        
+        leh = event_init();
+        
         id_hash = g_hash_table_new( g_int_hash, g_int_equal );
         read_hash = g_hash_table_new( g_int_hash, g_int_equal );
@@ -69 +81 @@
 void b_main_run()
 {
-        event_dispatch();
+        /* 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;
+                }
+                
+                printf( "New event loop.\n" );
+        }
+}
+
+static void b_main_restart()
+{
+        struct timeval tv;
+        
+        memset( &tv, 0, sizeof( struct timeval ) );
+        event_base_loopexit( leh, &tv );
+        
+        printf( "b_main_restart()\n" );
 }
 
 void b_main_quit()
 {
-        struct timeval tv;
-        
-        /* libevent sometimes generates events before really quitting,
+        /* Tell b_main_run() that it shouldn't restart the loop. Also,
+           libevent sometimes generates events before really quitting,
            we want to stop them. */
         quitting = 1;
         
-        memset( &tv, 0, sizeof( struct timeval ) );
-        event_loopexit( &tv );
+        b_main_restart();
 }