Changeset c07af37 in mainline for uspace/srv/devmap/devmap.c

Timestamp:

2009-06-15T20:53:18Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ef8bcc6

Parents:

af7383f

Message:

Handle pending lookups using only one fibril.

File:

• uspace/srv/devmap/devmap.c (modified) (13 diffs)

uspace/srv/devmap/devmap.c

@@ -46 +46 @@
 #include <string.h>
 #include <ipc/devmap.h>
+#include <assert.h>
 
 #define NAME  "devmap"
@@ -95 +96 @@
 LIST_INITIALIZE(pending_req);
 
+static bool pending_new_dev = false;
+static FIBRIL_CONDVAR_INITIALIZE(pending_cv);
+
 /* Locking order:
  *  drivers_list_mutex
@@ -175 +179 @@
 
 /**
- *
  * Unregister device and free it. It's assumed that driver's device list is
  * already locked.
- *
  */
 static int devmap_device_unregister_core(devmap_device_t *device)
@@ -192 +194 @@
 
 /**
- *
  * Read info about new driver and add it into linked list of registered
  * drivers.
- *
  */
 static void devmap_driver_register(devmap_driver_t **odriver)
@@ -350 +350 @@
 {
         link_t *cur;
-        
+
 loop:
+        fibril_mutex_lock(&devices_list_mutex);
+        while (!pending_new_dev)
+                fibril_condvar_wait(&pending_cv, &devices_list_mutex);
+rescan:
         for (cur = pending_req.next; cur != &pending_req; cur = cur->next) {
                 pending_req_t *pr = list_get_instance(cur, pending_req_t, link);
@@ -365 +369 @@
                 free(pr);
                 
-                goto loop;
-        }
+                goto rescan;
+        }
+        pending_new_dev = false;
+        fibril_mutex_unlock(&devices_list_mutex);
+        goto loop;
 }
 
@@ -446 +453 @@
         
         fibril_mutex_unlock(&device->driver->devices_mutex);
+        pending_new_dev = true;
+        fibril_condvar_signal(&pending_cv);
         fibril_mutex_unlock(&devices_list_mutex);
         
@@ -531 +540 @@
         name[size] = '\0';
         
+        fibril_mutex_lock(&devices_list_mutex);
+
         /*
          * Find device name in linked list of known devices.
@@ -544 +555 @@
                         pending_req_t *pr = (pending_req_t *) malloc(sizeof(pending_req_t));
                         if (!pr) {
+                                fibril_mutex_unlock(&devices_list_mutex);
                                 ipc_answer_0(iid, ENOMEM);
                                 free(name);
@@ -552 +564 @@
                         pr->callid = iid;
                         list_append(&pr->link, &pending_req);
+                        fibril_mutex_unlock(&devices_list_mutex);
                         return;
                 }
@@ -557 +570 @@
                 ipc_answer_0(iid, ENOENT);
                 free(name);
-                return;
-        }
+                fibril_mutex_unlock(&devices_list_mutex);
+                return;
+        }
+        fibril_mutex_unlock(&devices_list_mutex);
         
         ipc_answer_1(iid, EOK, dev->handle);
@@ -660 +675 @@
  *
  */
-static bool devmap_init()
+static bool devmap_init(void)
 {
         /* Create NULL device entry */
@@ -819 +834 @@
         }
         
-        /* Set a handler of incomming connections and
-           pending operations */
-        async_set_pending(process_pending_lookup);
+        /* Set a handler of incomming connections */
         async_set_client_connection(devmap_connection);
+
+        /* Create a fibril for handling pending device lookups */
+        fid_t fid = fibril_create(process_pending_lookup, NULL);
+        assert(fid);
+        fibril_add_ready(fid);
         
         /* Register device mapper at naming service */