Changes in src/libcfa/concurrency/coroutine.c [6b0b624:83a071f9]

File:

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

src/libcfa/concurrency/coroutine.c

@@ +1 @@
+//                              -*- Mode: CFA -*-
 //
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
@@ -9 +10 @@
 // Author           : Thierry Delisle
 // Created On       : Mon Nov 28 12:27:26 2016
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jul 21 22:34:57 2017
-// Update Count     : 1
+// Last Modified By : Thierry Delisle
+// Last Modified On : Mon Nov 28 12:27:26 2016
+// Update Count     : 0
 //
 
@@ -25 +26 @@
 }
 
-#include "kernel_private.h"
+#include "kernel"
+#include "libhdr.h"
 
 #define __CFA_INVOKE_PRIVATE__
 #include "invoke.h"
 
+extern volatile thread_local processor * this_processor;
 
 //-----------------------------------------------------------------------------
@@ -40 +43 @@
 //-----------------------------------------------------------------------------
 // Coroutine ctors and dtors
-void ?{}(coStack_t* this) {
-        this->size              = 65000;        // size of stack
-        this->storage   = NULL; // pointer to stack
-        this->limit             = NULL; // stack grows towards stack limit
-        this->base              = NULL; // base of stack
-        this->context   = NULL; // address of cfa_context_t
-        this->top               = NULL; // address of top of storage
-        this->userStack = false;
+void ?{}(coStack_t& this) {
+        this.size               = 65000;        // size of stack
+        this.storage    = NULL; // pointer to stack
+        this.limit              = NULL; // stack grows towards stack limit
+        this.base               = NULL; // base of stack
+        this.context    = NULL; // address of cfa_context_t
+        this.top                = NULL; // address of top of storage
+        this.userStack  = false;
 }
 
-void ?{}(coStack_t* this, size_t size) {
+void ?{}(coStack_t& this, size_t size) {
         this{};
-        this->size = size;
+        this.size = size;
 
-        create_stack(this, this->size);
+        create_stack(&this, this.size);
 }
 
-void ?{}(coroutine_desc* this) {
+void ?{}(coroutine_desc& this) {
         this{ "Anonymous Coroutine" };
 }
 
-void ?{}(coroutine_desc* this, const char * name) {
-        this->name = name;
-        this->errno_ = 0;
-        this->state = Start;
-        this->starter = NULL;
-        this->last = NULL;
+void ?{}(coroutine_desc& this, const char * name) {
+        this.name = name;
+        this.errno_ = 0;
+        this.state = Start;
+        this.starter = NULL;
+        this.last = NULL;
 }
 
-void ?{}(coroutine_desc* this, size_t size) {
+void ?{}(coroutine_desc& this, size_t size) {
         this{};
-        (&this->stack){size};
+        (this.stack){size};
 }
 
-void ^?{}(coStack_t* this) {
-        if ( ! this->userStack ) {
+void ^?{}(coStack_t& this) {
+        if ( ! this.userStack ) {
                 LIB_DEBUG_DO(
-                        if ( mprotect( this->storage, pageSize, PROT_READ | PROT_WRITE ) == -1 ) {
-                                abortf( "(coStack_t *)%p.^?{}() : internal error, mprotect failure, error(%d) %s.", this, errno, strerror( errno ) );
+                        if ( mprotect( this.storage, pageSize, PROT_READ | PROT_WRITE ) == -1 ) {
+                                abortf( "(coStack_t *)%p.^?{}() : internal error, mprotect failure, error(%d) %s.", &this, errno, strerror( errno ) );
                         }
                 );
-                free( this->storage );
+                free( this.storage );
         }
 }
 
-void ^?{}(coroutine_desc* this) {}
+void ^?{}(coroutine_desc& this) {}
 
 // Part of the Public API
 // Not inline since only ever called once per coroutine
 forall(dtype T | is_coroutine(T))
-void prime(T* cor) {
+void prime(T& cor) {
         coroutine_desc* this = get_coroutine(cor);
         assert(this->state == Start);