Changes in src/libcfa/concurrency/coroutines.c [8118303:8def349]

File:

• src/libcfa/concurrency/coroutines.c (modified) (6 diffs)

src/libcfa/concurrency/coroutines.c

@@ +1 @@
+//                              -*- Mode: CFA -*-
 //
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
@@ -14 +15 @@
 //
 
+#include "coroutines"
+
 extern "C" {
 #include <stddef.h>
@@ -23 +26 @@
 }
 
-#include "coroutines"
+#include "kernel"
 #include "libhdr.h"
 
 #define __CFA_INVOKE_PRIVATE__
 #include "invoke.h"
+
+extern processor * get_this_processor();
 
 //-----------------------------------------------------------------------------
@@ -35 +40 @@
 #define MinStackSize 1000
 static size_t pageSize = 0;                             // architecture pagesize HACK, should go in proper runtime singleton
-
-//Extra private desctructor for the main
-//FIXME the main should not actually allocate a stack
-//Since the main is never resumed the extra stack does not cause 
-//any problem but it is wasted memory
-void ?{}(coStack_t* this, size_t size);
-void ?{}(coroutine* this, size_t size);
-
-//Main coroutine
-//FIXME do not construct a stack for the main
-coroutine main_coroutine = { 1000 };
-
-//Current coroutine
-//Will need to be in TLS when multi-threading is added
-coroutine* current_coroutine = &main_coroutine;
 
 //-----------------------------------------------------------------------------
@@ -111 +101 @@
 // is not inline (We can't inline Cforall in C)
 void suspend_no_inline(void) {
-        LIB_DEBUG_PRINTF("Suspending back : to %p from %p\n", this_coroutine(), this_coroutine() ? this_coroutine()->last : (void*)-1);
-
         suspend();
 }
@@ -123 +111 @@
 
         // set new coroutine that task is executing
-        current_coroutine = dst;                        
+        get_this_processor()->current_coroutine = dst;                  
 
         // context switch to specified coroutine