aboutsummaryrefslogtreecommitdiffstats
path: root/lib/events_libevent.c
diff options
context:
space:
mode:
Diffstat (limited to 'lib/events_libevent.c')
-rw-r--r--lib/events_libevent.c251
1 files changed, 120 insertions, 131 deletions
diff --git a/lib/events_libevent.c b/lib/events_libevent.c
index cf4eee8f..854af010 100644
--- a/lib/events_libevent.c
+++ b/lib/events_libevent.c
@@ -1,4 +1,4 @@
- /********************************************************************\
+/********************************************************************\
* BitlBee -- An IRC to other IM-networks gateway *
* *
* Copyright 2002-2006 Wilmer van der Gaast and others *
@@ -52,8 +52,7 @@ static GHashTable *write_hash;
struct event_base *leh;
struct event_base *old_leh;
-struct b_event_data
-{
+struct b_event_data {
guint id;
struct event evinfo;
gint timeout;
@@ -64,47 +63,44 @@ struct b_event_data
void b_main_init()
{
- if( leh != NULL )
- {
+ 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 );
- write_hash = g_hash_table_new( g_int_hash, g_int_equal );
+
+ 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);
}
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 )
- {
+ 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" );
+
+ event_debug("New event loop.\n");
}
}
static void b_main_restart()
{
struct timeval tv;
-
- memset( &tv, 0, sizeof( struct timeval ) );
- event_base_loopexit( leh, &tv );
-
- event_debug( "b_main_restart()\n" );
+
+ memset(&tv, 0, sizeof(struct timeval));
+ event_base_loopexit(leh, &tv);
+
+ event_debug("b_main_restart()\n");
}
void b_main_quit()
@@ -113,182 +109,175 @@ void b_main_quit()
libevent sometimes generates events before really quitting,
we want to stop them. */
quitting = 1;
-
+
b_main_restart();
}
-static void b_event_passthrough( int fd, short event, void *data )
+static void b_event_passthrough(int fd, short event, void *data)
{
struct b_event_data *b_ev = data;
b_input_condition cond = 0;
gboolean st;
-
- if( fd >= 0 )
- {
- if( event & EV_READ )
+
+ if (fd >= 0) {
+ if (event & EV_READ) {
cond |= B_EV_IO_READ;
- if( event & EV_WRITE )
+ }
+ if (event & EV_WRITE) {
cond |= B_EV_IO_WRITE;
+ }
}
-
- event_debug( "b_event_passthrough( %d, %d, 0x%x ) (%d)\n", fd, event, (int) data, b_ev->id );
-
+
+ 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_cur = b_ev->id;
id_dead = 0;
-
- if( quitting )
- {
- b_event_remove( id_cur );
+
+ if (quitting) {
+ b_event_remove(id_cur);
return;
}
-
- st = b_ev->function( b_ev->data, fd, cond );
- if( id_dead )
- {
+
+ st = b_ev->function(b_ev->data, fd, cond);
+ if (id_dead) {
/* This event was killed already, don't touch it! */
return;
- }
- else if( !st && !( b_ev->flags & B_EV_FLAG_FORCE_REPEAT ) )
- {
- event_debug( "Handler returned FALSE: " );
- b_event_remove( id_cur );
- }
- else if( fd == -1 )
- {
+ } else if (!st && !(b_ev->flags & B_EV_FLAG_FORCE_REPEAT)) {
+ event_debug("Handler returned FALSE: ");
+ b_event_remove(id_cur);
+ } else if (fd == -1) {
/* fd == -1 means it was a timer. These can't be auto-repeated
so it has to be recreated every time. */
struct timeval tv;
-
+
tv.tv_sec = b_ev->timeout / 1000;
- tv.tv_usec = ( b_ev->timeout % 1000 ) * 1000;
-
- evtimer_add( &b_ev->evinfo, &tv );
+ tv.tv_usec = (b_ev->timeout % 1000) * 1000;
+
+ evtimer_add(&b_ev->evinfo, &tv);
}
}
-gint b_input_add( gint fd, b_input_condition condition, b_event_handler function, gpointer data )
+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 & B_EV_IO_READ && ( b_ev = g_hash_table_lookup( read_hash, &fd ) ) ) ||
- ( condition & B_EV_IO_WRITE && ( b_ev = g_hash_table_lookup( write_hash, &fd ) ) ) )
- {
+
+ event_debug("b_input_add( %d, %d, 0x%x, 0x%x ) ", fd, condition, function, data);
+
+ if ((condition & B_EV_IO_READ && (b_ev = g_hash_table_lookup(read_hash, &fd))) ||
+ (condition & B_EV_IO_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 );
-
+ 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
- {
+ } else {
GIOCondition out_cond;
-
- event_debug( "(new) = %d\n", id_next );
-
- b_ev = g_new0( struct b_event_data, 1 );
+
+ 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 & B_EV_IO_READ )
+ if (condition & B_EV_IO_READ) {
out_cond |= EV_READ;
- if( condition & B_EV_IO_WRITE )
+ }
+ if (condition & B_EV_IO_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 );
+ }
+
+ 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);
+ }
}
-
+
b_ev->flags = condition;
- g_hash_table_insert( id_hash, &b_ev->id, 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 )
+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 b_event_data *b_ev = g_new0(struct b_event_data, 1);
struct timeval tv;
-
+
b_ev->id = id_next++;
b_ev->timeout = timeout;
b_ev->function = function;
b_ev->data = data;
-
+
tv.tv_sec = timeout / 1000;
- tv.tv_usec = ( timeout % 1000 ) * 1000;
-
- evtimer_set( &b_ev->evinfo, b_event_passthrough, b_ev );
- evtimer_add( &b_ev->evinfo, &tv );
-
- 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 );
-
+ tv.tv_usec = (timeout % 1000) * 1000;
+
+ evtimer_set(&b_ev->evinfo, b_event_passthrough, b_ev);
+ evtimer_add(&b_ev->evinfo, &tv);
+
+ 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);
+
return b_ev->id;
}
-void b_event_remove( gint id )
+void b_event_remove(gint id)
{
- struct b_event_data *b_ev = g_hash_table_lookup( id_hash, &id );
-
- event_debug( "b_event_remove( %d )\n", id );
- if( b_ev )
- {
- if( id == id_cur )
+ struct b_event_data *b_ev = g_hash_table_lookup(id_hash, &id);
+
+ event_debug("b_event_remove( %d )\n", id);
+ if (b_ev) {
+ if (id == id_cur) {
id_dead = TRUE;
-
- 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_free( b_ev );
- }
- else
- {
- event_debug( "Already removed?\n" );
+
+ 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_free(b_ev);
+ } else {
+ event_debug("Already removed?\n");
}
}
-void closesocket( int fd )
+void closesocket(int fd)
{
struct b_event_data *b_ev;
-
+
/* Since epoll() (the main reason we use libevent) automatically removes sockets from
the epoll() list when a socket gets closed and some modules have a habit of
closing sockets before removing event handlers, our and libevent's administration
get a little bit messed up. So this little function will remove the handlers
properly before closing a socket. */
-
- if( ( b_ev = g_hash_table_lookup( read_hash, &fd ) ) )
- {
- event_debug( "Warning: fd %d still had a read event handler when shutting down.\n", fd );
- b_event_remove( b_ev->id );
+
+ if ((b_ev = g_hash_table_lookup(read_hash, &fd))) {
+ event_debug("Warning: fd %d still had a read event handler when shutting down.\n", fd);
+ b_event_remove(b_ev->id);
}
- if( ( b_ev = g_hash_table_lookup( write_hash, &fd ) ) )
- {
- event_debug( "Warning: fd %d still had a write event handler when shutting down.\n", fd );
- b_event_remove( b_ev->id );
+ if ((b_ev = g_hash_table_lookup(write_hash, &fd))) {
+ event_debug("Warning: fd %d still had a write event handler when shutting down.\n", fd);
+ b_event_remove(b_ev->id);
}
-
- close( fd );
+
+ close(fd);
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-04 14:45:38 +0000