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

Timestamp:

2014-07-13T14:06:23Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

af2a76c, f303f2cf

Parents:

c1b979a

Message:

Fibril timer locking improvements.

File:

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

uspace/srv/net/tcp/conn.c

@@ -78 +78 @@
                 goto error;
 
-        conn->tw_timer = fibril_timer_create();
+        fibril_mutex_initialize(&conn->lock);
+
+        conn->tw_timer = fibril_timer_create(&conn->lock);
         if (conn->tw_timer == NULL)
                 goto error;
-
-        fibril_mutex_initialize(&conn->lock);
 
         /* One for the user, one for not being in closed state */
@@ -200 +200 @@
         if (atomic_predec(&conn->refcnt) == 0)
                 tcp_conn_free(conn);
+}
+
+/** Lock connection.
+ *
+ * Must be called before any other connection-manipulating function,
+ * except tcp_conn_{add|del}ref(). Locks the connection including
+ * its timers. Must not be called inside any of the connection
+ * timer handlers.
+ *
+ * @param conn          Connection
+ */
+void tcp_conn_lock(tcp_conn_t *conn)
+{
+        fibril_mutex_lock(&conn->lock);
+}
+
+/** Unlock connection.
+ *
+ * @param conn          Connection
+ */
+void tcp_conn_unlock(tcp_conn_t *conn)
+{
+        fibril_mutex_unlock(&conn->lock);
 }
 
@@ -1183 +1206 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "tw_timeout_func(%p)", 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;
@@ -1196 +1219 @@
         tcp_conn_state_set(conn, st_closed);
 
-        fibril_mutex_unlock(&conn->lock);
+        tcp_conn_unlock(conn);
         tcp_conn_delref(conn);
+
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "tw_timeout_func(%p) end", conn);
 }
 
@@ -1206 +1231 @@
 void tcp_conn_tw_timer_set(tcp_conn_t *conn)
 {
+        log_msg(LOG_DEFAULT, LVL_DEBUG2, "tcp_conn_tw_timer_set() begin");
         tcp_conn_addref(conn);
-        fibril_timer_set(conn->tw_timer, TIME_WAIT_TIMEOUT, tw_timeout_func,
-            (void *)conn);
+        fibril_timer_set_locked(conn->tw_timer, TIME_WAIT_TIMEOUT,
+            tw_timeout_func, (void *)conn);
+        log_msg(LOG_DEFAULT, LVL_DEBUG2, "tcp_conn_tw_timer_set() end");
 }
 
@@ -1217 +1244 @@
 void tcp_conn_tw_timer_clear(tcp_conn_t *conn)
 {
-        if (fibril_timer_clear(conn->tw_timer) == fts_active)
+        log_msg(LOG_DEFAULT, LVL_DEBUG2, "tcp_conn_tw_timer_clear() begin");
+        if (fibril_timer_clear_locked(conn->tw_timer) == fts_active)
                 tcp_conn_delref(conn);
+        log_msg(LOG_DEFAULT, LVL_DEBUG2, "tcp_conn_tw_timer_clear() end");
 }