WebSVN – HelenOS – Diff – /trunk/uspace/srv/devmap/devmap.c

 #include <bool.h>
 #include <fibril_sync.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ipc/devmap.h>
+#include <assert.h>
 #define NAME  "devmap"
 /** Representation of device driver.
+ *
 LIST_INITIALIZE(devices_list);
 LIST_INITIALIZE(drivers_list);
 LIST_INITIALIZE(pending_req);
+static bool pending_new_dev = false;
+static FIBRIL_CONDVAR_INITIALIZE(pending_cv);
 /* Locking order:
  *  drivers_list_mutex
  *  devices_list_mutex
  *  (devmap_driver_t *)->devices_mutex
  *  create_handle_mutex
     return device;
+}
 /**
- *
  * 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)
+{
     list_remove(&(device->devices));
     list_remove(&(device->driver_devices));
     return EOK;
+}
 /**
- *
  * Read info about new driver and add it into linked list of registered
  * drivers.
- *
  */
 static void devmap_driver_register(devmap_driver_t **odriver)
+{
     *odriver = NULL;
 /** Process pending lookup requests */
 static void process_pending_lookup(void)
+{
     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);
         const devmap_device_t *dev = devmap_device_find_name(pr->name);
         if (!dev)
         free(pr->name);
         list_remove(cur);
         free(pr);
-        goto loop;
+        goto rescan;
+    }
+    pending_new_dev = false;
+    fibril_mutex_unlock(&devices_list_mutex);
+    goto loop;
+}
 /** Register instance of device
+ *
     fibril_mutex_lock(&device->driver->devices_mutex);
     list_append(&device->driver_devices, &device->driver->devices);
     fibril_mutex_unlock(&device->driver->devices_mutex);
+    pending_new_dev = true;
+    fibril_condvar_signal(&pending_cv);
     fibril_mutex_unlock(&devices_list_mutex);
     ipc_answer_1(iid, EOK, device->handle);
+}
         free(name);
         return;
+    }
     name[size] = '\0';
+    fibril_mutex_lock(&devices_list_mutex);
     /*
      * Find device name in linked list of known devices.
      */
     const devmap_device_t *dev = devmap_device_find_name(name);
     if (dev == NULL) {
         if (IPC_GET_ARG1(*icall) & IPC_FLAG_BLOCKING) {
             /* Blocking lookup, add to pending list */
             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);
                 return;
+            }
             pr->name = name;
             pr->callid = iid;
             list_append(&pr->link, &pending_req);
+            fibril_mutex_unlock(&devices_list_mutex);
             return;
+        }
         ipc_answer_0(iid, ENOENT);
         free(name);
+        fibril_mutex_unlock(&devices_list_mutex);
         return;
+    }
+    fibril_mutex_unlock(&devices_list_mutex);
     ipc_answer_1(iid, EOK, dev->handle);
     free(name);
+}
 /** Initialize device mapper.
+ *
+ *
  */
-static bool devmap_init()
+static bool devmap_init(void)
+{
     /* Create NULL device entry */
     devmap_device_t *device = (devmap_device_t *) malloc(sizeof(devmap_device_t));
     if (device == NULL)
         return false;
     if (!devmap_init()) {
         printf(NAME ": Error while initializing service\n");
         return -1;
+    }
-    /* Set a handler of incomming connections and
+    /* Set a handler of incomming connections */
-       pending operations */
-    async_set_pending(process_pending_lookup);
     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 */
     ipcarg_t phonead;
     if (ipc_connect_to_me(PHONE_NS, SERVICE_DEVMAP, 0, 0, &phonead) != 0)
         return -1;

Subversion Repositories HelenOS

(root)/trunk/uspace/srv/devmap/devmap.c – Rev 4524 → 4540