Changeset 428adbc for libcfa/src

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@…>

Location:

libcfa/src

Files:

• bits/defs.hfa (modified) (2 diffs)
• concurrency/io.cfa (modified) (1 diff)
• concurrency/io/setup.cfa (modified) (1 diff)
• concurrency/preemption.cfa (modified) (9 diffs)
• concurrency/pthread.cfa (modified) (2 diffs)
• interpose.cfa (modified) (3 diffs)

libcfa/src/bits/defs.hfa

@@ -21 +21 @@
 #include <stdint.h>
 #include <assert.h>
-
+#include <signal.h>
 
 #define likely(x)   __builtin_expect(!!(x), 1)
@@ -53 +53 @@
         int real_pthread_attr_setstack( pthread_attr_t *attr, void *stackaddr, size_t stacksize );
         int real_pthread_attr_getstacksize( const pthread_attr_t *attr, size_t *stacksize );
-        //int real_pthread_sigqueue(pthread_t _thread, int sig, const union sigval value);
-        //int real_pthread_sigmask( int /* how */, const sigset_t * /* set */, sigset_t * /* oset */ );
+        int real_pthread_sigqueue(pthread_t _thread, int sig, const union sigval value);
+        int real_pthread_sigmask( int how, const sigset_t *set, sigset_t *oset);
 }
 #endif

libcfa/src/concurrency/io.cfa

@@ -610 +610 @@
                 if( we ) {
                         sigval_t value = { PREEMPT_IO };
-                        pthread_sigqueue(ctx->proc->kernel_thread, SIGUSR1, value);
+                        real_pthread_sigqueue(ctx->proc->kernel_thread, SIGUSR1, value);
                 }
 

libcfa/src/concurrency/io/setup.cfa

@@ -337 +337 @@
         //      iopoll.run = false;
         //      sigval val = { 1 };
-        //      pthread_sigqueue( iopoll.thrd, SIGUSR1, val );
+        //      real_pthread_sigqueue( iopoll.thrd, SIGUSR1, val );
 
         //      // Make sure all this is done

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" );
         }

libcfa/src/concurrency/pthread.cfa

@@ -666 +666 @@
 
 
-    // int pthread_sigmask( int /* how */, const sigset_t * /* set */, sigset_t * /* oset */ ) libcfa_public __THROW {
-        //     return 0;
-    // } // pthread_sigmask
+     int pthread_sigmask( int /* how */, const sigset_t * /* set */, sigset_t * /* oset */ ) libcfa_public __THROW {
+             return 0;
+     } // pthread_sigmask
 
     int pthread_kill( pthread_t _thread __attribute__(( unused )), int sig ) libcfa_public __THROW {
@@ -679 +679 @@
     } // pthread_kill
 
-    // int pthread_sigqueue(pthread_t , int sig, const union sigval) libcfa_public __THROW {
-    //     return 0;
-    // } // pthread_sigqueue
+    int pthread_sigqueue(pthread_t , int sig, const union sigval) libcfa_public __THROW {
+        return 0;
+    } // pthread_sigqueue
 
     //######################### Scheduling #########################

libcfa/src/interpose.cfa

@@ -118 +118 @@
         typeof(pthread_attr_destroy) pthread_attr_destroy;
         typeof(pthread_attr_getstacksize) pthread_attr_getstacksize;
-        //typeof(pthread_sigmask) pthread_sigmask;
-        //typeof(pthread_sigqueue) pthread_sigqueue;
+        typeof(pthread_sigmask) pthread_sigmask;
+        typeof(pthread_sigqueue) pthread_sigqueue;
 } __cabi_libc;
 
@@ -142 +142 @@
                 INTERPOSE_LIBC( pthread_attr_setstack , version );
                 INTERPOSE_LIBC( pthread_attr_getstacksize , version );
-                //INTERPOSE_LIBC( pthread_sigmask , version );
-                //INTERPOSE_LIBC( pthread_sigqueue , version );
+                INTERPOSE_LIBC( pthread_sigmask , version );
+                INTERPOSE_LIBC( pthread_sigqueue , version );
 #pragma GCC diagnostic pop
 
@@ -229 +229 @@
                 return __cabi_libc.pthread_attr_getstacksize(attr, stacksize);
         }
-        // libcfa_public int real_pthread_sigmask(int how, const sigset_t *set, sigset_t *oldset){
-        //      return __cabi_libc.pthread_sigmask(how, set, oldset);
-        // }
-        // libcfa_public int real_pthread_sigqueue(pthread_t _thread, int sig, const union sigval value){
-        //      return __cabi_libc.real_pthread_sigqueue(_thread, sig, value);
-        // }
+        libcfa_public int real_pthread_sigmask(int how, const sigset_t *set, sigset_t *oldset){
+                return __cabi_libc.pthread_sigmask(how, set, oldset);
+        }
+        libcfa_public int real_pthread_sigqueue(pthread_t _thread, int sig, const union sigval value){
+                return __cabi_libc.pthread_sigqueue(_thread, sig, value);
+        }
 }