Changeset 49443 in vbox for trunk/src/VBox

Timestamp:

Nov 12, 2013 4:14:02 AM (11 years ago)

Author:

vboxsync

Message:

Don't schedule pxdns_timer() if we don't have any active requests.

File:

• trunk/src/VBox/NetworkServices/NAT/pxdns.c (modified) (10 diffs)

trunk/src/VBox/NetworkServices/NAT/pxdns.c

@@ -94 +94 @@
 #define TIMEOUT 5
     size_t timeout_slot;
+    u32_t timeout_mask;
     struct request *timeout_list[TIMEOUT];
 
@@ -143 +144 @@
     struct request **pprev_timeout;
     struct request *next_timeout;
+
+    /**
+     * Slot in pxdns::timeout_list
+     */
+    size_t timeout_slot;
 
     /**
@@ -252 +258 @@
 
     pxdns->timeout_slot = 0;
+    pxdns->timeout_mask = 0;
 
     /* NB: assumes pollmgr thread is not running yet */
@@ -258 +265 @@
         pollmgr_add(&pxdns->pmhdl6, pxdns->sock6, POLLIN);
     }
-
-    sys_timeout(1 * 1000, pxdns_timer, pxdns);
 
     return ERR_OK;
@@ -418 +423 @@
 {
     struct request **chain;
+    u32_t omask;
 
     LWIP_ASSERT1(req->pprev_timeout == NULL);
-    chain = &pxdns->timeout_list[pxdns->timeout_slot];
+
+    req->timeout_slot = pxdns->timeout_slot;
+    chain = &pxdns->timeout_list[req->timeout_slot];
     if ((req->next_timeout = *chain) != NULL) {
         (*chain)->pprev_timeout = &req->next_timeout;
@@ -426 +434 @@
     *chain = req;
     req->pprev_timeout = chain;
+
+    omask = pxdns->timeout_mask;
+    pxdns->timeout_mask |= 1U << req->timeout_slot;
+    if (omask == 0) {
+        sys_timeout(1 * 1000, pxdns_timer, pxdns);
+    }
 }
 
@@ -448 +462 @@
 {
     LWIP_ASSERT1(req->pprev_timeout != NULL);
+    LWIP_ASSERT1(req->timeout_slot < TIMEOUT);
 
     if (req->next_timeout != NULL) {
@@ -455 +470 @@
     req->pprev_timeout = NULL;
     req->next_timeout = NULL;
+
+    if (pxdns->timeout_list[req->timeout_slot] == NULL) {
+        pxdns->timeout_mask &= ~(1U << req->timeout_slot);
+        /* may be on pollmgr thread so no sys_untimeout */
+    }
 }
 
@@ -526 +546 @@
     struct pxdns *pxdns = (struct pxdns *)arg;
     struct request **chain, *req;
+    u32_t mask;
 
     sys_mutex_lock(&pxdns->lock);
@@ -557 +578 @@
     }
 
+    if (pxdns->timeout_list[pxdns->timeout_slot] == NULL) {
+        pxdns->timeout_mask &= ~(1U << pxdns->timeout_slot);
+    }
+    else {
+        pxdns->timeout_mask |= 1U << pxdns->timeout_slot;
+    }
+    mask = pxdns->timeout_mask;
+
     sys_mutex_unlock(&pxdns->lock);
 
-    sys_timeout(1 * 1000, pxdns_timer, pxdns);
+    if (mask != 0) {
+        sys_timeout(1 * 1000, pxdns_timer, pxdns);
+    }
 }