Changes in uspace/srv/net/tcp/tqueue.c [c0f3460:7c15d6f] in mainline

File:

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

uspace/srv/net/tcp/tqueue.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2011 Jiri Svoboda
+ * Copyright (c) 2015 Jiri Svoboda
  * All rights reserved.
  *
@@ -62 +62 @@
 {
         tqueue->conn = conn;
-        tqueue->timer = fibril_timer_create();
+        tqueue->timer = fibril_timer_create(&conn->lock);
         if (tqueue->timer == NULL)
                 return ENOMEM;
@@ -92 +92 @@
         seg = tcp_segment_make_ctrl(ctrl);
         tcp_tqueue_seg(conn, seg);
+        tcp_segment_delete(seg);
 }
 
@@ -212 +213 @@
 
         tcp_tqueue_seg(conn, seg);
+        tcp_segment_delete(seg);
 }
 
@@ -280 +282 @@
 }
 
-void tcp_transmit_segment(tcp_sockpair_t *sp, tcp_segment_t *seg)
+void tcp_transmit_segment(inet_ep2_t *epp, tcp_segment_t *seg)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG,
-            "tcp_transmit_segment(f:(%u),l:(%u), %p)",
-            sp->local.port, sp->foreign.port, seg);
-        
+            "tcp_transmit_segment(l:(%u),f:(%u), %p)",
+            epp->local.port, epp->remote.port, seg);
+
         log_msg(LOG_DEFAULT, LVL_DEBUG, "SEG.SEQ=%" PRIu32 ", SEG.WND=%" PRIu32,
             seg->seq, seg->wnd);
@@ -299 +301 @@
         tcp_pdu_t *pdu;
 
-        if (tcp_pdu_encode(sp, seg, &pdu) != EOK) {
+        if (tcp_pdu_encode(epp, seg, &pdu) != EOK) {
                 log_msg(LOG_DEFAULT, LVL_WARN, "Not enough memory. Segment dropped.");
                 return;
@@ -317 +319 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "### %s: retransmit_timeout_func(%p)", conn->name, conn);
 
-        fibril_mutex_lock(&conn->lock);
+        tcp_conn_lock(conn);
 
         if (conn->cstate == st_closed) {
                 log_msg(LOG_DEFAULT, LVL_DEBUG, "Connection already closed.");
-                fibril_mutex_unlock(&conn->lock);
+                tcp_conn_unlock(conn);
                 tcp_conn_delref(conn);
                 return;
@@ -329 +331 @@
         if (link == NULL) {
                 log_msg(LOG_DEFAULT, LVL_DEBUG, "Nothing to retransmit");
-                fibril_mutex_unlock(&conn->lock);
+                tcp_conn_unlock(conn);
                 tcp_conn_delref(conn);
                 return;
@@ -339 +341 @@
         if (rt_seg == NULL) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Memory allocation failed.");
-                fibril_mutex_unlock(&conn->lock);
+                tcp_conn_unlock(conn);
                 tcp_conn_delref(conn);
                 /* XXX Handle properly */
@@ -349 +351 @@
 
         /* Reset retransmission timer */
-        tcp_tqueue_timer_set(tqe->conn);
-
-        fibril_mutex_unlock(&conn->lock);
-        tcp_conn_delref(conn);
+        fibril_timer_set_locked(conn->retransmit.timer, RETRANSMIT_TIMEOUT,
+            retransmit_timeout_func, (void *) conn);
+
+        tcp_conn_unlock(conn);
+
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "### %s: retransmit_timeout_func(%p) end", conn->name, conn);
 }
 
@@ -358 +362 @@
 static void tcp_tqueue_timer_set(tcp_conn_t *conn)
 {
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "### %s: tcp_tqueue_timer_set()", conn->name);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "### %s: tcp_tqueue_timer_set() begin", conn->name);
 
         /* Clear first to make sure we update refcnt correctly */
@@ -364 +368 @@
 
         tcp_conn_addref(conn);
-        fibril_timer_set(conn->retransmit.timer, RETRANSMIT_TIMEOUT,
+        fibril_timer_set_locked(conn->retransmit.timer, RETRANSMIT_TIMEOUT,
             retransmit_timeout_func, (void *) conn);
+
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "### %s: tcp_tqueue_timer_set() end", conn->name);
 }
 
@@ -371 +377 @@
 static void tcp_tqueue_timer_clear(tcp_conn_t *conn)
 {
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "### %s: tcp_tqueue_timer_clear()", conn->name);
-
-        if (fibril_timer_clear(conn->retransmit.timer) == fts_active)
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "### %s: tcp_tqueue_timer_clear() begin", conn->name);
+
+        if (fibril_timer_clear_locked(conn->retransmit.timer) == fts_active)
                 tcp_conn_delref(conn);
+
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "### %s: tcp_tqueue_timer_clear() end", conn->name);
 }