Changeset 09ccaf5 for src/libcfa/concurrency

Timestamp:

Jun 6, 2018, 5:45:04 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, with_gc

Children:

ae3bb3d, b4e1876, e5d5272

Parents:

2ee0076 (diff), 214e8da (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 branch 'master' of plg2:software/cfa/cfa-cc

File:

• src/libcfa/concurrency/kernel.c (modified) (3 diffs)

src/libcfa/concurrency/kernel.c

@@ -16 +16 @@
 //C Includes
 #include <stddef.h>
+#include <errno.h>
 extern "C" {
 #include <stdio.h>
@@ -663 +664 @@
         __cfaabi_dbg_print_safe("Kernel : Processor %p ready to sleep\n", this);
 
-        verify( ({int sval = 0; sem_getvalue(&this->idleLock, &sval); sval; }) < 65536);
-        sem_wait(&idleLock);
+        verify( ({int sval = 0; sem_getvalue(&this->idleLock, &sval); sval; }) < 200);
+        int __attribute__((unused)) ret = sem_wait(&idleLock);
+        verify(ret > 0 || errno == EINTR);
 
         __cfaabi_dbg_print_safe("Kernel : Processor %p woke up and ready to run\n", this);
@@ -678 +680 @@
 void wake(processor * this) {
         __cfaabi_dbg_print_safe("Kernel : Waking up processor %p\n", this);
-        sem_post(&this->idleLock);
-        verify( ({int sval = 0; sem_getvalue(&this->idleLock, &sval); sval; }) < 65536);
+        int __attribute__((unused)) ret = sem_post(&this->idleLock);
+        verify(ret > 0 || errno == EINTR);
+        verify( ({int sval = 0; sem_getvalue(&this->idleLock, &sval); sval; }) < 200);
 }