Changeset 09d4b22 for libcfa/src/concurrency/kernel.cfa

Timestamp:

Dec 5, 2019, 10:57:06 PM (4 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:

baf608a

Parents:

0030ada3

Message:

move stack for preemptive pthread from TLS to static variable

File:

• libcfa/src/concurrency/kernel.cfa (modified) (3 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 : Tue Dec  3 21:46:54 2019
-// Update Count     : 49
+// Last Modified On : Thu Dec  5 16:25:52 2019
+// Update Count     : 52
 //
 
@@ -135 +135 @@
         NULL,                                                                                           // cannot use 0p
         NULL,
-        { NULL, 1, false, false },
+        { 1, false, false },
         6u //this should be seeded better but due to a bug calling rdtsc doesn't work
 };
@@ -453 +453 @@
 
         size_t stacksize;
-         // default stack size, normally defined by shell limit
+        // 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__
-        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
+        void * stack;
+        __cfaabi_dbg_debug_do(
+                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
+        );
+        __cfaabi_dbg_no_debug_do(
+                stack = malloc( stacksize );
+        );
 
         Abort( pthread_attr_setstack( &attr, stack, stacksize ), "pthread_attr_setstack" );