Changes in libcfa/src/concurrency/coroutine.cfa [dd92fe9:ac2b598]

File:

• libcfa/src/concurrency/coroutine.cfa (modified) (9 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 : Tue Dec 15 12:06:04 2020
-// Update Count     : 23
+// Last Modified On : Tue Feb  4 12:29:25 2020
+// Update Count     : 16
 //
 
@@ -18 +18 @@
 #include "coroutine.hfa"
 
+extern "C" {
 #include <stddef.h>
 #include <malloc.h>
@@ -23 +24 @@
 #include <string.h>
 #include <unistd.h>
-#include <sys/mman.h>                                                                   // mprotect
+// use this define to make unwind.h play nice, definetely a hack
+#define HIDE_EXPORTS
 #include <unwind.h>
+#undef HIDE_EXPORTS
+#include <sys/mman.h>
+}
 
 #include "kernel_private.hfa"
-#include "exception.hfa"
-#include "math.hfa"
-
-#define CFA_COROUTINE_USE_MMAP 0
 
 #define __CFA_INVOKE_PRIVATE__
@@ -46 +47 @@
 
 //-----------------------------------------------------------------------------
-FORALL_DATA_INSTANCE(CoroutineCancelled, (dtype coroutine_t), (coroutine_t))
-
-forall(dtype T)
-void mark_exception(CoroutineCancelled(T) *) {}
-
-forall(dtype T)
-void copy(CoroutineCancelled(T) * dst, CoroutineCancelled(T) * src) {
-        dst->virtual_table = src->virtual_table;
-        dst->the_coroutine = src->the_coroutine;
-        dst->the_exception = src->the_exception;
-}
-
-forall(dtype T)
-const char * msg(CoroutineCancelled(T) *) {
-        return "CoroutineCancelled(...)";
-}
-
-// This code should not be inlined. It is the error path on resume.
-forall(dtype T | is_coroutine(T))
-void __cfaehm_cancelled_coroutine( T & cor, $coroutine * desc ) {
-        verify( desc->cancellation );
-        desc->state = Cancelled;
-        exception_t * except = __cfaehm_cancellation_exception( desc->cancellation );
-
-        // TODO: Remove explitate vtable set once trac#186 is fixed.
-        CoroutineCancelled(T) except;
-        except.virtual_table = &get_exception_vtable(&except);
-        except.the_coroutine = &cor;
-        except.the_exception = except;
-        throwResume except;
-
-        except->virtual_table->free( except );
-        free( desc->cancellation );
-        desc->cancellation = 0p;
-}
-
-//-----------------------------------------------------------------------------
 // Global state variables
 
 // minimum feasible stack size in bytes
-static const size_t MinStackSize = 1000;
+#define 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 );
-void __stack_clean  ( __stack_info_t * this );
 
 //-----------------------------------------------------------------------------
@@ -112 +74 @@
         bool userStack = ((intptr_t)this.storage & 0x1) != 0;
         if ( ! userStack && this.storage ) {
-                __stack_clean( &this );
+                __attribute__((may_alias)) intptr_t * istorage = (intptr_t *)&this.storage;
+                *istorage &= (intptr_t)-1;
+
+                void * storage = this.storage->limit;
+                __cfaabi_dbg_debug_do(
+                        storage = (char*)(storage) - __page_size;
+                        if ( mprotect( storage, __page_size, PROT_READ | PROT_WRITE ) == -1 ) {
+                                abort( "(coStack_t *)%p.^?{}() : internal error, mprotect failure, error(%d) %s.", &this, errno, strerror( errno ) );
+                        }
+                );
+                __cfaabi_dbg_print_safe("Kernel : Deleting stack %p\n", storage);
+                free( storage );
         }
 }
@@ -128 +101 @@
 void ^?{}($coroutine& this) {
         if(this.state != Halted && this.state != Start && this.state != Primed) {
-                $coroutine * src = active_coroutine();
+                $coroutine * src = TL_GET( this_thread )->curr_cor;
                 $coroutine * dst = &this;
 
@@ -161 +134 @@
         assert(__page_size != 0l);
         size_t size = libCeiling( storageSize, 16 ) + stack_data_size;
-        size = ceiling(size, __page_size);
 
         // If we are running debug, we also need to allocate a guardpage to catch stack overflows.
         void * storage;
-        #if CFA_COROUTINE_USE_MMAP
-                storage = mmap(0p, size + __page_size, PROT_EXEC | PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, 0, 0);
-                if(storage == ((void*)-1)) {
-                        abort( "coroutine stack creation : internal error, mmap failure, error(%d) %s.", errno, strerror( errno ) );
+        __cfaabi_dbg_debug_do(
+                storage = memalign( __page_size, size + __page_size );
+        );
+        __cfaabi_dbg_no_debug_do(
+                storage = (void*)malloc(size);
+        );
+
+        __cfaabi_dbg_print_safe("Kernel : Created stack %p of size %zu\n", storage, size);
+        __cfaabi_dbg_debug_do(
+                if ( mprotect( storage, __page_size, PROT_NONE ) == -1 ) {
+                        abort( "__stack_alloc : internal error, mprotect failure, error(%d) %s.", (int)errno, strerror( (int)errno ) );
                 }
-                if ( mprotect( storage, __page_size, PROT_NONE ) == -1 ) {
-                        abort( "coroutine stack creation : internal error, mprotect failure, error(%d) %s.", errno, strerror( errno ) );
-                } // if
                 storage = (void *)(((intptr_t)storage) + __page_size);
-        #else
-                __cfaabi_dbg_debug_do(
-                        storage = memalign( __page_size, size + __page_size );
-                );
-                __cfaabi_dbg_no_debug_do(
-                        storage = (void*)malloc(size);
-                );
-
-                __cfaabi_dbg_debug_do(
-                        if ( mprotect( storage, __page_size, PROT_NONE ) == -1 ) {
-                                abort( "__stack_alloc : internal error, mprotect failure, error(%d) %s.", (int)errno, strerror( (int)errno ) );
-                        }
-                        storage = (void *)(((intptr_t)storage) + __page_size);
-                );
-        #endif
-        __cfaabi_dbg_print_safe("Kernel : Created stack %p of size %zu\n", storage, size);
+        );
 
         verify( ((intptr_t)storage & (libAlign() - 1)) == 0ul );
         return [storage, size];
-}
-
-void __stack_clean  ( __stack_info_t * this ) {
-        size_t size = ((intptr_t)this->storage->base) - ((intptr_t)this->storage->limit) + sizeof(__stack_t);
-        void * storage = this->storage->limit;
-
-        #if CFA_COROUTINE_USE_MMAP
-                storage = (void *)(((intptr_t)storage) - __page_size);
-                if(munmap(storage, size + __page_size) == -1) {
-                        abort( "coroutine stack destruction : internal error, munmap failure, error(%d) %s.", errno, strerror( errno ) );
-                }
-        #else
-                __cfaabi_dbg_debug_do(
-                        storage = (char*)(storage) - __page_size;
-                        if ( mprotect( storage, __page_size, __map_prot ) == -1 ) {
-                                abort( "(coStack_t *)%p.^?{}() : internal error, mprotect failure, error(%d) %s.", &this, errno, strerror( errno ) );
-                        }
-                );
-
-                free( storage );
-        #endif
-        __cfaabi_dbg_print_safe("Kernel : Deleting stack %p\n", storage);
 }
 
@@ -236 +175 @@
                 size = libFloor(create_size - stack_data_size - diff, libAlign());
         } // if
-        assertf( size >= MinStackSize, "Stack size %zd provides less than minimum of %zd bytes for a stack.", size, MinStackSize );
-
-        this->storage = (__stack_t *)((intptr_t)storage + size - sizeof(__stack_t));
+        assertf( size >= MinStackSize, "Stack size %zd provides less than minimum of %d bytes for a stack.", size, MinStackSize );
+
+        this->storage = (__stack_t *)((intptr_t)storage + size);
         this->storage->limit = storage;
-        this->storage->base  = (void*)((intptr_t)storage + size - sizeof(__stack_t));
-        this->storage->exception_context.top_resume = 0p;
-        this->storage->exception_context.current_exception = 0p;
+        this->storage->base  = (void*)((intptr_t)storage + size);
         __attribute__((may_alias)) intptr_t * istorage = (intptr_t*)&this->storage;
         *istorage |= userStack ? 0x1 : 0x0;
@@ -268 +205 @@
 
         struct $coroutine * __cfactx_cor_finish(void) {
-                struct $coroutine * cor = active_coroutine();
+                struct $coroutine * cor = kernelTLS.this_thread->curr_cor;
 
                 if(cor->state == Primed) {
-                        __cfactx_suspend();
+                        suspend();
                 }