Changeset b135438 for unix.c


Ignore:
Timestamp:
2005-11-15T13:20:27Z (19 years ago)
Author:
Jelmer Vernooij <jelmer@…>
Branches:
master
Children:
c998255, f56c491
Parents:
f7f3ada (diff), c1ede6e8 (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 changes from Wilmer

File:
1 edited

Legend:

Unmodified
Added
Removed

  • unix.c

    rf7f3ada rb135438  
    3636
    3737static void sighandler( int signal );
    38 gboolean bitlbee_dirty_workaround( gpointer data );
    3938
    4039int main( int argc, char *argv[] )
    … …  
    9695                log_message( LOGLVL_WARNING, "Error opening helpfile %s.", HELP_FILE );
    9796       
    98         /* Workaround against runaway problems. Bah, this is really dirty,
    99            but in the end not really different from the <=0.91 situation,
    100            which makes it an acceptable temporary "solution". */
    101         // g_timeout_add( 0, bitlbee_dirty_workaround, NULL );
    102        
    10397        g_main_run( global.loop );
    10498       
    10599        return( 0 );
    106100}
    107 
    108 gboolean bitlbee_dirty_workaround( gpointer data )
    109 {
    110         usleep( 50000 );
    111         return( TRUE );
    112 }
    113 
    114 void proxyprofiler_dump();
    115101
    116102static void sighandler( int signal )
    … …  
    142128                }
    143129        }
    144 #ifdef PROXYPROFILER
    145         else if( signal == SIGXCPU )
    146         {
    147                 write_io_activity();
    148                 proxyprofiler_dump();
    149                 log_message( LOGLVL_ERROR, "Received SIGXCPU, dumping some debugging info." );
    150                 exit( 1 );
    151         }
    152 #endif
    153130        else if( signal != SIGPIPE )
    154131        {
Note: See TracChangeset for help on using the changeset viewer.