Changeset 0ea1b65 for src/libcfa/concurrency

Timestamp:

Mar 15, 2017, 3:48:19 PM (9 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:

89a3df5

Parents:

9243cc91 (diff), 4a3334cf (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 plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src/libcfa/concurrency

Files:

• coroutine (moved) (moved from src/libcfa/concurrency/coroutines ) (1 diff)
• coroutine.c (moved) (moved from src/libcfa/concurrency/coroutines.c ) (2 diffs)
• kernel (modified) (1 diff)
• kernel_private.h (modified) (2 diffs)
• thread (moved) (moved from src/libcfa/concurrency/threads ) (2 diffs)
• thread.c (moved) (moved from src/libcfa/concurrency/threads.c ) (2 diffs)

src/libcfa/concurrency/coroutine

@@ -6 +6 @@
 // file "LICENCE" distributed with Cforall.
 //
-// coroutines --
+// coroutine --
 //
 // Author           : Thierry Delisle

src/libcfa/concurrency/coroutine.c

@@ -6 +6 @@
 // file "LICENCE" distributed with Cforall.
 //
-// coroutines.c --
+// coroutine.c --
 //
 // Author           : Thierry Delisle
@@ -15 +15 @@
 //
 
-#include "coroutines"
+#include "coroutine"
 
 extern "C" {

src/libcfa/concurrency/kernel

@@ -6 +6 @@
 // file "LICENCE" distributed with Cforall.
 //
-// threads --
+// kernel --
 //
 // Author           : Thierry Delisle

src/libcfa/concurrency/kernel_private.h

@@ -6 +6 @@
 // file "LICENCE" distributed with Cforall.
 //
-// threads --
+// kernel_private.h --
 //
 // Author           : Thierry Delisle
@@ -19 +19 @@
 
 #include "kernel"
-#include "threads"
+#include "thread"
 
 //-----------------------------------------------------------------------------

src/libcfa/concurrency/thread

@@ -6 +6 @@
 // file "LICENCE" distributed with Cforall.
 //
-// threads --
+// thread --
 //
 // Author           : Thierry Delisle
@@ -21 +21 @@
 #include "invoke.h"
 
-#include "coroutines"
+#include "coroutine"
 
 //-----------------------------------------------------------------------------

src/libcfa/concurrency/thread.c

@@ -6 +6 @@
 // file "LICENCE" distributed with Cforall.
 //
-// threads.c --
+// thread.c --
 //
 // Author           : Thierry Delisle
@@ -15 +15 @@
 //
 
-#include "threads"
+#include "thread"
 
 #include "kernel_private.h"