Changes in libcfa/src/concurrency/coroutine.cfa [bfcf6b9:be73f30]

File:

• libcfa/src/concurrency/coroutine.cfa (modified) (5 diffs)

libcfa/src/concurrency/coroutine.cfa

@@ -28 +28 @@
 #include "kernel_private.hfa"
 #include "exception.hfa"
-#include "math.hfa"
 
 #define __CFA_INVOKE_PRIVATE__
@@ -88 +87 @@
 
 void __stack_prepare( __stack_info_t * this, size_t create_size );
-void __stack_clean  ( __stack_info_t * this );
 
 //-----------------------------------------------------------------------------
@@ -109 +107 @@
         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 );
+                __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 );
         }
 }
@@ -170 +167 @@
         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;
-        // __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 ) );
-        //      }
-        //      storage = (void *)(((intptr_t)storage) + __page_size);
-        // );
-        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 ) );
-        }
-        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);
+        __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 ) );
+                }
+                storage = (void *)(((intptr_t)storage) + __page_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;
-
-        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 ) );
-        }
 }
 
@@ -232 +210 @@
         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));
+        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->base  = (void*)((intptr_t)storage + size);
         this->storage->exception_context.top_resume = 0p;
         this->storage->exception_context.current_exception = 0p;