Changeset 1a3040c for libcfa/src/concurrency/kernel.cfa

Timestamp:

Dec 4, 2019, 11:25:58 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:

fa35958

Parents:

121be3e

Message:

add guard page to pthread stack in debug mode

File:

• libcfa/src/concurrency/kernel.cfa (modified) (6 diffs)

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 : Sun Dec  1 17:52:57 2019
-// Update Count     : 45
+// Last Modified On : Tue Dec  3 21:46:54 2019
+// Update Count     : 49
 //
 
@@ -27 +27 @@
 #include <unistd.h>
 #include <limits.h>                                                                             // PTHREAD_STACK_MIN
+#include <sys/mman.h>                                                                   // mprotect
 }
 
@@ -281 +282 @@
 
                 thread_desc * readyThread = 0p;
-                for( unsigned int spin_count = 0; ! __atomic_load_n(&this->do_terminate, __ATOMIC_SEQ_CST); spin_count++ )
-                {
+                for( unsigned int spin_count = 0; ! __atomic_load_n(&this->do_terminate, __ATOMIC_SEQ_CST); spin_count++ ) {
                         readyThread = nextThread( this->cltr );
 
-                        if(readyThread)
-                        {
+                        if(readyThread) {
                                 verify( ! kernelTLS.preemption_state.enabled );
 
@@ -297 +296 @@
 
                                 spin_count = 0;
-                        }
-                        else
-                        {
+                        } else {
                                 // spin(this, &spin_count);
                                 halt(this);
@@ -445 +442 @@
 
 static void Abort( int ret, const char * func ) {
-        if ( ret ) {
+        if ( ret ) {                                                                            // pthread routines return errno values
                 abort( "%s : internal error, error(%d) %s.", func, ret, strerror( ret ) );
         } // if
@@ -455 +452 @@
         Abort( pthread_attr_init( &attr ), "pthread_attr_init" ); // initialize attribute
 
+        size_t stacksize;
+         // default stack size, normally defined by shell limit
+        Abort( pthread_attr_getstacksize( &attr, &stacksize ), "pthread_attr_getstacksize" );
+        assert( stacksize >= PTHREAD_STACK_MIN );
+
 #ifdef __CFA_DEBUG__
-        size_t guardsize;
-        Abort( pthread_attr_getguardsize( &attr, &guardsize ), "pthread_attr_getguardsize" );
-        Abort( pthread_attr_setguardsize( &attr, guardsize ), "pthread_attr_setguardsize" );
+        void * stack = memalign( __page_size, stacksize + __page_size );
+        // pthread has no mechanism to create the guard page in user supplied stack.
+        if ( mprotect( stack, __page_size, PROT_NONE ) == -1 ) {
+                abort( "mprotect : internal error, mprotect failure, error(%d) %s.", errno, strerror( errno ) );
+        } // if
+#else
+        void * stack = malloc( stacksize );
 #endif
 
-        size_t stacksize;
-        Abort( pthread_attr_getstacksize( &attr, &stacksize ), "pthread_attr_getstacksize" ); // default stack size, normally defined by shell limit
-        assert( stacksize >= PTHREAD_STACK_MIN );
-        void * stack = malloc( stacksize );
         Abort( pthread_attr_setstack( &attr, stack, stacksize ), "pthread_attr_setstack" );