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

Timestamp:

2011-12-13T17:06:25Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

7a8c1c4e

Parents:

0d29e0cd

Message:

Eliminate busy waiting when TCP send buffer is full.

File:

• uspace/srv/net/tl/tcp/tqueue.c (modified) (5 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;
@@ -176 +178 @@
             xfer_seqlen);
 
-        if (xfer_seqlen == 0)
-                return;
+        if (xfer_seqlen == 0) {
+                fibril_mutex_unlock(&conn->snd_buf_lock);
+                return;
+        }
 
         /* XXX Do not always send immediately */
@@ -188 +192 @@
                 /* We are sending out FIN */
                 ctrl = CTL_FIN;
-                tcp_conn_fin_sent(conn);
         } else {
                 ctrl = 0;
@@ -195 +198 @@
         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;
@@ -206 +210 @@
         if (send_fin)
                 conn->snd_buf_fin = false;
+
+        fibril_condvar_broadcast(&conn->snd_buf_cv);
+        fibril_mutex_unlock(&conn->snd_buf_lock);
+
+        if (send_fin)
+                tcp_conn_fin_sent(conn);
 
         tcp_tqueue_seg(conn, seg);