Changeset 82ca986

Timestamp:

2010-07-27T17:45:16Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

f6f5eee

Parents:

a7dbf45

Message:

Fixed shutdown sequence (could cause 100% CPU usage on SIGTERM).

Files:

• bitlbee.c (modified) (1 diff)
• ipc.c (modified) (1 diff)
• irc.c (modified) (1 diff)
• unix.c (modified) (1 diff)

bitlbee.c

@@ -372 +372 @@
         /* Try to save data for all active connections (if desired). */
         while( irc_connection_list != NULL )
-                irc_abort( irc_connection_list->data, FALSE,
+                irc_abort( irc_connection_list->data, TRUE,
                            "BitlBee server shutting down" );
         

ipc.c

@@ -421 +421 @@
         
         if( old )
-        {
-                irc->status |= USTATUS_SHUTDOWN;
                 irc_abort( irc, FALSE, NULL );
-        }
 }
 

irc.c

@@ -161 +161 @@
 void irc_abort( irc_t *irc, int immed, char *format, ... )
 {
+        char *reason = NULL;
+        
         if( format != NULL )
         {
                 va_list params;
-                char *reason;
                 
                 va_start( params, format );
                 reason = g_strdup_vprintf( format, params );
                 va_end( params );
-                
-                if( !immed )
-                        irc_write( irc, "ERROR :Closing link: %s", reason );
-                
-                ipc_to_master_str( "OPERMSG :Client exiting: %s@%s [%s]\r\n",
-                                   irc->user->nick ? irc->user->nick : "(NONE)", irc->user->host, reason );
-                
-                g_free( reason );
+        }
+        
+        irc_write( irc, "ERROR :Closing link: %s", reason ? : "" );
+        
+        ipc_to_master_str( "OPERMSG :Client exiting: %s@%s [%s]\r\n",
+                           irc->user->nick ? irc->user->nick : "(NONE)",
+                           irc->user->host, reason ? : "" );
+        
+        g_free( reason );
+        
+        irc_flush( irc );
+        if( immed )
+        {
+                irc_free( irc );
         }
         else
         {
-                if( !immed )
-                        irc_write( irc, "ERROR :Closing link" );
-                
-                ipc_to_master_str( "OPERMSG :Client exiting: %s@%s [%s]\r\n",
-                                   irc->user->nick ? irc->user->nick : "(NONE)", irc->user->host, "No reason given" );
-        }
-        
+                b_event_remove( irc->ping_source_id );
+                irc->ping_source_id = b_timeout_add( 1, (b_event_handler) irc_free, irc );
+        }
+}
+
+static gboolean irc_free_hashkey( gpointer key, gpointer value, gpointer data );
+
+void irc_free( irc_t * irc )
+{
         irc->status |= USTATUS_SHUTDOWN;
-        if( irc->sendbuffer && !immed )
-        {
-                /* Set up a timeout event that should shut down the connection
-                   in a second, just in case ..._write doesn't do it first. */
-                
-                b_event_remove( irc->r_watch_source_id );
-                irc->r_watch_source_id = 0;
-                
-                b_event_remove( irc->ping_source_id );
-                irc->ping_source_id = b_timeout_add( 1000, (b_event_handler) irc_free, irc );
-        }
-        else
-        {
-                irc_free( irc );
-        }
-}
-
-static gboolean irc_free_hashkey( gpointer key, gpointer value, gpointer data );
-
-void irc_free( irc_t * irc )
-{
+        
         log_message( LOGLVL_INFO, "Destroying connection with fd %d", irc->fd );
         

unix.c

@@ -239 +239 @@
         /* FIXME: Calling log_message() here is not a very good idea! */
         
-        if( signal == SIGTERM )
+        if( signal == SIGTERM || signal == SIGQUIT || signal == SIGINT )
         {
                 static int first = 1;