Changes in libcfa/src/concurrency/kernel/startup.cfa [97229d6:28c35e2]

File:

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

libcfa/src/concurrency/kernel/startup.cfa

@@ -117 +117 @@
 }
 
-size_t __page_size = 0;
+extern size_t __page_size;
+extern int __map_prot;
 
 //-----------------------------------------------------------------------------
@@ -161 +162 @@
         /* paranoid */ verify( ! __preemption_enabled() );
         __cfadbg_print_safe(runtime_core, "Kernel : Starting\n");
-
-        __page_size = sysconf( _SC_PAGESIZE );
 
         __cfa_dbg_global_clusters.list{ __get };
@@ -681 +680 @@
         #if CFA_PROCESSOR_USE_MMAP
                 stacksize = ceiling( stacksize, __page_size ) + __page_size;
-                stack = mmap(0p, stacksize, PROT_EXEC | PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, 0, 0);
+                stack = mmap(0p, stacksize, __map_prot, MAP_PRIVATE | MAP_ANONYMOUS, 0, 0);
                 if(stack == ((void*)-1)) {
                         abort( "pthread stack creation : internal error, mmap failure, error(%d) %s.", errno, strerror( errno ) );
@@ -727 +726 @@
                 }
         #else
+                __cfaabi_dbg_debug_do(
+                        // pthread has no mechanism to create the guard page in user supplied stack.
+                        if ( mprotect( stack, __page_size, __map_prot ) == -1 ) {
+                                abort( "mprotect : internal error, mprotect failure, error(%d) %s.", errno, strerror( errno ) );
+                        } // if
+                );
                 free( stack );
         #endif