Changeset 498ced1 in mainline for uspace/srv/net

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

Files:

• tcp/conn.c (modified) (3 diffs)
• tcp/tcp_type.h (modified) (2 diffs)
• udp/assoc.c (modified) (3 diffs)
• udp/udp_type.h (modified) (2 diffs)

uspace/srv/net/tcp/conn.c

@@ -128 +128 @@
 
         /* One for the user, one for not being in closed state */
-        atomic_set(&conn->refcnt, 2);
+        refcount_init(&conn->refcnt);
+        refcount_up(&conn->refcnt);
 
         /* Allocate receive buffer */
@@ -238 +239 @@
 void tcp_conn_addref(tcp_conn_t *conn)
 {
-        log_msg(LOG_DEFAULT, LVL_DEBUG2, "%s: tcp_conn_addref(%p) before=%zu",
-            conn->name, conn, atomic_get(&conn->refcnt));
-        atomic_inc(&conn->refcnt);
+        log_msg(LOG_DEFAULT, LVL_DEBUG2, "%s: tcp_conn_addref(%p)",
+            conn->name, conn);
+
+        refcount_up(&conn->refcnt);
 }
 
@@ -251 +253 @@
 void tcp_conn_delref(tcp_conn_t *conn)
 {
-        log_msg(LOG_DEFAULT, LVL_DEBUG2, "%s: tcp_conn_delref(%p) before=%zu",
-            conn->name, conn, atomic_get(&conn->refcnt));
-
-        if (atomic_predec(&conn->refcnt) == 0)
+        log_msg(LOG_DEFAULT, LVL_DEBUG2, "%s: tcp_conn_delref(%p)",
+            conn->name, conn);
+
+        if (refcount_down(&conn->refcnt))
                 tcp_conn_free(conn);
 }

uspace/srv/net/tcp/tcp_type.h

@@ -41 +41 @@
 #include <fibril.h>
 #include <fibril_synch.h>
+#include <refcount.h>
 #include <stddef.h>
 #include <stdint.h>
@@ -248 +249 @@
         fibril_mutex_t lock;
         /** Reference count */
-        atomic_t refcnt;
+        atomic_refcount_t refcnt;
 
         /** Connection state */

uspace/srv/net/udp/assoc.c

@@ -91 +91 @@
 
         /* One for the user */
-        atomic_set(&assoc->refcnt, 1);
+        refcount_init(&assoc->refcnt);
 
         /* Initialize receive queue */
@@ -145 +145 @@
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: upd_assoc_addref(%p)", assoc->name, assoc);
-        atomic_inc(&assoc->refcnt);
+        refcount_up(&assoc->refcnt);
 }
 
@@ -158 +158 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: udp_assoc_delref(%p)", assoc->name, assoc);
 
-        if (atomic_predec(&assoc->refcnt) == 0)
+        if (refcount_down(&assoc->refcnt))
                 udp_assoc_free(assoc);
 }

uspace/srv/net/udp/udp_type.h

@@ -41 +41 @@
 #include <inet/endpoint.h>
 #include <ipc/loc.h>
+#include <refcount.h>
 #include <stdbool.h>
 #include <stddef.h>
@@ -114 +115 @@
         fibril_mutex_t lock;
         /** Reference count */
-        atomic_t refcnt;
+        atomic_refcount_t refcnt;
 
         /** Receive queue */