Changes in libcfa/src/concurrency/kernel/startup.cfa [5614a191:09ae8a6]

File:

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

libcfa/src/concurrency/kernel/startup.cfa

@@ -18 +18 @@
 
 // C Includes
-#include <errno.h>                                                                              // errno
+#include <errno.h>                                      // errno
 #include <signal.h>
-#include <string.h>                                                                             // strerror
-#include <unistd.h>                                                                             // sysconf
+#include <string.h>                                     // strerror
+#include <unistd.h>                                     // sysconf
 
 extern "C" {
-        #include <limits.h>                                                                     // PTHREAD_STACK_MIN
-        #include <unistd.h>                                                                     // syscall
-        #include <sys/eventfd.h>                                                        // eventfd
-        #include <sys/mman.h>                                                           // mprotect
-        #include <sys/resource.h>                                                       // getrlimit
+        #include <limits.h>                             // PTHREAD_STACK_MIN
+        #include <unistd.h>                             // syscall
+        #include <sys/eventfd.h>                        // eventfd
+        #include <sys/mman.h>                           // mprotect
+        #include <sys/resource.h>                       // getrlimit
 }
 
 // CFA Includes
 #include "kernel_private.hfa"
-#include "startup.hfa"                                                                  // STARTUP_PRIORITY_XXX
+#include "startup.hfa"                                  // STARTUP_PRIORITY_XXX
 #include "limits.hfa"
 #include "math.hfa"
@@ -122 +122 @@
 extern "C" {
         struct { __dllist_t(cluster) list; __spinlock_t lock; } __cfa_dbg_global_clusters;
-        extern size_t __cfa_page_size;
-        extern int __map_prot;
-}
+}
+
+extern size_t __page_size;
+extern int __map_prot;
 
 //-----------------------------------------------------------------------------
@@ -573 +574 @@
 }
 
+extern size_t __page_size;
 void ^?{}(processor & this) with( this ){
         /* paranoid */ verify( !__atomic_load_n(&do_terminate, __ATOMIC_ACQUIRE) );
@@ -734 +736 @@
         check( pthread_attr_init( &attr ), "pthread_attr_init" ); // initialize attribute
 
-        size_t stacksize = DEFAULT_STACK_SIZE;
+        size_t stacksize = max( PTHREAD_STACK_MIN, DEFAULT_STACK_SIZE );
 
         void * stack;
         #if CFA_PROCESSOR_USE_MMAP
-                stacksize = ceiling( stacksize, __cfa_page_size ) + __cfa_page_size;
+                stacksize = ceiling( stacksize, __page_size ) + __page_size;
                 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 ) );
                 }
-                if ( mprotect( stack, __cfa_page_size, PROT_NONE ) == -1 ) {
+                if ( mprotect( stack, __page_size, PROT_NONE ) == -1 ) {
                         abort( "pthread stack creation : internal error, mprotect failure, error(%d) %s.", errno, strerror( errno ) );
                 } // if
         #else
                 __cfaabi_dbg_debug_do(
-                        stack = memalign( __cfa_page_size, stacksize + __cfa_page_size );
+                        stack = memalign( __page_size, stacksize + __page_size );
                         // pthread has no mechanism to create the guard page in user supplied stack.
-                        if ( mprotect( stack, __cfa_page_size, PROT_NONE ) == -1 ) {
+                        if ( mprotect( stack, __page_size, PROT_NONE ) == -1 ) {
                                 abort( "mprotect : internal error, mprotect failure, error(%d) %s.", errno, strerror( errno ) );
                         } // if
@@ -777 +779 @@
                 check( pthread_attr_getstacksize( &attr, &stacksize ), "pthread_attr_getstacksize" );
                 assert( stacksize >= PTHREAD_STACK_MIN );
-                stacksize += __cfa_page_size;
+                stacksize += __page_size;
 
                 if(munmap(stack, stacksize) == -1) {
@@ -785 +787 @@
                 __cfaabi_dbg_debug_do(
                         // pthread has no mechanism to create the guard page in user supplied stack.
-                        if ( mprotect( stack, __cfa_page_size, __map_prot ) == -1 ) {
+                        if ( mprotect( stack, __page_size, __map_prot ) == -1 ) {
                                 abort( "mprotect : internal error, mprotect failure, error(%d) %s.", errno, strerror( errno ) );
                         } // if