Changeset 498ced1 in mainline for uspace/lib/c/generic/async/server.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/lib/c/generic/async/server.c (modified) (8 diffs)

uspace/lib/c/generic/async/server.c

@@ -129 +129 @@
 
         task_id_t in_task_id;
-        atomic_t refcnt;
+        int refcnt;
         void *data;
 } client_t;
@@ -327 +327 @@
         if (link) {
                 client = hash_table_get_inst(link, client_t, link);
-                atomic_inc(&client->refcnt);
+                client->refcnt++;
         } else if (create) {
                 // TODO: move the malloc out of critical section
@@ -336 +336 @@
                         client->data = async_client_data_create();
 
-                        atomic_set(&client->refcnt, 1);
+                        client->refcnt = 1;
                         hash_table_insert(&client_hash_table, &client->link);
                 }
@@ -351 +351 @@
         fibril_rmutex_lock(&client_mutex);
 
-        if (atomic_predec(&client->refcnt) == 0) {
+        if (--client->refcnt == 0) {
                 hash_table_remove(&client_hash_table, &client->in_task_id);
                 destroy = true;
@@ -1574 +1574 @@
         }
 
-        async_sess_t *sess = (async_sess_t *) malloc(sizeof(async_sess_t));
+        async_sess_t *sess = calloc(1, sizeof(async_sess_t));
         if (sess == NULL) {
                 async_answer_0(&call, ENOMEM);
@@ -1583 +1583 @@
         sess->mgmt = mgmt;
         sess->phone = phandle;
-        sess->arg1 = 0;
-        sess->arg2 = 0;
-        sess->arg3 = 0;
 
         fibril_mutex_initialize(&sess->remote_state_mtx);
-        sess->remote_state_data = NULL;
-
         list_initialize(&sess->exch_list);
         fibril_mutex_initialize(&sess->mutex);
-        atomic_set(&sess->refcnt, 0);
 
         /* Acknowledge the connected phone */
@@ -1622 +1616 @@
                 return NULL;
 
-        async_sess_t *sess = (async_sess_t *) malloc(sizeof(async_sess_t));
+        async_sess_t *sess = calloc(1, sizeof(async_sess_t));
         if (sess == NULL)
                 return NULL;
@@ -1629 +1623 @@
         sess->mgmt = mgmt;
         sess->phone = phandle;
-        sess->arg1 = 0;
-        sess->arg2 = 0;
-        sess->arg3 = 0;
 
         fibril_mutex_initialize(&sess->remote_state_mtx);
-        sess->remote_state_data = NULL;
-
         list_initialize(&sess->exch_list);
         fibril_mutex_initialize(&sess->mutex);
-        atomic_set(&sess->refcnt, 0);
 
         return sess;