Changeset 7fbe450 for src

Timestamp:

Jan 18, 2017, 12:06:44 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

c84e80a

Parents:

c49bf54

Message:

No longer using co_main for coroutines/threads, now simply using main

Location:

src

Files:

• examples/thread.c (modified) (3 diffs)
• libcfa/concurrency/coroutines (modified) (1 diff)
• libcfa/concurrency/threads (modified) (1 diff)
• tests/coroutine.c (modified) (1 diff)

src/examples/thread.c

@@ -26 +26 @@
 void ^?{}( MyThread * this ) {}
 
-void co_main(MyThread* this) {
+void main(MyThread* this) {
         printf("Main called with %p\n", this);
         printf("Thread value is %d\n", this->value);
@@ -44 +44 @@
         printf("Address %p\n", this);
         printf("handle %p\n", get_thread(this));
-        printf("main %p\n", co_main);
+        printf("main %p\n", main);
         printf("get_t %p\n", get_thread);
         printf("invoke %p\n", CtxInvokeThread);
@@ -57 +57 @@
         thread(MyThread) thread1;
 
-        printf("Main is %p\n", this_coroutine());       
+        printf("Main is %p\n", this_coroutine());
 
         printf("First thread created\n");

src/libcfa/concurrency/coroutines

@@ -26 +26 @@
 // Anything that is resumed is a coroutine.
 trait is_coroutine(dtype T) {
-      void co_main(T * this);
+      void main(T * this);
       coroutine * get_coroutine(T * this);
 };

src/libcfa/concurrency/threads

@@ -28 +28 @@
 // Anything that is resumed is a coroutine.
 trait is_thread(dtype T /*| sized(T)*/) {
-      void co_main(T* this);
+      void main(T* this);
       thread_h* get_thread(T* this);
         /*void ?{}(T*);

src/tests/coroutine.c

@@ -15 +15 @@
 }
 
-void co_main(Fibonacci* this) {
+void main(Fibonacci* this) {
 #ifdef MORE_DEBUG
       sout | "Starting main of coroutine " | this | endl;