Changeset 10557 in vbox for trunk/src/VBox/Devices/Network/testcase

Timestamp:

Jul 12, 2008 12:19:35 AM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

33250

Message:

INTNET: Hopefully sorted out a bunch of unsafe locking (handle usage is still too trusting, but that can wait). Made the factory generic for all three trunk connections.

File:

• trunk/src/VBox/Devices/Network/testcase/tstIntNetR0.cpp (modified) (8 diffs)

trunk/src/VBox/Devices/Network/testcase/tstIntNetR0.cpp ¶

@@ -487 +487 @@
                             /*
                              * Start threaded testcase.
+                             * Give it 5 mins to finish.
                              */
                             if (!g_cErrors)
@@ -520 +521 @@
                                 {
                                     int rc2 = VINF_SUCCESS;
-                                    rc = RTThreadWait(ThreadSend0, 30000, &rc2);
-                                    if (    VBOX_SUCCESS(rc)
-                                        &&  VBOX_SUCCESS(rc2))
-                                        rc = RTThreadWait(ThreadSend1, 30000, &rc2);
+                                    rc = RTThreadWait(ThreadSend0, 5*60*1000, &rc2);
+#if 1 /** @todo it looks like I'm subject to some false wakeup calls here. (2.6.23-gentoo-r3 amd64) */
+                                    for (int cTries = 100; rc == VERR_TIMEOUT && cTries > 0; cTries--)
+                                    {
+                                        RTThreadSleep(1);
+                                        rc = RTThreadWait(ThreadSend0, 1, &rc2);
+                                    }
+#endif
+                                    AssertRC(rc);
+                                    if (VBOX_SUCCESS(rc))
+                                    {
+                                        ThreadSend0 = NIL_RTTHREAD;
+                                        rc = RTThreadWait(ThreadSend1, 5*60*1000, RT_SUCCESS(rc2) ? &rc2 : NULL);
+#if 1 /** @todo it looks like I'm subject to some false wakeup calls here. (2.6.23-gentoo-r3 amd64) */
+                                        for (int cTries = 100; rc == VERR_TIMEOUT && cTries > 0; cTries--)
+                                        {
+                                            RTThreadSleep(1);
+                                            rc = RTThreadWait(ThreadSend1, 1, &rc2);
+                                        }
+#endif
+                                        AssertRC(rc);
+                                        if (RT_SUCCESS(rc))
+                                            ThreadSend1 = NIL_RTTHREAD;
+                                    }
                                     if (    VBOX_SUCCESS(rc)
                                         &&  VBOX_SUCCESS(rc2))
@@ -544 +565 @@
                                          * Closing time...
                                          */
+                                        rc = RTThreadWait(ThreadRecv0, 5000, &rc2);
+                                        if (RT_SUCCESS(rc))
+                                            ThreadRecv0 = NIL_RTTHREAD;
+                                        if (VBOX_FAILURE(rc) || VBOX_FAILURE(rc2))
+                                        {
+                                            RTPrintf("tstIntNetR0: Failed waiting on receiver thread 0, rc=%Vrc, rc2=%Vrc\n", rc, rc2);
+                                            g_cErrors++;
+                                        }
+
+                                        rc = RTThreadWait(ThreadRecv1, 5000, &rc2);
+                                        if (RT_SUCCESS(rc))
+                                            ThreadRecv1 = NIL_RTTHREAD;
+                                        if (VBOX_FAILURE(rc) || VBOX_FAILURE(rc2))
+                                        {
+                                            RTPrintf("tstIntNetR0: Failed waiting on receiver thread 1, rc=%Vrc, rc2=%Vrc\n", rc, rc2);
+                                            g_cErrors++;
+                                        }
+
                                         rc = INTNETR0IfClose(pIntNet, hIf0);
                                         if (VBOX_SUCCESS(rc))
@@ -555 +594 @@
                                             g_cErrors++;
                                         }
+
                                         rc = INTNETR0IfClose(pIntNet, hIf1);
                                         if (VBOX_SUCCESS(rc))
@@ -567 +607 @@
                                         }
 
-                                        rc = RTThreadWait(ThreadRecv0, 5000, &rc2);
-                                        if (VBOX_FAILURE(rc) || VBOX_FAILURE(rc2))
-                                        {
-                                            RTPrintf("tstIntNetR0: Failed waiting on receiver thread 0, rc=%Vrc, rc2=%Vrc\n", rc, rc2);
-                                            g_cErrors++;
-                                        }
-
-                                        rc = RTThreadWait(ThreadRecv1, 5000, &rc2);
-                                        if (VBOX_FAILURE(rc) || VBOX_FAILURE(rc2))
-                                        {
-                                            RTPrintf("tstIntNetR0: Failed waiting on receiver thread 1, rc=%Vrc, rc2=%Vrc\n", rc, rc2);
-                                            g_cErrors++;
-                                        }
 
                                         /* check if the network still exist... */
@@ -593 +620 @@
                                         g_cErrors++;
                                     }
+
+                                    /*
+                                     * Give them a chance to complete...
+                                     */
+                                    RTThreadWait(ThreadRecv0, 5000, NULL);
+                                    RTThreadWait(ThreadRecv1, 5000, NULL);
+                                    RTThreadWait(ThreadSend0, 5000, NULL);
+                                    RTThreadWait(ThreadSend1, 5000, NULL);
+
                                 }
                                 else
@@ -618 +654 @@
                     g_cErrors++;
                 }
+
+                if (hIf1 != INTNET_HANDLE_INVALID)
+                    rc = INTNETR0IfClose(pIntNet, hIf1);
             }
             else
@@ -624 +663 @@
                 g_cErrors++;
             }
+
+            if (hIf0 != INTNET_HANDLE_INVALID)
+                rc = INTNETR0IfClose(pIntNet, hIf0);
         }
         else