Changeset 174845e for src/libcfa/concurrency

Timestamp:

Jun 5, 2018, 3:35:49 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

beefc34c

Parents:

41770ed1 (diff), dafdbe7 (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 plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

src/libcfa/concurrency/kernel.c

@@ -663 +663 @@
         __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 +679 @@
 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);
 }