Changeset 498ced1 in mainline for uspace/srv/devman

Timestamp:

2018-08-11T02:43:32Z (7 years ago)

Author:

Jiří Zárevúcky <jiri.zarevucky@…>

Branches:

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

Children:

05882233

Parents:

b13d80b

git-author:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-08-11 02:29:02)

git-committer:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-08-11 02:43:32)

Message:

Unify reference counting and remove some unnecessary instances of <atomic.h>

Location:

uspace/srv/devman

Files:

• dev.c (modified) (3 diffs)
• devman.h (modified) (3 diffs)
• driver.c (modified) (1 diff)
• fun.c (modified) (3 diffs)

uspace/srv/devman/dev.c

@@ -48 +48 @@
                 return NULL;
 
-        atomic_set(&dev->refcnt, 0);
+        refcount_init(&dev->refcnt);
         list_initialize(&dev->functions);
         link_initialize(&dev->driver_devices);
@@ -74 +74 @@
 void dev_add_ref(dev_node_t *dev)
 {
-        atomic_inc(&dev->refcnt);
+        refcount_up(&dev->refcnt);
 }
 
@@ -85 +85 @@
 void dev_del_ref(dev_node_t *dev)
 {
-        if (atomic_predec(&dev->refcnt) == 0)
+        if (refcount_down(&dev->refcnt))
                 delete_dev_node(dev);
 }

uspace/srv/devman/devman.h

@@ -41 +41 @@
 #include <ipc/loc.h>
 #include <fibril_synch.h>
-#include <atomic.h>
+#include <refcount.h>
 #include <async.h>
 
@@ -115 +115 @@
 struct dev_node {
         /** Reference count */
-        atomic_t refcnt;
+        atomic_refcount_t refcnt;
 
         /** The global unique identifier of the device. */
@@ -155 +155 @@
 struct fun_node {
         /** Reference count */
-        atomic_t refcnt;
+        atomic_refcount_t refcnt;
         /** State */
         fun_state_t state;

uspace/srv/devman/driver.c

@@ -406 +406 @@
                 }
 
-                log_msg(LOG_DEFAULT, LVL_DEBUG, "pass_devices_to_driver: dev->refcnt=%d\n",
-                    (int)atomic_get(&dev->refcnt));
                 dev_add_ref(dev);
 

uspace/srv/devman/fun.c

@@ -60 +60 @@
 
         fun->state = FUN_INIT;
-        atomic_set(&fun->refcnt, 0);
+        refcount_init(&fun->refcnt);
         fibril_mutex_initialize(&fun->busy_lock);
         link_initialize(&fun->dev_functions);
@@ -89 +89 @@
 void fun_add_ref(fun_node_t *fun)
 {
-        atomic_inc(&fun->refcnt);
+        refcount_up(&fun->refcnt);
 }
 
@@ -100 +100 @@
 void fun_del_ref(fun_node_t *fun)
 {
-        if (atomic_predec(&fun->refcnt) == 0)
+        if (refcount_down(&fun->refcnt))
                 delete_fun_node(fun);
 }