Changeset 498ced1 in mainline for uspace/srv/bd

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/bd/vbd

Files:

• disk.c (modified) (3 diffs)
• types/vbd.h (modified) (2 diffs)

uspace/srv/bd/vbd/disk.c

@@ -244 +244 @@
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG2, "vbds_part_add_ref");
-        atomic_inc(&part->refcnt);
+        refcount_up(&part->refcnt);
 }
 
@@ -250 +250 @@
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG2, "vbds_part_del_ref");
-        if (atomic_predec(&part->refcnt) == 0) {
+        if (refcount_down(&part->refcnt)) {
                 log_msg(LOG_DEFAULT, LVL_DEBUG2, " - free part");
                 free(part);
@@ -328 +328 @@
         part->block0 = lpinfo.block0;
         part->nblocks = lpinfo.nblocks;
-        atomic_set(&part->refcnt, 1);
+        refcount_init(&part->refcnt);
 
         bd_srvs_init(&part->bds);

uspace/srv/bd/vbd/types/vbd.h

@@ -39 +39 @@
 
 #include <adt/list.h>
-#include <atomic.h>
 #include <bd_srv.h>
 #include <label/label.h>
 #include <loc.h>
+#include <refcount.h>
 #include <stdbool.h>
 #include <stddef.h>
@@ -83 +83 @@
         aoff64_t nblocks;
         /** Reference count */
-        atomic_t refcnt;
+        atomic_refcount_t refcnt;
 } vbds_part_t;