Changeset 0edaf0f6 in mainline for uspace/srv/net/tl/tcp/tqueue.c

Timestamp:

2011-12-16T18:04:30Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

ab9378b4

Parents:

7a8c1c4e

Message:

Revamp connection synchronization.

File:

• uspace/srv/net/tl/tcp/tqueue.c (modified) (10 diffs)

uspace/srv/net/tl/tcp/tqueue.c

@@ -167 +167 @@
         log_msg(LVL_DEBUG, "%s: tcp_tqueue_new_data()", conn->name);
 
-        fibril_mutex_lock(&conn->snd_buf_lock);
-
         /* Number of free sequence numbers in send window */
         avail_wnd = (conn->snd_una + conn->snd_wnd) - conn->snd_nxt;
@@ -178 +176 @@
             xfer_seqlen);
 
-        if (xfer_seqlen == 0) {
-                fibril_mutex_unlock(&conn->snd_buf_lock);
-                return;
-        }
+        if (xfer_seqlen == 0)
+                return;
 
         /* XXX Do not always send immediately */
@@ -198 +194 @@
         seg = tcp_segment_make_data(ctrl, conn->snd_buf, data_size);
         if (seg == NULL) {
-                fibril_mutex_unlock(&conn->snd_buf_lock);
                 log_msg(LVL_ERROR, "Memory allocation failure.");
                 return;
@@ -212 +207 @@
 
         fibril_condvar_broadcast(&conn->snd_buf_cv);
-        fibril_mutex_unlock(&conn->snd_buf_lock);
 
         if (send_fin)
@@ -323 +317 @@
         log_msg(LVL_DEBUG, "### %s: retransmit_timeout_func(%p)", conn->name, conn);
 
+        fibril_mutex_lock(&conn->lock);
+
         if (conn->cstate == st_closed) {
                 log_msg(LVL_DEBUG, "Connection already closed.");
+                fibril_mutex_unlock(&conn->lock);
+                tcp_conn_delref(conn);
                 return;
         }
@@ -331 +329 @@
         if (link == NULL) {
                 log_msg(LVL_DEBUG, "Nothing to retransmit");
+                fibril_mutex_unlock(&conn->lock);
+                tcp_conn_delref(conn);
                 return;
         }
@@ -339 +339 @@
         if (rt_seg == NULL) {
                 log_msg(LVL_ERROR, "Memory allocation failed.");
+                fibril_mutex_unlock(&conn->lock);
+                tcp_conn_delref(conn);
                 /* XXX Handle properly */
                 return;
@@ -348 +350 @@
         /* Reset retransmission timer */
         tcp_tqueue_timer_set(tqe->conn);
+
+        fibril_mutex_unlock(&conn->lock);
+        tcp_conn_delref(conn);
 }
 
@@ -355 +360 @@
         log_msg(LVL_DEBUG, "### %s: tcp_tqueue_timer_set()", conn->name);
 
-        (void) retransmit_timeout_func;
+        /* Clear first to make sure we update refcnt correctly */
+        tcp_tqueue_timer_clear(conn);
+
+        tcp_conn_addref(conn);
         fibril_timer_set(conn->retransmit.timer, RETRANSMIT_TIMEOUT,
             retransmit_timeout_func, (void *) conn);
@@ -365 +373 @@
         log_msg(LVL_DEBUG, "### %s: tcp_tqueue_timer_clear()", conn->name);
 
-        fibril_timer_clear(conn->retransmit.timer);
+        if (fibril_timer_clear(conn->retransmit.timer) == fts_active)
+                tcp_conn_delref(conn);
 }