mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2025-03-09 13:50:00 +00:00
Code Issues Releases Wiki Activity

(trunk libT) add more assertions to ensure that the libevent calls are all being made from the same thread

Browse source
This commit is contained in:
Charles Kerr 2009-01-28 19:35:39 +00:00
parent 983455abbc
commit adc6791de3
3 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libtransmission/peer-io.c
View file

@ -346,6 +346,10 @@ tr_peerIoNew( tr_session * session,
{
tr_peerIo * io;
assert( session != NULL );
assert( session->events != NULL );
assert( tr_amInEventThread( session ) );
if( socket >= 0 )
tr_netSetTOS( socket, session->peerSocketTOS );
@ -848,6 +852,7 @@ static void
event_enable( tr_peerIo * io, short event )
{
assert( tr_amInEventThread( io->session ) );
assert( io->session != NULL );
assert( io->session->events != NULL );
assert( event_initialized( &io->event_read ) );
assert( event_initialized( &io->event_write ) );
@ -871,6 +876,7 @@ static void
event_disable( struct tr_peerIo * io, short event )
{
assert( tr_amInEventThread( io->session ) );
assert( io->session != NULL );
assert( io->session->events != NULL );
assert( event_initialized( &io->event_read ) );
assert( event_initialized( &io->event_write ) );

8
libtransmission/trevent.c
View file

@ -346,8 +346,8 @@ tr_timerNew( tr_session * session,
{
tr_timer * timer;
assert( session );
assert( session->events );
assert( session != NULL );
assert( session->events != NULL );
timer = tr_new0( tr_timer, 1 );
tr_timevalMsec( interval_milliseconds, &timer->tv );
@ -379,8 +379,8 @@ void
tr_runInEventThread( tr_session * session,
void func( void* ), void * user_data )
{
assert( session );
assert( session->events );
assert( session != NULL );
assert( session->events != NULL );
if( tr_amInThread( session->events->thread ) )
{

10
libtransmission/web.c
View file

@ -246,6 +246,11 @@ static void
restart_timer( tr_web * g )
{
struct timeval interval;
assert( tr_amInEventThread( g->session ) );
assert( g->session != NULL );
assert( g->session->events != NULL );
stop_timer( g );
dbgmsg( "adding a timeout for %ld seconds from now", g->timer_ms/1000L );
tr_timevalMsec( g->timer_ms, &interval );
@ -357,6 +362,11 @@ setsock( curl_socket_t sockfd,
const int kind = EV_PERSIST
| (( action & CURL_POLL_IN ) ? EV_READ : 0 )
| (( action & CURL_POLL_OUT ) ? EV_WRITE : 0 );
assert( tr_amInEventThread( g->session ) );
assert( g->session != NULL );
assert( g->session->events != NULL );
dbgmsg( "setsock: fd is %d, curl action is %d, libevent action is %d",
sockfd, action, kind );
if( f->evset )