Changeset 5bccec3 in mainline

Timestamp:

2018-01-18T02:48:17Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

9b8dac4

Parents:

a9fcd73

git-author:

Ondřej Hlavatý <aearsis@…> (2018-01-18 02:27:04)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-01-18 02:48:17)

Message:

usb port: disconnect handler shall run in separate fibril too

Location:

uspace/lib/usb

Files:

• include/usb/port.h (modified) (1 diff)
• src/port.c (modified) (5 diffs)

uspace/lib/usb/include/usb/port.h

@@ -56 +56 @@
         PORT_ENUMERATED,/* Device enumerated. Fibril finished succesfully. */
         PORT_CONNECTING,/* A connected event received, fibril running. */
+        PORT_DISCONNECTING,/* A disconnected event received, fibril running. */
         PORT_ERROR,     /* An error "in-progress". Fibril still running. */
 } usb_port_state_t;

uspace/lib/usb/src/port.c

@@ -102 +102 @@
 
         if (port->state != PORT_DISABLED) {
-                usb_log_warning("A connected event come for port that is not disabled.");
+                usb_log_warning("a connected event come for port that is not disabled.");
                 ret = EINVAL;
                 goto out;
@@ -137 +137 @@
 }
 
+struct remove_worker_args {
+        usb_port_t *port;
+        usb_port_remove_t handler;
+};
+
+static int remove_worker(void *arg)
+{
+        struct remove_worker_args * const args = arg;
+        usb_port_t *port = args->port;
+        usb_port_remove_t handler = args->handler;
+        free(args);
+
+        fibril_mutex_lock(&port->guard);
+        assert(port->state == PORT_DISCONNECTING);
+
+        handler(port);
+
+        port->state = PORT_DISABLED;
+        fibril_condvar_broadcast(&port->finished_cv);
+        fibril_mutex_unlock(&port->guard);
+        return EOK;
+}
+
+static void fork_remove_worker(usb_port_t *port, usb_port_remove_t handler)
+{
+        struct remove_worker_args *args = malloc(sizeof(*args));
+        if (!args)
+                return;
+
+        fid_t fibril = fibril_create(&remove_worker, args);
+        if (!fibril) {
+                free(args);
+                return;
+        }
+
+        args->port = port;
+        args->handler = handler;
+
+        port->state = PORT_DISCONNECTING;
+        fibril_add_ready(fibril);
+}
+
 void usb_port_disabled(usb_port_t *port, usb_port_remove_t handler)
 {
@@ -144 +186 @@
         switch (port->state) {
         case PORT_ENUMERATED:
-                handler(port);
-                port->state = PORT_DISABLED;
+                fork_remove_worker(port, handler);
                 break;
 
@@ -154 +195 @@
                 fibril_condvar_wait(&port->finished_cv, &port->guard);
                 /* fallthrough */
+        case PORT_DISCONNECTING:
         case PORT_DISABLED:
                 break;
         }
 
-        assert(port->state == PORT_DISABLED);
+        assert(port->state == PORT_DISABLED || port->state == PORT_DISCONNECTING);
         fibril_mutex_unlock(&port->guard);
 }
@@ -190 +232 @@
                 /* fallthrough */
         case PORT_ERROR:
+        case PORT_DISCONNECTING:
                 fibril_condvar_wait(&port->finished_cv, &port->guard);
                 break;