Changeset 77e6fcb

Timestamp:

Feb 1, 2017, 2:55:06 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

aaron-thesis, arm-eh, 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:

de90452

Parents:

8761006c

Message:

Removed trailing semi-colon on thread/coroutine declaration macro

Location:

src

Files:

• examples/Bench.c (modified) (4 diffs)
• libcfa/concurrency/coroutines (modified) (2 diffs)
• libcfa/concurrency/kernel.c (modified) (1 diff)
• libcfa/concurrency/threads (modified) (1 diff)
• tests/thread.c (modified) (1 diff)

src/examples/Bench.c

@@ -87 +87 @@
 
 struct CoroutineDummy { coroutine c; };
-DECL_COROUTINE(CoroutineDummy)
+DECL_COROUTINE(CoroutineDummy);
 void main(CoroutineDummy * this) {}
 
@@ -122 +122 @@
 };
 
-DECL_COROUTINE(CoroutineResume)
+DECL_COROUTINE(CoroutineResume);
 
 void ?{}(CoroutineResume* this, int N) {
@@ -151 +151 @@
 
 struct ThreadDummy { thread t; };
-DECL_THREAD(ThreadDummy)
+DECL_THREAD(ThreadDummy);
 void main(ThreadDummy * this) {}
 
@@ -183 +183 @@
 };
 
-DECL_THREAD(ContextSwitch)
+DECL_THREAD(ContextSwitch);
 
 void main(ContextSwitch * this) {    

src/libcfa/concurrency/coroutines

@@ -30 +30 @@
 };
 
-#define DECL_COROUTINE(X) static inline coroutine* get_coroutine(X* this) { return &this->c; } void main(X* this);
+#define DECL_COROUTINE(X) static inline coroutine* get_coroutine(X* this) { return &this->c; } void main(X* this)
 
 //-----------------------------------------------------------------------------
@@ -110 +110 @@
 }
 
+static inline void resume(coroutine * dst) {
+        coroutine * src = this_coroutine();             // optimization
+
+      // not resuming self ?
+        if ( src != dst ) {
+                assertf( dst->notHalted ,
+                        "Attempt by coroutine %.256s (%p) to resume terminated coroutine %.256s (%p).\n"
+                        "Possible cause is terminated coroutine's main routine has already returned.",
+                        src->name, src, dst->name, dst );
+
+            // set last resumer
+                dst->last = src;
+        } // if
+
+      // always done for performance testing
+        CoroutineCtxSwitch( src, dst );
+}
+
 #endif //COROUTINES_H
 

src/libcfa/concurrency/kernel.c

@@ -43 +43 @@
 };
 
-DECL_COROUTINE(processorCtx_t)
+DECL_COROUTINE(processorCtx_t);
 
 #define KERNEL_STORAGE(T,X) static char X##_storage[sizeof(T)]

src/libcfa/concurrency/threads

@@ -32 +32 @@
 };
 
-#define DECL_THREAD(X) thread* get_thread(X* this) { return &this->t; } void main(X* this);
+#define DECL_THREAD(X) thread* get_thread(X* this) { return &this->t; } void main(X* this)
 
 forall( dtype T | is_thread(T) )

src/tests/thread.c

@@ -7 +7 @@
 struct Second { thread t; simple_lock* lock; };
 
-DECL_THREAD(First)
-DECL_THREAD(Second)
+DECL_THREAD(First);
+DECL_THREAD(Second);
 
 void ?{}( First * this, simple_lock* lock ) { this->lock = lock; }