Changeset f56c491 for unix.c


Ignore:
Timestamp:
2005-11-15T13:35:24Z (14 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:
1 edited

Legend:

Unmodified
Added
Removed
  • unix.c

    rabe53d3 rf56c491  
    3636
    3737static void sighandler( int signal );
    38 gboolean bitlbee_dirty_workaround( gpointer data );
    3938
    4039int main( int argc, char *argv[] )
     
    102101                log_message( LOGLVL_WARNING, "Error opening helpfile %s.", HELP_FILE );
    103102       
    104         /* Workaround against runaway problems. Bah, this is really dirty,
    105            but in the end not really different from the <=0.91 situation,
    106            which makes it an acceptable temporary "solution". */
    107         // g_timeout_add( 0, bitlbee_dirty_workaround, NULL );
    108        
    109103        g_main_run( global.loop );
    110104       
    111105        return( 0 );
    112106}
    113 
    114 gboolean bitlbee_dirty_workaround( gpointer data )
    115 {
    116         usleep( 50000 );
    117         return( TRUE );
    118 }
    119 
    120 void proxyprofiler_dump();
    121107
    122108static void sighandler( int signal )
     
    148134                }
    149135        }
    150 #ifdef PROXYPROFILER
    151         else if( signal == SIGXCPU )
    152         {
    153                 write_io_activity();
    154                 proxyprofiler_dump();
    155                 log_message( LOGLVL_ERROR, "Received SIGXCPU, dumping some debugging info." );
    156                 exit( 1 );
    157         }
    158 #endif
    159136        else if( signal != SIGPIPE )
    160137        {
Note: See TracChangeset for help on using the changeset viewer.