Changeset 27f5f71

Timestamp:

Nov 30, 2019, 11:08:34 AM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

4cae032

Parents:

524627e

Message:

explicitly create stack for pthread thread, change NULL to 0p

Location:

libcfa/src/concurrency

Files:

• invoke.h (modified) (2 diffs)
• kernel.cfa (modified) (5 diffs)
• kernel.hfa (modified) (2 diffs)
• preemption.cfa (modified) (13 diffs)

libcfa/src/concurrency/invoke.h

@@ -10 +10 @@
 // Created On       : Tue Jan 17 12:27:26 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jun 22 18:19:13 2019
-// Update Count     : 40
+// Last Modified On : Thu Nov 28 22:34:07 2019
+// Update Count     : 41
 //
 
@@ -51 +51 @@
 
                         struct {
+                                void * stack;
                                 volatile unsigned short disable_count;
                                 volatile bool enabled;

libcfa/src/concurrency/kernel.cfa

@@ -10 +10 @@
 // Created On       : Tue Jan 17 12:27:26 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Nov 21 16:46:59 2019
-// Update Count     : 27
+// Last Modified On : Fri Nov 29 17:59:16 2019
+// Update Count     : 35
 //
 
@@ -26 +26 @@
 #include <signal.h>
 #include <unistd.h>
+#include <limits.h>                                                                             // PTHREAD_STACK_MIN
 }
 
@@ -133 +134 @@
         NULL,
         NULL,
-        { 1, false, false },
+        { NULL, 1, false, false },
         6u //this should be seeded better but due to a bug calling rdtsc doesn't work
 };
@@ -233 +234 @@
 
         pthread_join( kernel_thread, NULL );
+        free( this.stack );
 }
 
@@ -445 +447 @@
         __cfaabi_dbg_print_safe("Kernel : Starting core %p\n", this);
 
-        pthread_create( &this->kernel_thread, NULL, CtxInvokeProcessor, (void*)this );
+        pthread_attr_t attr;
+        int ret;
+        ret = pthread_attr_init( &attr );                                       // initialize attribute
+        if ( ret ) {
+                abort( "%s : internal error, pthread_attr_init failed, error(%d) %s.", __PRETTY_FUNCTION__, ret, strerror( ret ) );
+        } // if
+
+        size_t stacksize;
+        ret = pthread_attr_getstacksize( &attr, &stacksize ); // default stack size, normally defined by shell limit
+        if ( ret ) {
+                abort( "%s : internal error, pthread_attr_getstacksize failed, error(%d) %s.", __PRETTY_FUNCTION__, ret, strerror( ret ) );
+        } // if
+        assert( stacksize >= PTHREAD_STACK_MIN );
+
+        this->stack = malloc( stacksize );
+        ret = pthread_attr_setstack( &attr, this->stack, stacksize ); 
+        if ( ret ) {
+                abort( "%s : internal error, pthread_attr_setstack failed, error(%d) %s.", __PRETTY_FUNCTION__, ret, strerror( ret ) );
+        } // if
+
+        ret = pthread_create( &this->kernel_thread, &attr, CtxInvokeProcessor, (void *)this );
+        if ( ret ) {
+                abort( "%s : internal error, pthread_create failed, error(%d) %s.", __PRETTY_FUNCTION__, ret, strerror( ret ) );
+        } // if
+//      pthread_create( &this->kernel_thread, NULL, CtxInvokeProcessor, (void*)this );
 
         __cfaabi_dbg_print_safe("Kernel : core %p started\n", this);

libcfa/src/concurrency/kernel.hfa

@@ -10 +10 @@
 // Created On       : Tue Jan 17 12:27:26 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jun 22 11:39:17 2019
-// Update Count     : 16
+// Last Modified On : Thu Nov 28 21:24:12 2019
+// Update Count     : 17
 //
 
@@ -135 +135 @@
         semaphore terminated;
 
+        // pthread Stack
+        void * stack;
+
         // Link lists fields
         struct __dbg_node_proc {

libcfa/src/concurrency/preemption.cfa

@@ -10 +10 @@
 // Created On       : Mon Jun 5 14:20:42 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jun  5 17:35:49 2018
-// Update Count     : 37
+// Last Modified On : Sat Nov 30 08:02:56 2019
+// Update Count     : 39
 //
 
@@ -24 +24 @@
 #include <string.h>
 #include <unistd.h>
+#include <limits.h>                                                                             // PTHREAD_STACK_MIN
 }
 
@@ -81 +82 @@
 // Get next expired node
 static inline alarm_node_t * get_expired( alarm_list_t * alarms, Time currtime ) {
-        if( !alarms->head ) return NULL;                          // If no alarms return null
-        if( alarms->head->alarm >= currtime ) return NULL;        // If alarms head not expired return null
-        return pop(alarms);                                       // Otherwise just pop head
+        if( !alarms->head ) return 0p;                                          // If no alarms return null
+        if( alarms->head->alarm >= currtime ) return 0p;        // If alarms head not expired return null
+        return pop(alarms);                                                                     // Otherwise just pop head
 }
 
 // Tick one frame of the Discrete Event Simulation for alarms
 static void tick_preemption() {
-        alarm_node_t * node = NULL;                     // Used in the while loop but cannot be declared in the while condition
-        alarm_list_t * alarms = &event_kernel->alarms;  // Local copy for ease of reading
-        Time currtime = __kernel_get_time();                    // Check current time once so we everything "happens at once"
+        alarm_node_t * node = 0p;                                                       // Used in the while loop but cannot be declared in the while condition
+        alarm_list_t * alarms = &event_kernel->alarms;          // Local copy for ease of reading
+        Time currtime = __kernel_get_time();                            // Check current time once so everything "happens at once"
 
         //Loop throught every thing expired
@@ -243 +244 @@
         sigaddset( &mask, sig );
 
-        if ( pthread_sigmask( SIG_UNBLOCK, &mask, NULL ) == -1 ) {
+        if ( pthread_sigmask( SIG_UNBLOCK, &mask, 0p ) == -1 ) {
             abort( "internal error, pthread_sigmask" );
         }
@@ -254 +255 @@
         sigaddset( &mask, sig );
 
-        if ( pthread_sigmask( SIG_BLOCK, &mask, NULL ) == -1 ) {
+        if ( pthread_sigmask( SIG_BLOCK, &mask, 0p ) == -1 ) {
             abort( "internal error, pthread_sigmask" );
         }
@@ -301 +302 @@
 
         // Setup proper signal handlers
-        __cfaabi_sigaction( SIGUSR1, sigHandler_ctxSwitch, SA_SIGINFO | SA_RESTART );         // CtxSwitch handler
+        __cfaabi_sigaction( SIGUSR1, sigHandler_ctxSwitch, SA_SIGINFO | SA_RESTART ); // CtxSwitch handler
 
         signal_block( SIGALRM );
 
-        pthread_create( &alarm_thread, NULL, alarm_loop, NULL );
+        pthread_attr_t attr;
+        int ret;
+        ret = pthread_attr_init( &attr );                                       // initialize attribute
+        if ( ret ) {
+                abort( "%s : internal error, pthread_attr_init failed, error(%d) %s.", __PRETTY_FUNCTION__, ret, strerror( ret ) );
+        } // if
+
+        size_t stacksize;
+        ret = pthread_attr_getstacksize( &attr, &stacksize ); // default stack size, normally defined by shell limit
+        if ( ret ) {
+                abort( "%s : internal error, pthread_attr_getstacksize failed, error(%d) %s.", __PRETTY_FUNCTION__, ret, strerror( ret ) );
+        } // if
+        assert( stacksize >= PTHREAD_STACK_MIN );
+
+        kernelTLS.preemption_state.stack = malloc( stacksize );
+        ret = pthread_attr_setstack( &attr, kernelTLS.preemption_state.stack, stacksize ); 
+        if ( ret ) {
+                abort( "%s : internal error, pthread_attr_setstack failed, error(%d) %s.", __PRETTY_FUNCTION__, ret, strerror( ret ) );
+        } // if
+
+        ret = pthread_create( &alarm_thread, &attr, alarm_loop, 0p );
+        if ( ret ) {
+                abort( "%s : internal error, pthread_create failed, error(%d) %s.", __PRETTY_FUNCTION__, ret, strerror( ret ) );
+        } // if
 }
 
@@ -316 +340 @@
         sigset_t mask;
         sigfillset( &mask );
-        sigprocmask( SIG_BLOCK, &mask, NULL );
+        sigprocmask( SIG_BLOCK, &mask, 0p );
 
         // Notify the alarm thread of the shutdown
@@ -323 +347 @@
 
         // Wait for the preemption thread to finish
-        pthread_join( alarm_thread, NULL );
+
+        pthread_join( alarm_thread, 0p );
+        free( kernelTLS.preemption_state.stack );
 
         // Preemption is now fully stopped
@@ -380 +406 @@
         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), NULL ) == -1 ) {
+        if ( pthread_sigmask( SIG_SETMASK, (sigset_t *)&(cxt->uc_sigmask), 0p ) == -1 ) {
                 abort( "internal error, sigprocmask" );
         }
@@ -399 +425 @@
         sigset_t mask;
         sigfillset(&mask);
-        if ( pthread_sigmask( SIG_BLOCK, &mask, NULL ) == -1 ) {
+        if ( pthread_sigmask( SIG_BLOCK, &mask, 0p ) == -1 ) {
             abort( "internal error, pthread_sigmask" );
         }
@@ -420 +446 @@
                                         {__cfaabi_dbg_print_buffer_decl( " KERNEL: Spurious wakeup %d.\n", err );}
                                         continue;
-                        case EINVAL :
+                                case EINVAL :
                                         abort( "Timeout was invalid." );
                                 default:
@@ -453 +479 @@
 EXIT:
         __cfaabi_dbg_print_safe( "Kernel : Preemption thread stopping\n" );
-        return NULL;
+        return 0p;
 }
 
@@ -466 +492 @@
         sigset_t oldset;
         int ret;
-        ret = pthread_sigmask(0, NULL, &oldset);
+        ret = pthread_sigmask(0, 0p, &oldset);
         if(ret != 0) { abort("ERROR sigprocmask returned %d", ret); }