Changeset 615767b for libcfa/src/concurrency/clib

Timestamp:

Oct 1, 2020, 3:54:39 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

91131689

Parents:

ebec8ed (diff), dd53f75 (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 into master

Location:

libcfa/src/concurrency/clib

Files:

• cfathread.cfa (modified) (2 diffs)
• cfathread.h (modified) (2 diffs)

libcfa/src/concurrency/clib/cfathread.cfa

@@ -34 +34 @@
 extern "C" {
         //--------------------
-        // Basic thread managenemt
+        // Basic thread management
         CRunner * cfathread_create( void (*main)( CRunner * ) ) {
                 return new( main );
@@ -44 +44 @@
 
         void cfathread_park( void ) {
-                park( __cfaabi_dbg_ctx );
+                park();
         }
 
         void cfathread_unpark( CRunner * thrd ) {
-                unpark( *thrd __cfaabi_dbg_ctx2 );
+                unpark( *thrd );
         }
 

libcfa/src/concurrency/clib/cfathread.h

@@ -17 +17 @@
 #include "invoke.h"
 
-#if defined(__cforall) || defined(__cpluplus)
+#if defined(__cforall) || defined(__cplusplus)
 extern "C" {
 #endif
@@ -39 +39 @@
 
 
-#if defined(__cforall) || defined(__cpluplus)
+#if defined(__cforall) || defined(__cplusplus)
 }
 #endif