Changeset 508b0df1 in mainline for uspace/lib/graph/graph.c

Timestamp:

2018-09-06T20:21:52Z (6 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:

78de83de, fc10e1b

Parents:

4621d23

git-author:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-08-13 03:53:39)

git-committer:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-09-06 20:21:52)

Message:

Remove uspace <atomic.h>, use <stdatomic.h> instead

File:

• uspace/lib/graph/graph.c (modified) (9 diffs)

uspace/lib/graph/graph.c

@@ -70 +70 @@
 {
         link_initialize(&vs->link);
-        atomic_set(&vs->ref_cnt, 0);
+        atomic_flag_clear(&vs->claimed);
         vs->notif_sess = NULL;
         fibril_mutex_initialize(&vs->mode_mtx);
@@ -83 +83 @@
         // TODO
         link_initialize(&rnd->link);
-        atomic_set(&rnd->ref_cnt, 0);
+        refcount_init(&rnd->ref_cnt);
 }
 
@@ -173 +173 @@
         }
 
+        if (rnd)
+                refcount_up(&rnd->ref_cnt);
+
         fibril_mutex_unlock(&renderer_list_mtx);
 
@@ -200 +203 @@
 void graph_destroy_visualizer(visualizer_t *vs)
 {
-        assert(atomic_get(&vs->ref_cnt) == 0);
+        assert(!atomic_flag_test_and_set(&vs->claimed));
         assert(vs->notif_sess == NULL);
         assert(!fibril_mutex_is_locked(&vs->mode_mtx));
@@ -214 +217 @@
 {
         // TODO
-        assert(atomic_get(&rnd->ref_cnt) == 0);
-
-        free(rnd);
+        if (refcount_down(&rnd->ref_cnt))
+                free(rnd);
 }
 
@@ -493 +495 @@
 {
         /* Claim the visualizer. */
-        if (!cas(&vs->ref_cnt, 0, 1)) {
+        if (atomic_flag_test_and_set(&vs->claimed)) {
                 async_answer_0(icall, ELIMIT);
                 return;
@@ -559 +561 @@
         async_hangup(vs->notif_sess);
         vs->notif_sess = NULL;
-        atomic_set(&vs->ref_cnt, 0);
+        atomic_flag_clear(&vs->claimed);
 }
 
@@ -567 +569 @@
 
         /* Accept the connection. */
-        atomic_inc(&rnd->ref_cnt);
         async_answer_0(icall, EOK);
 
@@ -588 +589 @@
 
 terminate:
-        atomic_dec(&rnd->ref_cnt);
+        graph_destroy_renderer(rnd);
 }