Changeset 9437 for trunk/libtransmission/port-forwarding.c

Timestamp:

Oct 29, 2009, 5:25:03 PM (13 years ago)

Author:

charles

Message:

(trunk libT) #2538 startup takes too long

File:

• trunk/libtransmission/port-forwarding.c (modified) (3 diffs)

trunk/libtransmission/port-forwarding.c

@@ -90 +90 @@
 
 static void
-onTimer( int fd UNUSED, short what UNUSED, void * vshared )
+set_evtimer_from_status( tr_shared * s )
 {
     int sec=0, msec=0;
-    tr_shared * s = vshared;
-
-    assert( s );
-    assert( s->timer );
-
-    /* do something */
-    natPulse( s, s->doPortCheck );
-    s->doPortCheck = FALSE;
 
     /* when to wake up again */
@@ -124 +116 @@
 
     tr_timerAdd( s->timer, sec, msec );
+}
+
+static void
+onTimer( int fd UNUSED, short what UNUSED, void * vshared )
+{
+    tr_shared * s = vshared;
+
+    assert( s );
+    assert( s->timer );
+
+    /* do something */
+    natPulse( s, s->doPortCheck );
+    s->doPortCheck = FALSE;
+
+    /* set up the timer for the next pulse */
+    set_evtimer_from_status( s );
 }
 
@@ -191 +199 @@
     s->timer = tr_new0( struct event, 1 );
     evtimer_set( s->timer, onTimer, s );
-    onTimer( 0, 0, s );
+    set_evtimer_from_status( s );
 }