mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

(trunk libt) rename tr_date() as tr_time_msec() for clarity

This commit is contained in:
Charles Kerr 2010-07-11 20:49:19 +00:00
parent 8d60d46538
commit 6f5c9dcafb
11 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libtransmission/bandwidth.c
View File

@ -34,7 +34,7 @@ static unsigned int
getSpeed_Bps( const struct bratecontrol * r, unsigned int interval_msec, uint64_t now )
{
uint64_t bytes = 0;
const uint64_t cutoff = (now?now:tr_date()) - interval_msec;
const uint64_t cutoff = (now?now:tr_time_msec()) - interval_msec;
int i = r->newest;
for( ;; )
@ -381,5 +381,5 @@ tr_bandwidthUsed( tr_bandwidth * b,
size_t byteCount,
tr_bool isPieceData )
{
bandwidthUsedImpl( b, dir, byteCount, isPieceData, tr_date( ) );
bandwidthUsedImpl( b, dir, byteCount, isPieceData, tr_time_msec( ) );
}

2
libtransmission/crypto.c
View File

@ -347,7 +347,7 @@ tr_cryptoWeakRandInt( int upperBound )
if( !init )
{
srand( tr_date( ) );
srand( tr_time_msec( ) );
init = TRUE;
}

6
libtransmission/fdlimit.c
View File

@ -474,7 +474,7 @@ tr_fdFileGetCached( tr_session * session,
if( ( match != NULL ) && ( !doWrite || match->isWritable ) )
{
match->date = tr_date( );
match->date = tr_time_msec( );
return match->fd;
}
@ -532,7 +532,7 @@ tr_fdFileCheckout( tr_session * session,
dbgmsg( "it's not already open. looking for an open slot or an old file." );
while( winner < 0 )
{
uint64_t date = tr_date( ) + 1;
uint64_t date = tr_time_msec( ) + 1;
/* look for the file that's been open longest */
for( i=0; i<gFd->openFileLimit; ++i )
@ -582,7 +582,7 @@ tr_fdFileCheckout( tr_session * session,
dbgmsg( "checking out '%s' in slot %d", filename, winner );
o->torrentId = torrentId;
o->fileNum = fileNum;
o->date = tr_date( );
o->date = tr_time_msec( );
return o->fd;
}

2
libtransmission/history.c
View File

@ -44,7 +44,7 @@ unsigned int
tr_historyGet( const tr_recentHistory * h, uint64_t now, unsigned int msec )
{
unsigned int n = 0;
const uint64_t cutoff = (now?now:tr_date()) - msec;
const uint64_t cutoff = (now?now:tr_time_msec()) - msec;
int i = h->newest;
for( ;; )

4
libtransmission/history.h
View File

@ -39,14 +39,14 @@ void tr_historyFree( tr_recentHistory * );
/**
* @brief add a counter to the recent history object.
* @param when the current time in msec, such as from tr_date()
* @param when the current time in msec, such as from tr_time_msec()
* @param n how many items to add to the history's counter
*/
void tr_historyAdd( tr_recentHistory *, uint64_t when, unsigned int n );
/**
* @brief count how many events have occurred in the last N seconds.
* @param when the current time in msec, such as from tr_date()
* @param when the current time in msec, such as from tr_time_msec()
* @param seconds how many seconds to count back through.
*/
unsigned int tr_historyGet( const tr_recentHistory *, uint64_t when, unsigned int seconds );

18
libtransmission/peer-mgr.c
View File

@ -1183,7 +1183,7 @@ refillUpkeep( int foo UNUSED, short bar UNUSED, void * vmgr )
managerLock( mgr );
now = tr_time( );
now_msec = tr_date( );
now_msec = tr_time_msec( );
too_old = now - REQUEST_TTL_SECS;
tor = NULL;
@ -1437,7 +1437,7 @@ peerCallbackFunc( tr_peer * peer, const tr_peer_event * e, void * vt )
pieceListRemoveRequest( t, block );
if( peer != NULL )
tr_historyAdd( peer->blocksSentToClient, tr_date( ), 1 );
tr_historyAdd( peer->blocksSentToClient, tr_time_msec( ), 1 );
if( tr_cpBlockIsComplete( &tor->completion, block ) )
{
@ -2286,7 +2286,7 @@ tr_peerMgrWebSpeeds_KBps( const tr_torrent * tor )
webseedCount = tr_ptrArraySize( &t->webseeds );
assert( webseedCount == tor->info.webseedCount );
ret = tr_new0( double, webseedCount );
now = tr_date( );
now = tr_time_msec( );
for( i=0; i<webseedCount; ++i ) {
int Bps;
@ -2324,7 +2324,7 @@ tr_peerMgrPeerStats( const tr_torrent * tor,
size = tr_ptrArraySize( &t->peers );
peers = (const tr_peer**) tr_ptrArrayBase( &t->peers );
ret = tr_new0( tr_peer_stat, size );
now = tr_date( );
now = tr_time_msec( );
for( i=0; i<size; ++i )
{
@ -2417,7 +2417,7 @@ static void
rechokeDownloads( Torrent * t )
{
int i;
const uint64_t now = tr_date( );
const uint64_t now = tr_time_msec( );
const int msec = 60 * 1000;
const int MIN_INTERESTING_PEERS = 5;
const int peerCount = tr_ptrArraySize( &t->peers );
@ -2743,7 +2743,7 @@ rechokePulse( int foo UNUSED, short bar UNUSED, void * vmgr )
tr_peerMgr * mgr = vmgr;
managerLock( mgr );
now = tr_date( );
now = tr_time_msec( );
while(( tor = tr_torrentNext( mgr->session, tor ))) {
if( tor->isRunning ) {
rechokeUploads( tor->torrentPeers, now );
@ -2852,7 +2852,7 @@ getPeersToClose( Torrent * t, tr_close_type_t closeType, const time_t now, int *
if( shouldPeerBeClosed( t, peers[i], peerCount, now ) == closeType )
ret[outsize++] = peers[i];
sortPeersByLivelinessReverse ( ret, NULL, outsize, tr_date( ) );
sortPeersByLivelinessReverse ( ret, NULL, outsize, tr_time_msec( ) );
*setmeSize = outsize;
return ret;
@ -3100,7 +3100,7 @@ reconnectPulse( int foo UNUSED, short bar UNUSED, void * vmgr )
{
tr_torrent * tor;
tr_peerMgr * mgr = vmgr;
const uint64_t now = tr_date( );
const uint64_t now = tr_time_msec( );
/**
*** enforce the per-session and per-torrent peer limits
@ -3445,7 +3445,7 @@ getPeerCandidates( tr_session * session, int * candidateCount )
struct peer_candidate * candidates;
struct peer_candidate * walk;
const time_t now = tr_time( );
const uint64_t now_msec = tr_date( );
const uint64_t now_msec = tr_time_msec( );
/* leave 5% of connection slots for incoming connections -- ticket #2609 */
const int maxCandidates = tr_sessionGetPeerLimit( session ) * 0.95;

10
libtransmission/peer-msgs.c
View File

@ -1395,7 +1395,7 @@ readBtMessage( tr_peermsgs * msgs, struct evbuffer * inbuf, size_t inlen )
case BT_UNCHOKE:
dbgmsg( msgs, "got Unchoke" );
msgs->peer->clientIsChoked = 0;
updateDesiredRequestCount( msgs, tr_date( ) );
updateDesiredRequestCount( msgs, tr_time_msec( ) );
break;
case BT_INTERESTED:
@ -1455,7 +1455,7 @@ readBtMessage( tr_peermsgs * msgs, struct evbuffer * inbuf, size_t inlen )
tr_peerIoReadUint32( msgs->peer->io, inbuf, &r.index );
tr_peerIoReadUint32( msgs->peer->io, inbuf, &r.offset );
tr_peerIoReadUint32( msgs->peer->io, inbuf, &r.length );
tr_historyAdd( msgs->peer->cancelsSentToClient, tr_date( ), 1 );
tr_historyAdd( msgs->peer->cancelsSentToClient, tr_time_msec( ), 1 );
dbgmsg( msgs, "got a Cancel %u:%u->%u", r.index, r.offset, r.length );
for( i=0; i<msgs->peer->pendingReqsToClient; ++i ) {
@ -1929,7 +1929,7 @@ fillOutputBuffer( tr_peermsgs * msgs, time_t now )
tr_peerIoWriteBuf( io, out, TRUE );
bytesWritten += EVBUFFER_LENGTH( out );
msgs->clientSentAnythingAt = now;
tr_historyAdd( msgs->peer->blocksSentToPeer, tr_date( ), 1 );
tr_historyAdd( msgs->peer->blocksSentToPeer, tr_time_msec( ), 1 );
}
evbuffer_free( out );
@ -1972,7 +1972,7 @@ peerPulse( void * vmsgs )
const time_t now = tr_time( );
if ( tr_isPeerIo( msgs->peer->io ) ) {
updateDesiredRequestCount( msgs, tr_date( ) );
updateDesiredRequestCount( msgs, tr_time_msec( ) );
updateBlockRequests( msgs );
updateMetadataRequests( msgs, now );
}
@ -2360,7 +2360,7 @@ tr_peerMsgsNew( struct tr_torrent * torrent,
}
tr_peerIoSetIOFuncs( m->peer->io, canRead, didWrite, gotError, m );
updateDesiredRequestCount( m, tr_date( ) );
updateDesiredRequestCount( m, tr_time_msec( ) );
return m;
}

4
libtransmission/ratecontrol.c
View File

@ -36,7 +36,7 @@ rateForInterval( const tr_ratecontrol * r,
uint64_t now )
{
uint64_t bytes = 0;
const uint64_t cutoff = (now?now:tr_date()) - interval_msec;
const uint64_t cutoff = (now?now:tr_time_msec()) - interval_msec;
int i = r->newest;
for( ; ; )
@ -76,7 +76,7 @@ void
tr_rcTransferred( tr_ratecontrol * r,
size_t size )
{
const uint64_t now = tr_date ( );
const uint64_t now = tr_time_msec ( );
if( r->transfers[r->newest].date + TR_RC_GRANULARITY_MSEC >= now )
r->transfers[r->newest].size += size;

2
libtransmission/torrent.c
View File

@ -976,7 +976,7 @@ tr_torrentStat( tr_torrent * tor )
&s->peersGettingFromUs,
s->peersFrom );
now = tr_date( );
now = tr_time_msec( );
d = tr_peerMgrGetWebseedSpeed_Bps( tor, now );
s->rawUploadSpeed_KBps = toSpeedKBps( tr_bandwidthGetRawSpeed_Bps ( tor->bandwidth, now, TR_UP ) );
s->pieceUploadSpeed_KBps = toSpeedKBps( tr_bandwidthGetPieceSpeed_Bps( tor->bandwidth, now, TR_UP ) );

2
libtransmission/utils.c
View File

@ -785,7 +785,7 @@ tr_str_has_suffix( const char *str, const char *suffix )
****/
uint64_t
tr_date( void )
tr_time_msec( void )
{
struct timeval tv;

2
libtransmission/utils.h
View File

@ -265,7 +265,7 @@ void tr_timerAddMsec( struct event * timer, int milliseconds ) TR_GNUC_NONNULL(1
/** @brief return the current date in milliseconds */
uint64_t tr_date( void );
uint64_t tr_time_msec( void );
/** @brief sleep the specified number of milliseconds */
void tr_wait_msec( long int delay_milliseconds );