Changeset 498ced1 in mainline for uspace/srv/hid/compositor/compositor.c

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>

File:

• uspace/srv/hid/compositor/compositor.c (modified) (8 diffs)

uspace/srv/hid/compositor/compositor.c

@@ -33 +33 @@
  */
 
+#include <assert.h>
 #include <stddef.h>
 #include <stdint.h>
@@ -46 +47 @@
 #include <stdlib.h>
 
-#include <atomic.h>
+#include <refcount.h>
 #include <fibril_synch.h>
 #include <adt/prodcons.h>
@@ -93 +94 @@
 typedef struct {
         link_t link;
-        atomic_t ref_cnt;
+        atomic_refcount_t ref_cnt;
         window_flags_t flags;
         service_id_t in_dsid;
@@ -223 +224 @@
 
         link_initialize(&win->link);
-        atomic_set(&win->ref_cnt, 0);
+        refcount_init(&win->ref_cnt);
         prodcons_initialize(&win->queue);
         transform_identity(&win->transform);
@@ -240 +241 @@
 static void window_destroy(window_t *win)
 {
-        if ((win) && (atomic_get(&win->ref_cnt) == 0)) {
-                while (!list_empty(&win->queue.list)) {
-                        window_event_t *event = (window_event_t *) list_first(&win->queue.list);
-                        list_remove(&event->link);
-                        free(event);
-                }
-
-                if (win->surface)
-                        surface_destroy(win->surface);
-
-                free(win);
-        }
+        if (!win || !refcount_down(&win->ref_cnt))
+                return;
+
+        while (!list_empty(&win->queue.list)) {
+                window_event_t *event = (window_event_t *) list_first(&win->queue.list);
+                list_remove(&event->link);
+                free(event);
+        }
+
+        if (win->surface)
+                surface_destroy(win->surface);
+
+        free(win);
 }
 
@@ -988 +990 @@
                 }
         }
+
+        if (win)
+                refcount_up(&win->ref_cnt);
+
         fibril_mutex_unlock(&window_list_mtx);
 
         if (win) {
-                atomic_inc(&win->ref_cnt);
                 async_answer_0(icall, EOK);
         } else {
@@ -1005 +1010 @@
                         if (!IPC_GET_IMETHOD(call)) {
                                 async_answer_0(&call, EOK);
-                                atomic_dec(&win->ref_cnt);
                                 window_destroy(win);
                                 return;
@@ -1024 +1028 @@
                         if (!IPC_GET_IMETHOD(call)) {
                                 comp_window_close(win, &call);
-                                atomic_dec(&win->ref_cnt);
                                 window_destroy(win);
                                 return;