Changeset fc2ee0f

Timestamp:

2006-05-13T10:29:53Z (19 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

2b7d2d1

Parents:

b642f381

Message:

It works, it works! \o/

Location:

protocols

Files:

• Makefile (modified) (1 diff)
• events.h (modified) (1 diff)
• events_glib.c (modified) (4 diffs)
• events_libevent.c (modified) (3 diffs)

protocols/Makefile

@@ -11 +11 @@
 # [SH] Program variables
 objects = events_libevent.o http_client.o md5.o nogaim.o proxy.o sha.o $(SSL_CLIENT)
+#objects = events_glib.o http_client.o md5.o nogaim.o proxy.o sha.o $(SSL_CLIENT)
 
 # [SH] The next two lines should contain the directory name (in $(subdirs))

protocols/events.h

@@ -49 +49 @@
 #define GAIM_ERR_COND   (G_IO_HUP | G_IO_ERR | G_IO_NVAL)
 
+#define event_debug( x... ) printf( x )
+
 G_MODULE_EXPORT void b_main_init();
 G_MODULE_EXPORT void b_main_run();

protocols/events_glib.c

@@ -73 +73 @@
         GaimIOClosure *closure = data;
         b_input_condition gaim_cond = 0;
+        gboolean st;
 
         if (condition & GAIM_READ_COND)
@@ -78 +79 @@
         if (condition & GAIM_WRITE_COND)
                 gaim_cond |= GAIM_INPUT_WRITE;
+        
+        event_debug( "gaim_io_invoke( %d, %d, 0x%x )\n", g_io_channel_unix_get_fd(source), condition, data );
 
-        return closure->function(closure->data, g_io_channel_unix_get_fd(source), gaim_cond);
+        st = closure->function(closure->data, g_io_channel_unix_get_fd(source), gaim_cond);
+        
+        if( !st )
+                event_debug( "Returned FALSE, cancelling.\n" );
+        
+        return st;
 }
 
 static void gaim_io_destroy(gpointer data)
 {
+        event_debug( "gaim_io_destroy( 0x%x )\n", data );
         g_free(data);
 }
@@ -105 +114 @@
                                               gaim_io_invoke, closure, gaim_io_destroy);
         
+        event_debug( "b_input_add( %d, %d, 0x%x, 0x%x ) = %d (0x%x)\n", source, condition, function, data, closure->result, closure );
+        
         g_io_channel_unref(channel);
         return closure->result;
@@ -111 +122 @@
 gint b_timeout_add(gint timeout, b_event_handler func, gpointer data)
 {
-        return g_timeout_add(timeout, func, data);
+        gint st = g_timeout_add(timeout, func, data);
+        
+        event_debug( "b_timeout_add( %d, %d, %d ) = %d\n", timeout, func, data, st );
+        
+        return st;
 }
 
 void b_event_remove(gint tag)
 {
+        event_debug( "g_source_remove( %d )\n", tag );
+        
         if (tag > 0)
                 g_source_remove(tag);

protocols/events_libevent.c

@@ -72 +72 @@
         struct b_event_data *b_ev = data;
         b_input_condition cond = 0;
+        int id;
         
         if( fd >= 0 )
@@ -83 +84 @@
         event_debug( "b_event_passthrough( %d, %d, 0x%x ) (%d)\n", fd, event, (int) data, b_ev->id );
         
+        /* Since the called function might cancel this handler already
+           (which free()s b_ev, we have to remember the ID here. */
+        id = b_ev->id;
+        
         if( !b_ev->function( b_ev->data, fd, cond ) )
         {
                 event_debug( "Handler returned FALSE: " );
-                b_event_remove( b_ev->id );
+                b_event_remove( id );
         }
 }
@@ -151 +156 @@
         else
         {
-                event_debug( "Invalid?\n" );
+                event_debug( "Double remove?\n" );
         }
 }