Changeset 9709

Timestamp:

Dec 10, 2009, 7:04:10 PM (12 years ago)

Author:

charles

Message:

(trunk libT) new utility function tr_timerAddMsec()

Location:

trunk/libtransmission

Files:

• peer-mgr.c (modified) (7 diffs)
• utils.c (modified) (1 diff)
• utils.h (modified) (1 diff)

trunk/libtransmission/peer-mgr.c

@@ -1009 +1009 @@
 }
 
-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 */
 static void
@@ -1070 +1062 @@
     }
 
-    renewTimer( mgr->refillUpkeepTimer, REFILL_UPKEEP_PERIOD_MSEC );
+    tr_timerAddMsec( mgr->refillUpkeepTimer, REFILL_UPKEEP_PERIOD_MSEC );
     managerUnlock( mgr );
 }
@@ -1857 +1849 @@
     struct event * timer = tr_new0( struct event, 1 );
     evtimer_set( timer, callback, cbdata );
-    renewTimer( timer, msec );
+    tr_timerAddMsec( timer, msec );
     return timer;
 }
@@ -2347 +2339 @@
             rechokeTorrent( tor->torrentPeers, now );
 
-    renewTimer( mgr->rechokeTimer, RECHOKE_PERIOD_MSEC );
+    tr_timerAddMsec( mgr->rechokeTimer, RECHOKE_PERIOD_MSEC );
     managerUnlock( mgr );
 }
@@ -2902 +2894 @@
             reconnectTorrent( tor->torrentPeers );
 
-    renewTimer( mgr->reconnectTimer, RECONNECT_PERIOD_MSEC );
+    tr_timerAddMsec( mgr->reconnectTimer, RECONNECT_PERIOD_MSEC );
     managerUnlock( mgr );
 }
@@ -2967 +2959 @@
             tr_torrentStop( tor );
 
-    renewTimer( mgr->bandwidthTimer, BANDWIDTH_PERIOD_MSEC );
+    tr_timerAddMsec( mgr->bandwidthTimer, BANDWIDTH_PERIOD_MSEC );
     managerUnlock( mgr );
 }
@@ -3086 +3078 @@
     }
 
-    renewTimer( mgr->atomTimer, ATOM_PERIOD_MSEC );
+    tr_timerAddMsec( mgr->atomTimer, ATOM_PERIOD_MSEC );
     managerUnlock( mgr );
 }

trunk/libtransmission/utils.c

@@ -498 +498 @@
     tr_timevalSet( &tv, seconds, microseconds );
     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 );
 }
 

trunk/libtransmission/utils.h

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