Changeset 28882 in vbox for trunk/src/VBox/Main/testcase/tstHostHardwareLinux.cpp

Timestamp:

Apr 28, 2010 11:17:52 PM (15 years ago)

Author:

vboxsync

Message:

Main/HostHardwareLinux: use inotify instead of FAM for USB hotplug probing, and disable the hal/dbus method for now to get testing

File:

• trunk/src/VBox/Main/testcase/tstHostHardwareLinux.cpp (modified) (3 diffs)

trunk/src/VBox/Main/testcase/tstHostHardwareLinux.cpp

@@ -35 +35 @@
 #include <stdlib.h>
 
-void doHotplugEvent(VBoxMainHotplugWaiter *waiter, RTMSINTERVAL cMillies)
+int doHotplugEvent(VBoxMainHotplugWaiter *waiter, RTMSINTERVAL cMillies)
 {
+    int rc;
     while (true)
     {
-        int rc = waiter->Wait (cMillies);
-        if (rc == VERR_TRY_AGAIN)
-        {
-            RTThreadYield();
-            continue;
-        }
-        if (rc == VERR_TIMEOUT)
+        rc = waiter->Wait (cMillies);
+        if (rc == VERR_TIMEOUT || rc == VERR_INTERRUPTED)
             break;
         if (RT_FAILURE(rc))
@@ -55 +51 @@
             break;
     }
+    return rc;
 }
 
@@ -154 +151 @@
     RTPrintf ("Waiting for a hotplug event, Ctrl-C to abort...\n");
     doHotplugEvent(&waiter, RT_INDEFINITE_WAIT);
+    RTPrintf ("Testing interrupting a hotplug event...\n");
+    waiter.Interrupt();
+    rc = doHotplugEvent(&waiter, 5000);
+    RTPrintf ("%s\n", rc == VERR_INTERRUPTED ? "Success!" : "Failed!");
 #endif  /* VBOX_USB_WITH_SYSFS */
     return 0;