Changeset 15d0046 in mainline for uspace/srv/net/tcp/tqueue.c

Timestamp:

2014-09-12T13:22:33Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

9b20126

Parents:

8db09e4 (diff), 105d8d6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

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

uspace/srv/net/tcp/tqueue.c

@@ -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);
 }
 
@@ -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 */
@@ -351 +353 @@
         tcp_tqueue_timer_set(tqe->conn);
 
-        fibril_mutex_unlock(&conn->lock);
+        tcp_conn_unlock(conn);
         tcp_conn_delref(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);
 }