mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2024-12-27 01:57:52 +00:00
Code Issues Releases Wiki Activity

(trunk libT) new utility function tr_timerAddMsec()

Browse source
This commit is contained in:
Charles Kerr 2009-12-10 19:04:10 +00:00
parent a9cabe918c
commit 0f14f62ac1
3 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
libtransmission/peer-mgr.c
View file

@ -1008,14 +1008,6 @@ tr_peerMgrDidPeerRequest( const tr_torrent * tor,
return FALSE; return FALSE;
} }
static void
renewTimer( struct event * timer, int msec )
{
const int seconds = msec / 1000;
const int usec = (msec%1000) * 1000;
tr_timerAdd( timer, seconds, usec );
}
/* cancel requests that are too old */ /* cancel requests that are too old */
static void static void
refillUpkeep( int foo UNUSED, short bar UNUSED, void * vmgr ) refillUpkeep( int foo UNUSED, short bar UNUSED, void * vmgr )
@ -1069,7 +1061,7 @@ refillUpkeep( int foo UNUSED, short bar UNUSED, void * vmgr )
} }
} }
renewTimer( mgr->refillUpkeepTimer, REFILL_UPKEEP_PERIOD_MSEC ); tr_timerAddMsec( mgr->refillUpkeepTimer, REFILL_UPKEEP_PERIOD_MSEC );
managerUnlock( mgr ); managerUnlock( mgr );
} }
@ -1856,7 +1848,7 @@ createTimer( int msec, void (*callback)(int, short, void *), void * cbdata )
{ {
struct event * timer = tr_new0( struct event, 1 ); struct event * timer = tr_new0( struct event, 1 );
evtimer_set( timer, callback, cbdata ); evtimer_set( timer, callback, cbdata );
renewTimer( timer, msec ); tr_timerAddMsec( timer, msec );
return timer; return timer;
} }
@ -2346,7 +2338,7 @@ rechokePulse( int foo UNUSED, short bar UNUSED, void * vmgr )
if( tor->isRunning ) if( tor->isRunning )
rechokeTorrent( tor->torrentPeers, now ); rechokeTorrent( tor->torrentPeers, now );
renewTimer( mgr->rechokeTimer, RECHOKE_PERIOD_MSEC ); tr_timerAddMsec( mgr->rechokeTimer, RECHOKE_PERIOD_MSEC );
managerUnlock( mgr ); managerUnlock( mgr );
} }
@ -2901,7 +2893,7 @@ reconnectPulse( int foo UNUSED, short bar UNUSED, void * vmgr )
if( tor->isRunning ) if( tor->isRunning )
reconnectTorrent( tor->torrentPeers ); reconnectTorrent( tor->torrentPeers );
renewTimer( mgr->reconnectTimer, RECONNECT_PERIOD_MSEC ); tr_timerAddMsec( mgr->reconnectTimer, RECONNECT_PERIOD_MSEC );
managerUnlock( mgr ); managerUnlock( mgr );
} }
@ -2966,7 +2958,7 @@ bandwidthPulse( int foo UNUSED, short bar UNUSED, void * vmgr )
if( tor->isRunning && ( tor->error == TR_STAT_LOCAL_ERROR )) if( tor->isRunning && ( tor->error == TR_STAT_LOCAL_ERROR ))
tr_torrentStop( tor ); tr_torrentStop( tor );
renewTimer( mgr->bandwidthTimer, BANDWIDTH_PERIOD_MSEC ); tr_timerAddMsec( mgr->bandwidthTimer, BANDWIDTH_PERIOD_MSEC );
managerUnlock( mgr ); managerUnlock( mgr );
} }
@ -3085,6 +3077,6 @@ atomPulse( int foo UNUSED, short bar UNUSED, void * vmgr )
} }
} }
renewTimer( mgr->atomTimer, ATOM_PERIOD_MSEC ); tr_timerAddMsec( mgr->atomTimer, ATOM_PERIOD_MSEC );
managerUnlock( mgr ); managerUnlock( mgr );
} }

8
libtransmission/utils.c
View file

@ -499,6 +499,14 @@ tr_timerAdd( struct event * timer, int seconds, int microseconds )
event_add( timer, &tv ); event_add( timer, &tv );
} }
void
tr_timerAddMsec( struct event * timer, int msec )
{
const int seconds = msec / 1000;
const int usec = (msec%1000) * 1000;
tr_timerAdd( timer, seconds, usec );
}
/** /**
*** ***
**/ **/

2
libtransmission/utils.h
View file

@ -265,6 +265,8 @@ struct event;
void tr_timerAdd( struct event * timer, int seconds, int microseconds ); void tr_timerAdd( struct event * timer, int seconds, int microseconds );
void tr_timerAddMsec( struct event * timer, int milliseconds );
/** @brief return the current date in milliseconds */ /** @brief return the current date in milliseconds */
uint64_t tr_date( void ); uint64_t tr_date( void );