Changeset dd92fe9

Timestamp:

Dec 15, 2020, 10:25:12 PM (4 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

54eb1bb3

Parents:

ad2dced

git-author:

Peter A. Buhr <pabuhr@…> (12/15/20 21:51:36)

git-committer:

Peter A. Buhr <pabuhr@…> (12/15/20 22:25:12)

Message:

switch to page_size and map_prot

Location:

libcfa/src/concurrency

Files:

• coroutine.cfa (modified) (3 diffs)
• kernel/startup.cfa (modified) (3 diffs)

libcfa/src/concurrency/coroutine.cfa

@@ -10 +10 @@
 // Created On       : Mon Nov 28 12:27:26 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Oct 23 23:05:24 2020
-// Update Count     : 22
+// Last Modified On : Tue Dec 15 12:06:04 2020
+// Update Count     : 23
 //
 
@@ -88 +88 @@
 static const size_t MinStackSize = 1000;
 extern size_t __page_size;                              // architecture pagesize HACK, should go in proper runtime singleton
+extern int __map_prot;
 
 void __stack_prepare( __stack_info_t * this, size_t create_size );
@@ -206 +207 @@
                 __cfaabi_dbg_debug_do(
                         storage = (char*)(storage) - __page_size;
-                        if ( mprotect( storage, __page_size, PROT_READ | PROT_WRITE ) == -1 ) {
+                        if ( mprotect( storage, __page_size, __map_prot ) == -1 ) {
                                 abort( "(coStack_t *)%p.^?{}() : internal error, mprotect failure, error(%d) %s.", &this, errno, strerror( errno ) );
                         }

libcfa/src/concurrency/kernel/startup.cfa

@@ -117 +117 @@
 }
 
-size_t __page_size = 0;
+extern size_t __page_size;
 
 //-----------------------------------------------------------------------------
@@ -161 +161 @@
         /* paranoid */ verify( ! __preemption_enabled() );
         __cfadbg_print_safe(runtime_core, "Kernel : Starting\n");
-
-        __page_size = sysconf( _SC_PAGESIZE );
 
         __cfa_dbg_global_clusters.list{ __get };
@@ -681 +679 @@
         #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 ) );