Changeset 782d988

Timestamp:

2006-05-13T19:01:14Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

19ac9c5

Parents:

309cb9e

Message:

libevent code works better with epoll() now in some (pretty common) situations.

Location:

protocols

Files:

• events.h (modified) (2 diffs)
• events_glib.c (modified) (1 diff)
• events_libevent.c (modified) (6 diffs)
• ssl_openssl.c (modified) (1 diff)

protocols/events.h

@@ -40 +40 @@
 
 typedef enum {
-        GAIM_INPUT_READ = 1 << 0,
-        GAIM_INPUT_WRITE = 1 << 1
+        GAIM_INPUT_READ = 1 << 1,
+        GAIM_INPUT_WRITE = 1 << 2
 } b_input_condition;
 typedef gboolean (*b_event_handler)(gpointer data, gint fd, b_input_condition cond);
@@ -49 +49 @@
 #define GAIM_ERR_COND   (G_IO_HUP | G_IO_ERR | G_IO_NVAL)
 
-// #define event_debug( x... ) printf( x )
-#define event_debug( x... )
+#define event_debug( x... ) printf( x )
+// #define event_debug( x... )
 
 G_MODULE_EXPORT void b_main_init();

protocols/events_glib.c

@@ -131 +131 @@
 void b_event_remove(gint tag)
 {
-        event_debug( "g_source_remove( %d )\n", tag );
+        event_debug( "b_event_remove( %d )\n", tag );
         
         if (tag > 0)

protocols/events_libevent.c

@@ -39 +39 @@
 static GHashTable *id_hash;
 
+/* Since libevent doesn't handle two event handlers for one fd-condition
+   very well (which happens sometimes when BitlBee changes event handlers
+   for a combination), let's buid some indexes so we can delete them here
+   already, just in time. */
+static GHashTable *read_hash;
+static GHashTable *write_hash;
+
 struct b_event_data
 {
@@ -53 +60 @@
         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 );
+        write_hash = g_hash_table_new( g_int_hash, g_int_equal );
 }
 
@@ -97 +106 @@
 gint b_input_add( gint fd, b_input_condition condition, b_event_handler function, gpointer data )
 {
+        struct b_event_data *b_ev;
+        
+        event_debug( "b_input_add( %d, %d, 0x%x, 0x%x ) ", fd, condition, function, data );
+        
+        if( ( condition & GAIM_INPUT_READ  && ( b_ev = g_hash_table_lookup( read_hash,  &fd ) ) ) ||
+            ( condition & GAIM_INPUT_WRITE && ( b_ev = g_hash_table_lookup( write_hash, &fd ) ) ) )
+        {
+                /* We'll stick with this libevent entry, but give it a new BitlBee id. */
+                g_hash_table_remove( id_hash, &b_ev->id );
+                
+                event_debug( "(replacing old handler (id = %d)) = %d\n", b_ev->id, id_next );
+                
+                b_ev->id = id_next++;
+                b_ev->function = function;
+                b_ev->data = data;
+        }
+        else
+        {
+                GIOCondition out_cond;
+                
+                event_debug( "(new) = %d\n", id_next );
+                
+                b_ev = g_new0( struct b_event_data, 1 );
+                b_ev->id = id_next++;
+                b_ev->function = function;
+                b_ev->data = data;
+                
+                out_cond = EV_PERSIST;
+                if( condition & GAIM_INPUT_READ )
+                        out_cond |= EV_READ;
+                if( condition & GAIM_INPUT_WRITE )
+                        out_cond |= EV_WRITE;
+                
+                event_set( &b_ev->evinfo, fd, out_cond, b_event_passthrough, b_ev );
+                event_add( &b_ev->evinfo, NULL );
+                
+                if( out_cond & EV_READ )
+                        g_hash_table_insert( read_hash, &b_ev->evinfo.ev_fd, b_ev );
+                if( out_cond & EV_WRITE )
+                        g_hash_table_insert( write_hash, &b_ev->evinfo.ev_fd, b_ev );
+        }
+        
+        g_hash_table_insert( id_hash, &b_ev->id, b_ev );
+        return b_ev->id;
+}
+
+/* TODO: Persistence for timers! */
+gint b_timeout_add( gint timeout, b_event_handler function, gpointer data )
+{
         struct b_event_data *b_ev = g_new0( struct b_event_data, 1 );
-        GIOCondition out_cond;
+        struct timeval tv;
         
         b_ev->id = id_next++;
@@ -104 +162 @@
         b_ev->data = data;
         
-        out_cond = EV_PERSIST;
-        if( condition & GAIM_INPUT_READ )
-                out_cond |= EV_READ;
-        if( condition & GAIM_INPUT_WRITE )
-                out_cond |= EV_WRITE;
-        
-        event_set( &b_ev->evinfo, fd, out_cond, b_event_passthrough, b_ev );
-        event_add( &b_ev->evinfo, NULL );
-        
-        event_debug( "b_input_add( %d, %d, 0x%x, 0x%x ) = %d\n", fd, condition, function, data, b_ev->id );
-        
-        g_hash_table_insert( id_hash, &b_ev->id, b_ev );
-        
-        return b_ev->id;
-}
-
-/* TODO: Persistence for timers! */
-gint b_timeout_add( gint timeout, b_event_handler function, gpointer data )
-{
-        struct b_event_data *b_ev = g_new0( struct b_event_data, 1 );
-        struct timeval tv;
-        
-        b_ev->id = id_next++;
-        b_ev->function = function;
-        b_ev->data = data;
-        
         tv.tv_sec = timeout / 1000;
         tv.tv_usec = ( timeout % 1000 ) * 1000;
@@ -136 +168 @@
         evtimer_add( &b_ev->evinfo, &tv );
         
-        event_debug( "b_timeout_add( %d, %d, 0x%x ) = %d\n", timeout, function, data, b_ev->id );
+        event_debug( "b_timeout_add( %d, 0x%x, 0x%x ) = %d\n", timeout, function, data, b_ev->id );
         
         g_hash_table_insert( id_hash, &b_ev->id, b_ev );
@@ -150 +182 @@
         if( b_ev )
         {
+                g_hash_table_remove( id_hash, &b_ev->id );
+                if( b_ev->evinfo.ev_fd >= 0 )
+                {
+                        if( b_ev->evinfo.ev_events & EV_READ )
+                                g_hash_table_remove( read_hash, &b_ev->evinfo.ev_fd );
+                        if( b_ev->evinfo.ev_events & EV_WRITE )
+                                g_hash_table_remove( write_hash, &b_ev->evinfo.ev_fd );
+                }
+                
                 event_del( &b_ev->evinfo );
-                g_hash_table_remove( id_hash, &b_ev->id );
                 g_free( b_ev );
         }
         else
         {
-                event_debug( "Double remove?\n" );
+                event_debug( "Already removed?\n" );
         }
 }

protocols/ssl_openssl.c

@@ -115 +115 @@
         int st;
         
-        if( conn->inpa != -1 )
+        if( 0 && conn->inpa != -1 )
         {
                 b_event_remove( conn->inpa );