Changeset 633a642 for src/libcfa/concurrency/coroutine.c

Timestamp:

Jan 30, 2018, 4:52:54 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

1449d83, 5ff188f

Parents:

320eb73a (diff), 7416d46a (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 plg2:software/cfa/cfa-cc

File:

• src/libcfa/concurrency/coroutine.c (modified) (2 diffs)

src/libcfa/concurrency/coroutine.c

@@ -118 +118 @@
 } //ctxSwitchDirect
 
-void create_stack( coStack_t* this, unsigned int storageSize ) {
+void create_stack( coStack_t* this, unsigned int storageSize ) with( *this ) {
         //TEMP HACK do this on proper kernel startup
         if(pageSize == 0ul) pageSize = sysconf( _SC_PAGESIZE );
@@ -124 +124 @@
         size_t cxtSize = libCeiling( sizeof(machine_context_t), 8 ); // minimum alignment
 
-        if ( (intptr_t)this->storage == 0 ) {
-                this->userStack = false;
-                this->size = libCeiling( storageSize, 16 );
+        if ( (intptr_t)storage == 0 ) {
+                userStack = false;
+                size = libCeiling( storageSize, 16 );
                 // use malloc/memalign because "new" raises an exception for out-of-memory
 
                 // assume malloc has 8 byte alignment so add 8 to allow rounding up to 16 byte alignment
-                __cfaabi_dbg_debug_do( this->storage = memalign( pageSize, cxtSize + this->size + pageSize ) );
-                __cfaabi_dbg_no_debug_do( this->storage = malloc( cxtSize + this->size + 8 ) );
+                __cfaabi_dbg_debug_do( storage = memalign( pageSize, cxtSize + size + pageSize ) );
+                __cfaabi_dbg_no_debug_do( storage = malloc( cxtSize + size + 8 ) );
 
                 __cfaabi_dbg_debug_do(
-                        if ( mprotect( this->storage, pageSize, PROT_NONE ) == -1 ) {
+                        if ( mprotect( storage, pageSize, PROT_NONE ) == -1 ) {
                                 abortf( "(uMachContext &)%p.createContext() : internal error, mprotect failure, error(%d) %s.", this, (int)errno, strerror( (int)errno ) );
                         } // if
                 );
 
-                if ( (intptr_t)this->storage == 0 ) {
-                        abortf( "Attempt to allocate %d bytes of storage for coroutine or task execution-state but insufficient memory available.", this->size );
+                if ( (intptr_t)storage == 0 ) {
+                        abortf( "Attempt to allocate %d bytes of storage for coroutine or task execution-state but insufficient memory available.", size );
                 } // if
 
-                __cfaabi_dbg_debug_do( this->limit = (char *)this->storage + pageSize );
-                __cfaabi_dbg_no_debug_do( this->limit = (char *)libCeiling( (unsigned long)this->storage, 16 ) ); // minimum alignment
+                __cfaabi_dbg_debug_do( limit = (char *)storage + pageSize );
+                __cfaabi_dbg_no_debug_do( limit = (char *)libCeiling( (unsigned long)storage, 16 ) ); // minimum alignment
 
         } else {
-                assertf( ((size_t)this->storage & (libAlign() - 1)) != 0ul, "Stack storage %p for task/coroutine must be aligned on %d byte boundary.", this->storage, (int)libAlign() );
-                this->userStack = true;
-                this->size = storageSize - cxtSize;
+                assertf( ((size_t)storage & (libAlign() - 1)) != 0ul, "Stack storage %p for task/coroutine must be aligned on %d byte boundary.", storage, (int)libAlign() );
+                userStack = true;
+                size = storageSize - cxtSize;
 
-                if ( this->size % 16 != 0u ) this->size -= 8;
+                if ( size % 16 != 0u ) size -= 8;
 
-                this->limit = (char *)libCeiling( (unsigned long)this->storage, 16 ); // minimum alignment
+                limit = (char *)libCeiling( (unsigned long)storage, 16 ); // minimum alignment
         } // if
-        assertf( this->size >= MinStackSize, "Stack size %zd provides less than minimum of %d bytes for a stack.", this->size, MinStackSize );
+        assertf( size >= MinStackSize, "Stack size %zd provides less than minimum of %d bytes for a stack.", size, MinStackSize );
 
-        this->base = (char *)this->limit + this->size;
-        this->context = this->base;
-        this->top = (char *)this->context + cxtSize;
+        base = (char *)limit + size;
+        context = base;
+        top = (char *)context + cxtSize;
 }