Changeset 80cd7cd in mainline for uspace/lib/c/generic/fibril_synch.c

Timestamp:

2011-01-13T20:58:24Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

87e373b

Parents:

eaef141 (diff), a613fea1 (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/lib/c/generic/fibril_synch.c (modified) (3 diffs)

uspace/lib/c/generic/fibril_synch.c

@@ -104 +104 @@
         fibril_t *f = (fibril_t *) fibril_get_id();
 
+        if (fibril_get_sercount() != 0)
+                core();
+
         futex_down(&async_futex);
         if (fm->counter-- <= 0) {
@@ -194 +197 @@
         fibril_t *f = (fibril_t *) fibril_get_id();
         
+        if (fibril_get_sercount() != 0)
+                core();
+
         futex_down(&async_futex);
         if (frw->writers) {
@@ -219 +225 @@
         fibril_t *f = (fibril_t *) fibril_get_id();
         
+        if (fibril_get_sercount() != 0)
+                core();
+
         futex_down(&async_futex);
         if (frw->writers || frw->readers) {