Changeset 12573db in mainline for uspace/lib/c/generic/fibril_synch.c

Timestamp:

2011-01-31T20:32:33Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

37cf3792

Parents:

4fe94c66 (diff), 197ef43 (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) (6 diffs)

uspace/lib/c/generic/fibril_synch.c

@@ -36 +36 @@
 #include <fibril.h>
 #include <async.h>
-#include <async_priv.h>
 #include <adt/list.h>
 #include <futex.h>
@@ -44 +43 @@
 #include <stacktrace.h>
 #include <stdlib.h>
+#include "private/async.h"
 
 static void optimize_execution_power(void)
@@ -55 +55 @@
          */
         if (atomic_get(&threads_in_ipc_wait) > 0)
-                ipc_poke();
+                async_poke();
 }
 
@@ -105 +105 @@
 
         if (fibril_get_sercount() != 0)
-                core();
+                abort();
 
         futex_down(&async_futex);
@@ -198 +198 @@
         
         if (fibril_get_sercount() != 0)
-                core();
+                abort();
 
         futex_down(&async_futex);
@@ -226 +226 @@
         
         if (fibril_get_sercount() != 0)
-                core();
+                abort();
 
         futex_down(&async_futex);