mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2024-12-26 09:37:56 +00:00
Code Issues Releases Wiki Activity

(trunk libT) #2416 "crash in event_queue_insert" -- I am really quite sick of this bug. It's not reproducible at all under Linux and appears to be a bug in libevent's kqueue implementation. In this commit, we leak the event object on OS X.

Browse source
This commit is contained in:
Charles Kerr 2009-12-29 00:00:33 +00:00
parent 6151881a03
commit 8ae3911477
1 changed files with 6 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
libtransmission/web.c
View file

@ -16,7 +16,6 @@
#include <assert.h> #include <assert.h>
#include "transmission.h" #include "transmission.h"
#include "list.h"
#include "net.h" #include "net.h"
#include "session.h" #include "session.h"
#include "trevent.h" #include "trevent.h"
@ -55,23 +54,12 @@ struct tr_web
tr_session * session; tr_session * session;
tr_address addr; tr_address addr;
struct event timer_event; struct event timer_event;
tr_list * active_events;
tr_list * inactive_events;
}; };
static void
event_list_node_free( void * event )
{
event_del( event );
tr_free( event );
}
static void static void
web_free( tr_web * g ) web_free( tr_web * g )
{ {
curl_multi_cleanup( g->multi ); curl_multi_cleanup( g->multi );
tr_list_free( &g->active_events, event_list_node_free );
tr_list_free( &g->inactive_events, event_list_node_free );
evtimer_del( &g->timer_event ); evtimer_del( &g->timer_event );
memset( g, TR_MEMORY_TRASH, sizeof( struct tr_web ) ); memset( g, TR_MEMORY_TRASH, sizeof( struct tr_web ) );
tr_free( g ); tr_free( g );
@ -303,8 +291,11 @@ sock_cb( CURL * e UNUSED, curl_socket_t fd, int action,
if( io_event != NULL ) if( io_event != NULL )
{ {
event_del( io_event ); event_del( io_event );
tr_list_remove_data( &web->active_events, io_event ); #ifndef SYS_DARWIN
tr_list_append( &web->inactive_events, io_event ); tr_free( io_event );
#else
#warning FIXME - OS X
#endif
curl_multi_assign( web->multi, fd, NULL ); curl_multi_assign( web->multi, fd, NULL );
/*fprintf( stderr, "-1 io_events to %d\n", --num_events );*/ /*fprintf( stderr, "-1 io_events to %d\n", --num_events );*/
} }
@ -318,11 +309,8 @@ sock_cb( CURL * e UNUSED, curl_socket_t fd, int action,
if( io_event != NULL ) if( io_event != NULL )
event_del( io_event ); event_del( io_event );
else { else {
io_event = tr_list_pop_front( &web->inactive_events ); io_event = tr_new0( struct event, 1 );
if( io_event == NULL )
io_event = tr_new0( struct event, 1 );
curl_multi_assign( web->multi, fd, io_event ); curl_multi_assign( web->multi, fd, io_event );
tr_list_append( &web->active_events, io_event );
/*fprintf( stderr, "+1 io_events to %d\n", ++num_events );*/ /*fprintf( stderr, "+1 io_events to %d\n", ++num_events );*/
} }