Changeset 28520 in vbox for trunk/src/VBox/Devices/Network/slirp

Timestamp:

Apr 20, 2010 1:36:22 PM (15 years ago)

Author:

vboxsync

Message:

NAT: destructor and fini hooks are called from slirp_uma_free.
zone_drain and uma_zone_exhausted_nolock are implemented to migrate items from second zone to master one on demand.

File:

• trunk/src/VBox/Devices/Network/slirp/misc.c (modified) (4 diffs)

trunk/src/VBox/Devices/Network/slirp/misc.c

@@ -208 +208 @@
     struct item *it;
     uma_zone_t zone;
+    uma_zone_t master_zone;
     Assert(item);
     it = &((struct item *)item)[-1];
@@ -217 +218 @@
     Assert(zone->magic == ZONE_MAGIC);
     LIST_REMOVE(it, list);
+    if (zone->pfFini)
+    {
+        zone->pfFini(zone->pData, item, zone->size);
+    }
+    if (zone->pfDtor)
+    {
+        zone->pfDtor(zone->pData, item, zone->size, NULL);
+    }
     LIST_INSERT_HEAD(&zone->free_items, it, list);
     zone->cur_items--;
@@ -245 +254 @@
 {
     uma_zone_t zone;
-#if 0
-    if (master->pfAlloc != NULL)
-        zone = (uma_zone_t)master->pfAlloc(master, sizeof(struct uma_zone), NULL, 0);
-#endif
     Assert(master);
     zone = RTMemAllocZ(sizeof(struct uma_zone));
@@ -335 +340 @@
     struct item *it;
     Assert(zone->magic == ZONE_MAGIC);
-    if (zone->pfFree == NULL)
-        return;
-
+    Assert((zone->pfFree));
     Assert((mem));
+
     RTCritSectEnter(&zone->csZone);
     it = &((struct item *)mem)[-1];
-    if (it->magic != ITEM_MAGIC)
-    {
-        Log(("NAT:UMA: %p seems to be allocated on heap ... freeing\n", mem));
-        RTMemFree(mem);
+    Assert((it->magic == ITEM_MAGIC));
+    Assert((zone->magic == ZONE_MAGIC && zone == it->zone));
+
+    zone->pfFree(mem,  0, 0);
+    RTCritSectLeave(&zone->csZone);
+}
+
+int uma_zone_exhausted_nolock(uma_zone_t zone)
+{
+    int fExhausted;
+    RTCritSectEnter(&zone->csZone);
+    fExhausted = (zone->cur_items == zone->max_items); 
+    RTCritSectLeave(&zone->csZone);
+    return fExhausted;
+}
+
+void zone_drain(uma_zone_t zone)
+{
+    struct item *it;
+    uma_zone_t master_zone;
+    /* vvl: Huh? What to do with zone which hasn't got backstore ? */
+    Assert((zone->master_zone));
+    master_zone = zone->master_zone;
+    while(!LIST_EMPTY(&zone->free_items))
+    {
+        it = LIST_FIRST(&zone->free_items);
+        RTCritSectEnter(&zone->csZone);
+        LIST_REMOVE(it, list);
+        zone->max_items--;
         RTCritSectLeave(&zone->csZone);
-        return;
-    }
-    Assert((zone->magic == ZONE_MAGIC && zone == it->zone));
-
-    if (zone->pfDtor)
-        zone->pfDtor(zone->pData, mem, zone->size, flags);
-    zone->pfFree(mem,  0, 0);
-    RTCritSectLeave(&zone->csZone);
-}
-
-int uma_zone_exhausted_nolock(uma_zone_t zone)
-{
-    return 0;
-}
-
-void zone_drain(uma_zone_t zone)
-{
+        it->zone = master_zone;
+        RTCritSectEnter(&master_zone->csZone);
+        LIST_INSERT_HEAD(&master_zone->free_items, it, list);
+        master_zone->cur_items--;
+        RTCritSectLeave(&master_zone->csZone);
+    }
 }