Changeset c1a0488 in mainline

Timestamp:

2011-09-02T15:58:02Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

e2b9b341

Parents:

aff587f

Message:

Track basic device and function states.

Location:

uspace/srv/devman

Files:

• devman.c (modified) (4 diffs)
• devman.h (modified) (2 diffs)
• main.c (modified) (6 diffs)

uspace/srv/devman/devman.c

@@ -846 +846 @@
                 add_device(drv, dev, tree);
         
+        fibril_mutex_lock(&drv->driver_mutex);
+        fibril_mutex_unlock(&drv->driver_mutex);
+
+        fibril_rwlock_write_lock(&tree->rwlock);
+        if (dev->pfun != NULL) {
+                dev->pfun->state = FUN_ON_LINE;
+        }
+        fibril_rwlock_write_unlock(&tree->rwlock);
         return true;
 }
@@ -1106 +1114 @@
                 return NULL;
         
+        fun->state = FUN_INIT;
         atomic_set(&fun->refcnt, 0);
         link_initialize(&fun->dev_functions);
@@ -1275 +1284 @@
         dev->pfun->child = NULL;
         dev->pfun = NULL;
+        
+        dev->state = DEVICE_REMOVED;
 }
 
@@ -1338 +1349 @@
         
         fun->dev = NULL;
+        fun->state = FUN_REMOVED;
 }
 

uspace/srv/devman/devman.h

@@ -118 +118 @@
 } driver_list_t;
 
-/** The state of the device. */
+/** Device state */
 typedef enum {
         DEVICE_NOT_INITIALIZED = 0,
         DEVICE_USABLE,
         DEVICE_NOT_PRESENT,
-        DEVICE_INVALID
+        DEVICE_INVALID,
+        /** Device node has been removed from the tree */
+        DEVICE_REMOVED
 } device_state_t;
 
@@ -157 +159 @@
 };
 
+/** Function state */
+typedef enum {
+        FUN_INIT = 0,
+        FUN_OFF_LINE,
+        FUN_ON_LINE,
+        /** Function node has been removed from the tree */
+        FUN_REMOVED
+} fun_state_t;
+
 /** Function node in the device tree. */
 struct fun_node {
         /** Reference count */
         atomic_t refcnt;
+        /** State */
+        fun_state_t state;
         
         /** The global unique identifier of the function */

uspace/srv/devman/main.c

@@ -234 +234 @@
         dev_node_t *dev_node = (dev_node_t *) arg;
         assign_driver(dev_node, &drivers_list, &device_tree);
+
+        /* Delete one reference we got from the caller. */
+        dev_del_ref(dev_node);
         return EOK;
 }
@@ -243 +246 @@
         fibril_rwlock_write_lock(&device_tree.rwlock);
 
+        if (fun->state == FUN_ON_LINE) {
+                fibril_rwlock_write_unlock(&device_tree.rwlock);
+                log_msg(LVL_WARN, "Function %s is already on line.",
+                    fun->pathname);
+                return EOK;
+        }
+        
         if (fun->ftype == fun_inner) {
                 dev = create_dev_node();
@@ -260 +270 @@
                 assert(dev != NULL);
                 
+                /* Give one reference over to assign_driver_fibril(). */
+                dev_add_ref(dev);
                 /*
                  * Try to find a suitable driver and assign it to the device.  We do
@@ -269 +281 @@
                 fid_t assign_fibril = fibril_create(assign_driver_fibril, dev);
                 if (assign_fibril == 0) {
-                        /*
-                         * Fallback in case we are out of memory.
-                         * Probably not needed as we will die soon anyway ;-).
-                         */
-                        (void) assign_driver_fibril(fun);
-                } else {
-                        fibril_add_ready(assign_fibril);
+                        log_msg(LVL_ERROR, "Failed to create fibril for "
+                            "assigning driver.");
+                        /* XXX Cleanup */
+                        fibril_rwlock_write_unlock(&device_tree.rwlock);
+                        return ENOMEM;
                 }
+                fibril_add_ready(assign_fibril);
         } else {
                 loc_register_tree_function(fun, &device_tree);
@@ -291 +302 @@
         
         fibril_rwlock_write_lock(&device_tree.rwlock);
+        
+        if (fun->state == FUN_OFF_LINE) {
+                fibril_rwlock_write_unlock(&device_tree.rwlock);
+                log_msg(LVL_WARN, "Function %s is already off line.",
+                    fun->pathname);
+                return EOK;
+        }
         
         if (fun->ftype == fun_inner) {
@@ -329 +347 @@
         }
         
+        fun->state = FUN_OFF_LINE;
         fibril_rwlock_write_unlock(&device_tree.rwlock);