Changeset 498ced1 in mainline for uspace/srv/volsrv

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/volsrv

Files:

• part.c (modified) (3 diffs)
• types/part.h (modified) (2 diffs)
• types/volume.h (modified) (2 diffs)
• volume.c (modified) (3 diffs)

uspace/srv/volsrv/part.c

@@ -179 +179 @@
         }
 
-        atomic_set(&part->refcnt, 1);
+        refcount_init(&part->refcnt);
         link_initialize(&part->lparts);
         part->parts = NULL;
@@ -524 +524 @@
                 if (part->svc_id == sid) {
                         /* Add reference */
-                        atomic_inc(&part->refcnt);
+                        refcount_up(&part->refcnt);
                         *rpart = part;
                         return EOK;
@@ -547 +547 @@
 void vol_part_del_ref(vol_part_t *part)
 {
-        if (atomic_predec(&part->refcnt) == 0)
+        if (refcount_down(&part->refcnt))
                 vol_part_delete(part);
 }

uspace/srv/volsrv/types/part.h

@@ -39 +39 @@
 
 #include <adt/list.h>
-#include <atomic.h>
+#include <refcount.h>
 #include <fibril_synch.h>
 #include <stdbool.h>
@@ -51 +51 @@
         link_t lparts;
         /** Reference count */
-        atomic_t refcnt;
+        atomic_refcount_t refcnt;
         /** Service ID */
         service_id_t svc_id;

uspace/srv/volsrv/types/volume.h

@@ -39 +39 @@
 
 #include <adt/list.h>
-#include <atomic.h>
+#include <refcount.h>
 #include <fibril_synch.h>
 #include <sif.h>
@@ -50 +50 @@
         link_t lvolumes;
         /** Reference count */
-        atomic_t refcnt;
+        atomic_refcount_t refcnt;
         /** Volume label */
         char *label;

uspace/srv/volsrv/volume.c

@@ -83 +83 @@
         }
 
-        atomic_set(&volume->refcnt, 1);
+        refcount_init(&volume->refcnt);
         link_initialize(&volume->lvolumes);
         volume->volumes = NULL;
@@ -245 +245 @@
                     str_size(label) > 0) {
                         /* Add reference */
-                        atomic_inc(&volume->refcnt);
+                        refcount_up(&volume->refcnt);
                         *rvolume = volume;
                         return EOK;
@@ -309 +309 @@
 void vol_volume_del_ref(vol_volume_t *volume)
 {
-        if (atomic_predec(&volume->refcnt) == 0) {
+        if (refcount_down(&volume->refcnt)) {
                 /* No more references. Check if volume is persistent. */
                 if (!vol_volume_is_persist(volume)) {