Changeset b233821 in mainline

Timestamp:

2018-01-12T11:38:04Z (7 years ago)

Author:

Petr Manek <petr.manek@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

fcdab1e

Parents:

0b90f49

Message:

usbhub: join without defuncting the DDF node

File:

• uspace/drv/bus/usb/usbhub/usbhub.c (modified) (1 diff)

uspace/drv/bus/usb/usbhub/usbhub.c

@@ -263 +263 @@
         usb_log_info("(%p) USB hub gone, joining polling fibril.", hub);
 
-        // TODO: Join the polling fibril in a better way?
-        unsigned tries = 10;
-        while (hub->running) {
-                async_usleep(100000);
-                if (!tries--) {
-                        usb_log_error("(%p): Can't remove hub, still running.",
-                            hub);
-                        return EBUSY;
-                }
-        }
-
+        /* Join polling fibril. */
+        fibril_mutex_lock(&hub->poll_guard);
+        while (hub->running)
+                fibril_condvar_wait(&hub->poll_cv, &hub->poll_guard);
+        fibril_mutex_unlock(&hub->poll_guard);
+
+        /* Destroy hub. */
         return usb_hub_cleanup(hub);
 }