Changeset 48439 in vbox for trunk/src/VBox/Devices

Timestamp:

Sep 11, 2013 5:17:23 PM (11 years ago)

Author:

vboxsync

Message:

Provide real sys_arch_mbox_tryfetch.

XXX: We can't rename it with a #define since lwip/sys.h thinks we are
providing a fake tryfetch and doesn't declare it as a function. For
now leave it unrenamed - it doesn't cause conflicts.

Location:

trunk/src/VBox/Devices/Network/lwip-new/vbox

Files:

• include/lwip-namespace.h (modified) (1 diff)
• sys_arch.c (modified) (1 diff)

trunk/src/VBox/Devices/Network/lwip-new/vbox/include/lwip-namespace.h

@@ -125 +125 @@
 #define stats_init lwip_stats_init
 #define sys_arch_mbox_fetch lwip_sys_arch_mbox_fetch
-#define sys_arch_mbox_tryfetch(mbox, msg) lwip_sys_arch_mbox_fetch((mbox), (msg), 1)
+#if 0 /* XXX: cf. lwip/sys.h which misinterprets this */
+#define sys_arch_mbox_tryfetch lwip_sys_arch_mbox_tryfetch
+#endif
 #define sys_arch_protect lwip_sys_arch_protect
 #define sys_arch_sem_wait lwip_sys_arch_sem_wait

trunk/src/VBox/Devices/Network/lwip-new/vbox/sys_arch.c

@@ -386 +386 @@
 }
 
+/**
+ * Try to get an entry from an mbox.
+ */
+u32_t sys_arch_mbox_tryfetch(sys_mbox_t *pvMbox, void **msg)
+{
+    int rc;
+    struct sys_mbox *mbox = NULL;
+    if (!pvMbox || !*pvMbox) return SYS_MBOX_EMPTY;
+    mbox = (struct sys_mbox*)*pvMbox;
+
+    rc = LWIPMutexRequest((mbox)->mutex);
+    AssertRC(rc);
+    if ((mbox)->head == (mbox)->tail)
+    {
+        /* (mbox) is empty, don't wait */
+        rc = LWIPMutexRelease((mbox)->mutex);
+        AssertRC(rc);
+        return SYS_MBOX_EMPTY;
+    }
+    if (((mbox)->head + 1) % MBOX_ENTRIES_MAX == (mbox)->tail)
+    {
+        rc = RTSemEventMultiSignal((mbox)->nonfull);
+        AssertRC(rc);
+    }
+    if (msg != NULL)
+        *msg = (mbox)->apvEntries[(mbox)->tail];
+    (mbox)->tail++;
+    (mbox)->tail %= MBOX_ENTRIES_MAX;
+    rc = RTSemEventMultiSignal((mbox)->nonfull);
+    if ((mbox)->head == (mbox)->tail)
+    {
+        rc = RTSemEventMultiReset((mbox)->nonempty);
+        AssertRC(rc);
+    }
+    rc = LWIPMutexRelease((mbox)->mutex);
+    AssertRC(rc);
+    return 0;
+}
+
 /** Check if an mbox is valid/allocated: return 1 for valid, 0 for invalid */
 int sys_mbox_valid(sys_mbox_t *pvMbox)