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

uspace/lib/c/generic/async/client.c

@@ -185 +185 @@
         list_initialize(&session_ns.exch_list);
         fibril_mutex_initialize(&session_ns.mutex);
-        atomic_set(&session_ns.refcnt, 0);
+        session_ns.exchanges = 0;
 }
 
@@ -605 +605 @@
         }
 
-        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) {
                 errno = ENOMEM;
@@ -627 +627 @@
 
         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;
@@ -676 +673 @@
         }
 
-        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) {
                 errno = ENOMEM;
@@ -698 +695 @@
 
         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;
@@ -712 +706 @@
 async_sess_t *async_connect_kbox(task_id_t id)
 {
-        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) {
                 errno = ENOMEM;
@@ -729 +723 @@
         sess->mgmt = EXCHANGE_ATOMIC;
         sess->phone = phone;
-        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;
@@ -761 +749 @@
         assert(sess);
 
-        if (atomic_get(&sess->refcnt) > 0)
-                return EBUSY;
-
         fibril_mutex_lock(&async_sess_mutex);
+
+        assert(sess->exchanges == 0);
 
         errno_t rc = async_hangup_internal(sess->phone);
@@ -874 +861 @@
         }
 
+        if (exch != NULL)
+                sess->exchanges++;
+
         fibril_mutex_unlock(&async_sess_mutex);
 
-        if (exch != NULL) {
-                atomic_inc(&sess->refcnt);
-
-                if (mgmt == EXCHANGE_SERIALIZE)
-                        fibril_mutex_lock(&sess->mutex);
-        }
+        if (exch != NULL && mgmt == EXCHANGE_SERIALIZE)
+                fibril_mutex_lock(&sess->mutex);
 
         return exch;
@@ -903 +889 @@
                 mgmt = sess->iface & IFACE_EXCHANGE_MASK;
 
-        atomic_dec(&sess->refcnt);
-
         if (mgmt == EXCHANGE_SERIALIZE)
                 fibril_mutex_unlock(&sess->mutex);
 
         fibril_mutex_lock(&async_sess_mutex);
+
+        sess->exchanges--;
 
         list_append(&exch->sess_link, &sess->exch_list);