Changeset 741fd16 in mainline for kernel/generic/src/synch/futex.c

Timestamp:

2008-11-21T22:14:24Z (16 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

32e6c9c

Parents:

384c488

Message:

Stoppability sections must be much smaller (design error). Also fix deadlock in udebug_stop(). Fix pause functionality in tracer.

File:

• kernel/generic/src/synch/futex.c (modified) (2 diffs)

kernel/generic/src/synch/futex.c

@@ -116 +116 @@
         pte_t *t;
         ipl_t ipl;
+        int rc;
         
         ipl = interrupts_disable();
@@ -135 +136 @@
 
         futex = futex_find(paddr);
-        
-        return (unative_t) waitq_sleep_timeout(&futex->wq, usec, flags |
+
+#ifdef CONFIG_UDEBUG
+        udebug_stoppable_begin();
+#endif
+        rc = waitq_sleep_timeout(&futex->wq, usec, flags |
             SYNCH_FLAGS_INTERRUPTIBLE);
+
+#ifdef CONFIG_UDEBUG
+        udebug_stoppable_end();
+#endif
+        return (unative_t) rc;
 }