Changeset 428adbc for libcfa/src/concurrency/preemption.cfa

Timestamp:

Aug 10, 2022, 8:33:42 PM (2 years ago)

Author:

z277zhu <z277zhu@…>

Branches:

ADT, ast-experimental, master, pthread-emulation

Children:

7f6a7c9

Parents:

20be782

Message:

fix pthread_sig* interpose problems; add test doc

Signed-off-by: z277zhu <z277zhu@…>

File:

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

libcfa/src/concurrency/preemption.cfa

@@ -368 +368 @@
         sigset_t oldset;
         int ret;
-        ret = pthread_sigmask(0, ( const sigset_t * ) 0p, &oldset);  // workaround trac#208: cast should be unnecessary
+        ret = real_pthread_sigmask(0, ( const sigset_t * ) 0p, &oldset);  // workaround trac#208: cast should be unnecessary
         if(ret != 0) { abort("ERROR sigprocmask returned %d", ret); }
 
@@ -401 +401 @@
         sigaddset( &mask, sig );
 
-        if ( pthread_sigmask( SIG_UNBLOCK, &mask, 0p ) == -1 ) {
+        if ( real_pthread_sigmask( SIG_UNBLOCK, &mask, 0p ) == -1 ) {
             abort( "internal error, pthread_sigmask" );
         }
@@ -412 +412 @@
         sigaddset( &mask, sig );
 
-        if ( pthread_sigmask( SIG_BLOCK, &mask, 0p ) == -1 ) {
+        if ( real_pthread_sigmask( SIG_BLOCK, &mask, 0p ) == -1 ) {
                 abort( "internal error, pthread_sigmask" );
         }
@@ -420 +420 @@
 static void preempt( processor * this ) {
         sigval_t value = { PREEMPT_NORMAL };
-        pthread_sigqueue( this->kernel_thread, SIGUSR1, value );
+        real_pthread_sigqueue( this->kernel_thread, SIGUSR1, value );
 }
 
@@ -431 +431 @@
         sigset_t oldset;
         int ret;
-        ret = pthread_sigmask(0, ( const sigset_t * ) 0p, &oldset);  // workaround trac#208: cast should be unnecessary
+        ret = real_pthread_sigmask(0, ( const sigset_t * ) 0p, &oldset);  // workaround trac#208: cast should be unnecessary
         if(ret != 0) { abort("ERROR sigprocmask returned %d", ret); }
 
@@ -450 +450 @@
         sigset_t oldset;
         int ret;
-        ret = pthread_sigmask(0, ( const sigset_t * ) 0p, &oldset);  // workaround trac#208: cast should be unnecessary
+        ret = real_pthread_sigmask(0, ( const sigset_t * ) 0p, &oldset);  // workaround trac#208: cast should be unnecessary
         if(ret != 0) { abort("ERROR sigprocmask returned %d", ret); }
 
@@ -608 +608 @@
         sigval val;
         val.sival_int = 0;
-        pthread_sigqueue( alarm_thread, SIGALRM, val );
+        real_pthread_sigqueue( alarm_thread, SIGALRM, val );
 
         // Wait for the preemption thread to finish
@@ -682 +682 @@
         static_assert( sizeof( sigset_t ) == sizeof( cxt->uc_sigmask ), "Expected cxt->uc_sigmask to be of sigset_t" );
         #endif
-        if ( pthread_sigmask( SIG_SETMASK, (sigset_t *)&(cxt->uc_sigmask), 0p ) == -1 ) {
+        if ( real_pthread_sigmask( SIG_SETMASK, (sigset_t *)&(cxt->uc_sigmask), 0p ) == -1 ) {
                 abort( "internal error, sigprocmask" );
         }
@@ -710 +710 @@
         sigset_t mask;
         sigfillset(&mask);
-        if ( pthread_sigmask( SIG_BLOCK, &mask, 0p ) == -1 ) {
+        if ( real_pthread_sigmask( SIG_BLOCK, &mask, 0p ) == -1 ) {
             abort( "internal error, pthread_sigmask" );
         }