Changeset b68fc85

Timestamp:

May 2, 2018, 5:38:06 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:

d28a03e, fb16d5c

Parents:

9d32bc8

Message:

Added more checks to preempt test to make sure preemption stays enabled

Location:

src

Files:

• libcfa/concurrency/preemption.c (modified) (1 diff)
• tests/concurrent/preempt.c (modified) (2 diffs)

src/libcfa/concurrency/preemption.c

@@ -404 +404 @@
 }
 
+//=============================================================================================
+// Kernel Signal Debug
+//=============================================================================================
+
+void __cfaabi_check_preemption() {
+        bool ready = TL_GET( preemption_state ).enabled;
+        if(!ready) { abort("Preemption should be ready"); }
+
+        sigset_t oldset;
+        int ret;
+        ret = sigprocmask(0, NULL, &oldset);
+        if(ret != 0) { abort("ERROR sigprocmask returned %d", ret); }
+
+        ret = sigismember(&oldset, SIGUSR1);
+        if(ret <  0) { abort("ERROR sigismember returned %d", ret); }
+
+        if(ret == 1) { abort("ERROR SIGUSR1 is disabled"); }
+}
+
 // Local Variables: //
 // mode: c //

src/tests/concurrent/preempt.c

@@ -17 +17 @@
 #endif
 
+extern void __cfaabi_check_preemption();
+
 static volatile int counter = 0;
 
@@ -29 +31 @@
 void main(worker_t & this) {
         while(counter < N) {
+                __cfaabi_check_preemption();
                 if( (counter % 7) == this.value ) {
+                        __cfaabi_check_preemption();
                         int next = __atomic_add_fetch_4(&counter, 1, __ATOMIC_SEQ_CST);
+                        __cfaabi_check_preemption();
                         if( (next % 100) == 0 ) printf("%d\n", (int)next);
+                        __cfaabi_check_preemption();
                 }
+                __cfaabi_check_preemption();
         }
 }