Changeset b2f6113 for libcfa/src/concurrency/kernel.cfa

Timestamp:

Apr 4, 2019, 3:37:55 PM (5 years ago)

Author:

tdelisle <tdelisle@…>

Branches:

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

Children:

8c01e1b

Parents:

2fabdc02

Message:

Swapped memory storage for context and stack information inside the coroutine implementation

File:

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

libcfa/src/concurrency/kernel.cfa

@@ -42 +42 @@
 //-----------------------------------------------------------------------------
 // Kernel storage
-KERNEL_STORAGE(cluster,           mainCluster);
-KERNEL_STORAGE(processor,         mainProcessor);
-KERNEL_STORAGE(thread_desc,       mainThread);
-KERNEL_STORAGE(machine_context_t, mainThreadCtx);
+KERNEL_STORAGE(cluster,         mainCluster);
+KERNEL_STORAGE(processor,       mainProcessor);
+KERNEL_STORAGE(thread_desc,     mainThread);
+KERNEL_STORAGE(__stack_t,       mainThreadCtx);
 
 cluster     * mainCluster;
@@ -54 +54 @@
 struct { __dllist_t(cluster) list; __spinlock_t lock; } __cfa_dbg_global_clusters;
 }
+
+size_t __page_size = 0;
 
 //-----------------------------------------------------------------------------
@@ -66 +68 @@
 // Struct to steal stack
 struct current_stack_info_t {
-        machine_context_t ctx;
+        __stack_t * storage;            // pointer to stack object
         unsigned int size;              // size of stack
         void *base;                             // base of stack
-        void *storage;                  // pointer to stack
         void *limit;                    // stack grows towards stack limit
         void *context;                  // address of cfa_context_t
-        void *top;                              // address of top of storage
 };
 
 void ?{}( current_stack_info_t & this ) {
-        CtxGet( this.ctx );
-        this.base = this.ctx.FP;
-        this.storage = this.ctx.SP;
+        __stack_context_t ctx;
+        CtxGet( ctx );
+        this.base = ctx.FP;
 
         rlimit r;
@@ -86 +86 @@
         this.limit = (void *)(((intptr_t)this.base) - this.size);
         this.context = &storage_mainThreadCtx;
-        this.top = this.base;
 }
 
 //-----------------------------------------------------------------------------
 // Main thread construction
-void ?{}( coStack_t & this, current_stack_info_t * info) with( this ) {
-        size      = info->size;
-        storage   = info->storage;
-        limit     = info->limit;
-        base      = info->base;
-        context   = info->context;
-        top       = info->top;
-        userStack = true;
-}
 
 void ?{}( coroutine_desc & this, current_stack_info_t * info) with( this ) {
-        stack{ info };
+        context.errno_ = 0;
+        stack.storage = info->storage;
+        stack.userStack = true;
+        with(*stack.storage) {
+                size      = info->size;
+                limit     = info->limit;
+                base      = info->base;
+        }
         name = "Main Thread";
-        errno_ = 0;
         state = Start;
         starter = NULL;
+        last = NULL;
+        cancellation = NULL;
 }
 
@@ -312 +310 @@
         // to waste the perfectly valid stack create by pthread.
         current_stack_info_t info;
-        machine_context_t ctx;
-        info.context = &ctx;
+        __stack_t ctx;
+        info.storage = &ctx;
         (proc->runner){ proc, &info };
 
-        __cfaabi_dbg_print_safe("Coroutine : created stack %p\n", get_coroutine(proc->runner)->stack.base);
+        __cfaabi_dbg_print_safe("Coroutine : created stack %p\n", get_coroutine(proc->runner)->stack.storage);
 
         //Set global state
@@ -353 +351 @@
         verify( ! kernelTLS.preemption_state.enabled );
 
-        create_stack(&dst->stack, dst->stack.size);
+        __stack_prepare( &dst->stack, 65000 );
         CtxStart(&this->runner, CtxInvokeCoroutine);
 
@@ -372 +370 @@
 
         // context switch to specified coroutine
-        assert( src->stack.context );
-        CtxSwitch( src->stack.context, dst->stack.context );
+        CtxSwitch( &src->context, &dst->context );
         // when CtxSwitch returns we are back in the src coroutine
 
@@ -545 +542 @@
         __cfaabi_dbg_print_safe("Kernel : Starting\n");
 
+        __page_size = sysconf( _SC_PAGESIZE );
+
         __cfa_dbg_global_clusters.list{ __get };
         __cfa_dbg_global_clusters.lock{};
@@ -559 +558 @@
         mainThread = (thread_desc *)&storage_mainThread;
         current_stack_info_t info;
+        info.storage = (__stack_t*)&storage_mainThreadCtx;
         (*mainThread){ &info };