Changeset e1b4ae0 in mainline for uspace/srv/net/tcp/conn.c

Timestamp:

2017-09-11T07:05:21Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

9713b0b

Parents:

975d528

Message:

Start adding tests for TCP conn module. Make sure all connections have been freed at the end of a test.

File:

• uspace/srv/net/tcp/conn.c (modified) (14 diffs)

uspace/srv/net/tcp/conn.c

@@ -59 +59 @@
 #define TIME_WAIT_TIMEOUT       (2*MAX_SEGMENT_LIFETIME)
 
+/** List of all allocated connections */
 static LIST_INITIALIZE(conn_list);
 /** Taken after tcp_conn_t lock */
 static FIBRIL_MUTEX_INITIALIZE(conn_list_lock);
+/** Connection association map */
 static amap_t *amap;
+static FIBRIL_MUTEX_INITIALIZE(amap_lock);
 
 static void tcp_conn_seg_process(tcp_conn_t *, tcp_segment_t *);
@@ -85 +88 @@
 
         return EOK;
+}
+
+/** Finalize connections. */
+void tcp_conns_fini(void)
+{
+        amap_destroy(amap);
+        amap = NULL;
+
+        assert(list_empty(&conn_list));
 }
 
@@ -156 +168 @@
         if (epp != NULL)
                 conn->ident = *epp;
+
+        fibril_mutex_lock(&conn_list_lock);
+        list_append(&conn->link, &conn_list);
+        fibril_mutex_unlock(&conn_list_lock);
 
         return conn;
@@ -192 +208 @@
         tcp_tqueue_fini(&conn->retransmit);
 
+        fibril_mutex_lock(&conn_list_lock);
+        list_remove(&conn->link);
+        fibril_mutex_unlock(&conn_list_lock);
+
         if (conn->rcv_buf != NULL)
                 free(conn->rcv_buf);
@@ -263 +283 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: tcp_conn_delete(%p)", conn->name, conn);
 
+        assert(conn->mapped == false);
         assert(conn->deleted == false);
         conn->deleted = true;
@@ -280 +301 @@
 
         tcp_conn_addref(conn);
-        fibril_mutex_lock(&conn_list_lock);
+        fibril_mutex_lock(&amap_lock);
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_conn_add: conn=%p", conn);
@@ -287 +308 @@
         if (rc != EOK) {
                 tcp_conn_delref(conn);
-                fibril_mutex_unlock(&conn_list_lock);
+                fibril_mutex_unlock(&amap_lock);
                 return rc;
         }
 
         conn->ident = aepp;
-        list_append(&conn->link, &conn_list);
-        fibril_mutex_unlock(&conn_list_lock);
+        conn->mapped = true;
+        fibril_mutex_unlock(&amap_lock);
 
         return EOK;
@@ -304 +325 @@
 void tcp_conn_remove(tcp_conn_t *conn)
 {
-        if (!link_used(&conn->link))
-                return;
-
-        fibril_mutex_lock(&conn_list_lock);
+        if (!conn->mapped)
+                return;
+
+        fibril_mutex_lock(&amap_lock);
         amap_remove(amap, &conn->ident);
-        list_remove(&conn->link);
-        fibril_mutex_unlock(&conn_list_lock);
+        conn->mapped = false;
+        fibril_mutex_unlock(&amap_lock);
         tcp_conn_delref(conn);
 }
@@ -400 +421 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_conn_find_ref(%p)", epp);
 
-        fibril_mutex_lock(&conn_list_lock);
+        fibril_mutex_lock(&amap_lock);
 
         rc = amap_find_match(amap, epp, &arg);
         if (rc != EOK) {
                 assert(rc == ENOENT);
-                fibril_mutex_unlock(&conn_list_lock);
+                fibril_mutex_unlock(&amap_lock);
                 return NULL;
         }
@@ -412 +433 @@
         tcp_conn_addref(conn);
 
-        fibril_mutex_unlock(&conn_list_lock);
+        fibril_mutex_unlock(&amap_lock);
         log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_conn_find_ref: got conn=%p",
             conn);
@@ -424 +445 @@
 void tcp_conn_reset(tcp_conn_t *conn)
 {
+        assert(fibril_mutex_is_locked(&conn->lock));
+
         log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: tcp_conn_reset()", conn->name);
         conn->reset = true;
@@ -1223 +1246 @@
 
                 /* Need to remove and re-insert connection with new identity */
-                fibril_mutex_lock(&conn_list_lock);
+                fibril_mutex_lock(&amap_lock);
 
                 if (inet_addr_is_any(&conn->ident.remote.addr))
@@ -1239 +1262 @@
                         assert(rc == ENOMEM);
                         log_msg(LOG_DEFAULT, LVL_ERROR, "Out of memory.");
-                        fibril_mutex_unlock(&conn_list_lock);
+                        fibril_mutex_unlock(&amap_lock);
                         tcp_conn_unlock(conn);
                         return;
@@ -1245 +1268 @@
 
                 amap_remove(amap, &oldepp);
-                fibril_mutex_unlock(&conn_list_lock);
+                fibril_mutex_unlock(&amap_lock);
 
                 conn->name = (char *) "a";