Changeset 10998

Timestamp:

Jul 11, 2010, 8:49:19 PM (13 years ago)

Author:

charles

Message:

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

Location:

trunk/libtransmission

Files:

• bandwidth.c (modified) (2 diffs)
• crypto.c (modified) (1 diff)
• fdlimit.c (modified) (3 diffs)
• history.c (modified) (1 diff)
• history.h (modified) (2 diffs)
• peer-mgr.c (modified) (9 diffs)
• peer-msgs.c (modified) (5 diffs)
• ratecontrol.c (modified) (2 diffs)
• torrent.c (modified) (1 diff)
• utils.c (modified) (1 diff)
• utils.h (modified) (1 diff)

trunk/libtransmission/bandwidth.c

@@ -35 +35 @@
 {
     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;
 
@@ -382 +382 @@
                   tr_bool         isPieceData )
 {
-    bandwidthUsedImpl( b, dir, byteCount, isPieceData, tr_date( ) );
-}
+    bandwidthUsedImpl( b, dir, byteCount, isPieceData, tr_time_msec( ) );
+}

trunk/libtransmission/crypto.c

@@ -348 +348 @@
     if( !init )
     {
-        srand( tr_date( ) );
+        srand( tr_time_msec( ) );
         init = TRUE;
     }

trunk/libtransmission/fdlimit.c

@@ -475 +475 @@
     if( ( match != NULL ) && ( !doWrite || match->isWritable ) )
     {
-        match->date = tr_date( );
+        match->date = tr_time_msec( );
         return match->fd;
     }
@@ -533 +533 @@
     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 */
@@ -583 +583 @@
     o->torrentId = torrentId;
     o->fileNum = fileNum;
-    o->date = tr_date( );
+    o->date = tr_time_msec( );
     return o->fd;
 }

trunk/libtransmission/history.c

@@ -45 +45 @@
 {
     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;
 

trunk/libtransmission/history.h

@@ -40 +40 @@
 /**
  * @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
  */
@@ -47 +47 @@
 /**
  * @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.
  */

trunk/libtransmission/peer-mgr.c

@@ -1184 +1184 @@
 
     now = tr_time( );
-    now_msec = tr_date( );
+    now_msec = tr_time_msec( );
     too_old = now - REQUEST_TTL_SECS;
 
@@ -1438 +1438 @@
 
             if( peer != NULL )
-                tr_historyAdd( peer->blocksSentToClient, tr_date( ), 1 );
+                tr_historyAdd( peer->blocksSentToClient, tr_time_msec( ), 1 );
 
             if( tr_cpBlockIsComplete( &tor->completion, block ) )
@@ -2287 +2287 @@
     assert( webseedCount == tor->info.webseedCount );
     ret = tr_new0( double, webseedCount );
-    now = tr_date( );
+    now = tr_time_msec( );
 
     for( i=0; i<webseedCount; ++i ) {
@@ -2325 +2325 @@
     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 )
@@ -2418 +2418 @@
 {
     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;
@@ -2744 +2744 @@
     managerLock( mgr );
 
-    now = tr_date( );
+    now = tr_time_msec( );
     while(( tor = tr_torrentNext( mgr->session, tor ))) {
         if( tor->isRunning ) {
@@ -2853 +2853 @@
             ret[outsize++] = peers[i];
 
-    sortPeersByLivelinessReverse ( ret, NULL, outsize, tr_date( ) );
+    sortPeersByLivelinessReverse ( ret, NULL, outsize, tr_time_msec( ) );
 
     *setmeSize = outsize;
@@ -3101 +3101 @@
     tr_torrent * tor;
     tr_peerMgr * mgr = vmgr;
-    const uint64_t now = tr_date( );
+    const uint64_t now = tr_time_msec( );
 
     /**
@@ -3446 +3446 @@
     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;

trunk/libtransmission/peer-msgs.c

@@ -1396 +1396 @@
             dbgmsg( msgs, "got Unchoke" );
             msgs->peer->clientIsChoked = 0;
-            updateDesiredRequestCount( msgs, tr_date( ) );
+            updateDesiredRequestCount( msgs, tr_time_msec( ) );
             break;
 
@@ -1456 +1456 @@
             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 );
 
@@ -1930 +1930 @@
                 bytesWritten += EVBUFFER_LENGTH( out );
                 msgs->clientSentAnythingAt = now;
-                tr_historyAdd( msgs->peer->blocksSentToPeer, tr_date( ), 1 );
+                tr_historyAdd( msgs->peer->blocksSentToPeer, tr_time_msec( ), 1 );
             }
 
@@ -1973 +1973 @@
 
     if ( tr_isPeerIo( msgs->peer->io ) ) {
-        updateDesiredRequestCount( msgs, tr_date( ) );
+        updateDesiredRequestCount( msgs, tr_time_msec( ) );
         updateBlockRequests( msgs );
         updateMetadataRequests( msgs, now );
@@ -2361 +2361 @@
 
     tr_peerIoSetIOFuncs( m->peer->io, canRead, didWrite, gotError, m );
-    updateDesiredRequestCount( m, tr_date( ) );
+    updateDesiredRequestCount( m, tr_time_msec( ) );
 
     return m;

trunk/libtransmission/ratecontrol.c

@@ -37 +37 @@
 {
     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;
 
@@ -77 +77 @@
                   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 )

trunk/libtransmission/torrent.c

@@ -977 +977 @@
                             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 ) );

trunk/libtransmission/utils.c

@@ -786 +786 @@
 
 uint64_t
-tr_date( void )
+tr_time_msec( void )
 {
     struct timeval tv;

trunk/libtransmission/utils.h

@@ -266 +266 @@
 
 /** @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 */