Changeset 3e3f236 for libcfa/src/concurrency/preemption.cfa

Timestamp:

Dec 10, 2020, 4:00:29 PM (4 years ago)

Author:

Fangren Yu <f37yu@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

97aca3d, b3a0df6

Parents:

6a45bd78 (diff), 297cf18 (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:

• libcfa/src/concurrency/preemption.cfa (modified) (9 diffs)

libcfa/src/concurrency/preemption.cfa

@@ -354 +354 @@
 }
 
+//-----------------------------------------------------------------------------
+// Kernel Signal Debug
+void __cfaabi_check_preemption() {
+        bool ready = __preemption_enabled();
+        if(!ready) { abort("Preemption should be ready"); }
+
+        __cfaasm_label(debug, before);
+
+                sigset_t oldset;
+                int ret;
+                ret = pthread_sigmask(0, ( const sigset_t * ) 0p, &oldset);  // workaround trac#208: cast should be unnecessary
+                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"); }
+
+                ret = sigismember(&oldset, SIGALRM);
+                if(ret <  0) { abort("ERROR sigismember returned %d", ret); }
+                if(ret == 0) { abort("ERROR SIGALRM is enabled"); }
+
+                ret = sigismember(&oldset, SIGTERM);
+                if(ret <  0) { abort("ERROR sigismember returned %d", ret); }
+                if(ret == 1) { abort("ERROR SIGTERM is disabled"); }
+
+        __cfaasm_label(debug, after);
+}
+
+#ifdef __CFA_WITH_VERIFY__
+bool __cfaabi_dbg_in_kernel() {
+        return !__preemption_enabled();
+}
+#endif
+
 #undef __cfaasm_label
+
+//-----------------------------------------------------------------------------
+// Signal handling
 
 // sigprocmask wrapper : unblock a single signal
@@ -405 +442 @@
                 #define RELOC_SUFFIX ""
         #endif
-        #define __cfaasm_label( label ) static struct asm_region label = \
+        #define __cfaasm_label( label ) struct asm_region label = \
                 ({ \
                         struct asm_region region; \
@@ -424 +461 @@
                 #define RELOC_SUFFIX ""
         #endif
-        #define __cfaasm_label( label ) static struct asm_region label = \
+        #define __cfaasm_label( label ) struct asm_region label = \
                 ({ \
                         struct asm_region region; \
@@ -437 +474 @@
         #ifdef __PIC__
                 // Note that this works only for gcc
-                #define __cfaasm_label( label ) static struct asm_region label = \
+                #define __cfaasm_label( label ) struct asm_region label = \
                 ({ \
                         struct asm_region region; \
@@ -452 +489 @@
                 #error this is not the right thing to do
                 /*
-                #define __cfaasm_label( label ) static struct asm_region label = \
+                #define __cfaasm_label( label ) struct asm_region label = \
                 ({ \
                         struct asm_region region; \
@@ -479 +516 @@
         __cfaasm_label( check  );
         __cfaasm_label( dsable );
+        __cfaasm_label( debug  );
 
         // Check if preemption is safe
@@ -485 +523 @@
         if( __cfaasm_in( ip, check  ) ) { ready = false; goto EXIT; };
         if( __cfaasm_in( ip, dsable ) ) { ready = false; goto EXIT; };
+        if( __cfaasm_in( ip, debug  ) ) { ready = false; goto EXIT; };
         if( !__cfaabi_tls.preemption_state.enabled) { ready = false; goto EXIT; };
         if( __cfaabi_tls.preemption_state.in_progress ) { ready = false; goto EXIT; };
@@ -536 +575 @@
         // Wait for the preemption thread to finish
 
-        pthread_join( alarm_thread, 0p );
-        free( alarm_stack );
+        __destroy_pthread( alarm_thread, alarm_stack, 0p );
 
         // Preemption is now fully stopped
@@ -697 +735 @@
 }
 
-//=============================================================================================
-// Kernel Signal Debug
-//=============================================================================================
-
-void __cfaabi_check_preemption() {
-        bool ready = __preemption_enabled();
-        if(!ready) { abort("Preemption should be ready"); }
-
-        sigset_t oldset;
-        int ret;
-        ret = pthread_sigmask(0, ( const sigset_t * ) 0p, &oldset);  // workaround trac#208: cast should be unnecessary
-        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"); }
-
-        ret = sigismember(&oldset, SIGALRM);
-        if(ret <  0) { abort("ERROR sigismember returned %d", ret); }
-        if(ret == 0) { abort("ERROR SIGALRM is enabled"); }
-
-        ret = sigismember(&oldset, SIGTERM);
-        if(ret <  0) { abort("ERROR sigismember returned %d", ret); }
-        if(ret == 1) { abort("ERROR SIGTERM is disabled"); }
-}
-
-#ifdef __CFA_WITH_VERIFY__
-bool __cfaabi_dbg_in_kernel() {
-        return !__preemption_enabled();
-}
-#endif
-
 // Local Variables: //
 // mode: c //