Changeset 7a70fb2 for libcfa/src/concurrency/kernel

Timestamp:

Dec 17, 2020, 10:34:27 AM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

852ae0ea

Parents:

72a3aff (diff), 28e88d7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

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 ) );