Changeset f56c491 for unix.c

Timestamp:

2005-11-15T13:35:24Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

cc9079e

Parents:

abe53d3 (diff), b135438 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge new changes from pluginable and Wilmer

File:

• unix.c (modified) (3 diffs)

unix.c

@@ -36 +36 @@
 
 static void sighandler( int signal );
-gboolean bitlbee_dirty_workaround( gpointer data );
 
 int main( int argc, char *argv[] )
@@ -102 +101 @@
                 log_message( LOGLVL_WARNING, "Error opening helpfile %s.", HELP_FILE );
         
-        /* Workaround against runaway problems. Bah, this is really dirty,
-           but in the end not really different from the <=0.91 situation,
-           which makes it an acceptable temporary "solution". */
-        // g_timeout_add( 0, bitlbee_dirty_workaround, NULL );
-        
         g_main_run( global.loop );
         
         return( 0 );
 }
-
-gboolean bitlbee_dirty_workaround( gpointer data )
-{
-        usleep( 50000 );
-        return( TRUE );
-}
-
-void proxyprofiler_dump();
 
 static void sighandler( int signal )
@@ -148 +134 @@
                 }
         }
-#ifdef PROXYPROFILER
-        else if( signal == SIGXCPU )
-        {
-                write_io_activity();
-                proxyprofiler_dump();
-                log_message( LOGLVL_ERROR, "Received SIGXCPU, dumping some debugging info." );
-                exit( 1 );
-        }
-#endif
         else if( signal != SIGPIPE )
         {