Changeset f53acdf8 for libcfa/src/concurrency

Timestamp:

Jul 19, 2019, 2:16:01 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

4eb43fa

Parents:

1f1c102 (diff), 8ac3b0e (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' into new-ast

Location:

libcfa/src/concurrency

Files:

• alarm.cfa (modified) (1 diff)
• coroutine.cfa (modified) (2 diffs)
• invoke.c (modified) (2 diffs)
• invoke.h (modified) (1 diff)
• kernel.cfa (modified) (2 diffs)
• kernel_private.hfa (modified) (1 diff)
• monitor.cfa (modified) (1 diff)
• mutex.cfa (modified) (1 diff)
• preemption.cfa (modified) (1 diff)
• thread.cfa (modified) (1 diff)

libcfa/src/concurrency/alarm.cfa

@@ -13 +13 @@
 // Update Count     : 67
 //
+
+#define __cforall_thread__
 
 extern "C" {

libcfa/src/concurrency/coroutine.cfa

@@ -13 +13 @@
 // Update Count     : 9
 //
+
+#define __cforall_thread__
 
 #include "coroutine.hfa"
@@ -98 +100 @@
 
 void ^?{}(coroutine_desc& this) {
-        if(this.state != Halted && this.state != Start) {
+        if(this.state != Halted && this.state != Start && this.state != Primed) {
                 coroutine_desc * src = TL_GET( this_thread )->curr_cor;
                 coroutine_desc * dst = &this;

libcfa/src/concurrency/invoke.c

@@ -13 +13 @@
 // Update Count     : 5
 //
+
+#define __cforall_thread__
 
 #include <stdbool.h>
@@ -31 +33 @@
 extern void __finish_creation( struct thread_desc * );
 extern void __leave_thread_monitor( struct thread_desc * this );
-extern void disable_interrupts();
+extern void disable_interrupts() OPTIONAL_THREAD;
 extern void enable_interrupts( __cfaabi_dbg_ctx_param );
 

libcfa/src/concurrency/invoke.h

@@ -46 +46 @@
         #ifdef __cforall
         extern "Cforall" {
-                static inline struct thread_desc             *& get_next( struct thread_desc             & this );
-                static inline struct __condition_criterion_t *& get_next( struct __condition_criterion_t & this );
-
                 extern thread_local struct KernelThreadData {
                         struct thread_desc    * volatile this_thread;

libcfa/src/concurrency/kernel.cfa

@@ -13 +13 @@
 // Update Count     : 25
 //
+
+#define __cforall_thread__
 
 //C Includes
@@ -943 +945 @@
         }
 )
+
+//-----------------------------------------------------------------------------
+// Debug
+bool threading_enabled(void) {
+        return true;
+}
 // Local Variables: //
 // mode: c //

libcfa/src/concurrency/kernel_private.hfa

@@ -26 +26 @@
 
 extern "C" {
-        void disable_interrupts();
+        void disable_interrupts() OPTIONAL_THREAD;
         void enable_interrupts_noPoll();
         void enable_interrupts( __cfaabi_dbg_ctx_param );

libcfa/src/concurrency/monitor.cfa

@@ -13 +13 @@
 // Update Count     : 9
 //
+
+#define __cforall_thread__
 
 #include "monitor.hfa"

libcfa/src/concurrency/mutex.cfa

@@ -15 +15 @@
 // Update Count     : 0
 //
+
+#define __cforall_thread__
 
 #include "mutex.hfa"

libcfa/src/concurrency/preemption.cfa

@@ -13 +13 @@
 // Update Count     : 37
 //
+
+#define __cforall_thread__
 
 #include "preemption.hfa"

libcfa/src/concurrency/thread.cfa

@@ -13 +13 @@
 // Update Count     : 8
 //
+
+#define __cforall_thread__
 
 #include "thread.hfa"