Changeset 7c15d6f in mainline

Timestamp:

2015-06-06T15:20:52Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

9362cc2

Parents:

1ede059

Message:

Never clear timer inside its handler.

Location:

uspace

Files:

• lib/c/generic/fibril_synch.c (modified) (2 diffs)
• lib/c/include/fibril_synch.h (modified) (1 diff)
• srv/net/tcp/tqueue.c (modified) (1 diff)

uspace/lib/c/generic/fibril_synch.c

@@ -461 +461 @@
                         if (rc == ETIMEOUT && timer->state == fts_active) {
                                 timer->state = fts_fired;
-                                timer->handler_running = true;
+                                timer->handler_fid = fibril_get_id();
                                 fibril_mutex_unlock(timer->lockp);
                                 timer->fun(timer->arg);
                                 fibril_mutex_lock(timer->lockp);
-                                timer->handler_running = false;
+                                timer->handler_fid = 0;
                         }
                         break;
@@ -608 +608 @@
         assert(fibril_mutex_is_locked(timer->lockp));
 
-        while (timer->handler_running)
+        while (timer->handler_fid != 0) {
+                if (timer->handler_fid == fibril_get_id()) {
+                        printf("Deadlock detected.\n");
+                        stacktrace_print();
+                        printf("Fibril %zx is trying to clear timer %p from "
+                            "inside its handler %p.\n",
+                            fibril_get_id(), timer, timer->fun);
+                        abort();
+                }
+
                 fibril_condvar_wait(&timer->cv, timer->lockp);
+        }
 
         old_state = timer->state;

uspace/lib/c/include/fibril_synch.h

@@ -135 +135 @@
         fid_t fibril;
         fibril_timer_state_t state;
-        bool handler_running;
+        /** FID of fibril executing handler or 0 if handler is not running */
+        fid_t handler_fid;
 
         suseconds_t delay;

uspace/srv/net/tcp/tqueue.c

@@ -351 +351 @@
 
         /* Reset retransmission timer */
-        tcp_tqueue_timer_set(tqe->conn);
+        fibril_timer_set_locked(conn->retransmit.timer, RETRANSMIT_TIMEOUT,
+            retransmit_timeout_func, (void *) conn);
 
         tcp_conn_unlock(conn);
-        tcp_conn_delref(conn);
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "### %s: retransmit_timeout_func(%p) end", conn->name, conn);