Changeset 2a301ff for libcfa/src/concurrency/invoke.h

Timestamp:

Aug 31, 2023, 11:31:15 PM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

950c58e

Parents:

92355883 (diff), 686912c (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:

Resolve conflict

File:

• libcfa/src/concurrency/invoke.h (modified) (5 diffs)

libcfa/src/concurrency/invoke.h

@@ -10 +10 @@
 // Created On       : Tue Jan 17 12:27:26 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Mar 14 13:39:31 2023
-// Update Count     : 59
+// Last Modified On : Wed Aug 30 21:27:51 2023
+// Update Count     : 60
 //
 
 // No not use #pragma once was this file is included twice in some places. It has its own guard system.
 
-#include "bits/containers.hfa"
+#include "bits/collections.hfa"
 #include "bits/defs.hfa"
 #include "bits/locks.hfa"
@@ -23 +23 @@
 
 #ifdef __cforall
-#include "containers/list.hfa"
+#include "collections/list.hfa"
 extern "C" {
 #endif
@@ -74 +74 @@
         };
 
+    struct nonlocal_ehm {
+        // list of pending nonlocal exceptions
+        __queue_t(struct nonlocal_exception) ehm_buffer;
+
+        // lock to protect the buffer
+        struct __spinlock_t buffer_lock;
+
+        // enable/disabled flag
+        bool ehm_enabled;
+    };
+
         enum __Coroutine_State { Halted, Start, Primed, Blocked, Ready, Active, Cancelled, Halting };
 
@@ -98 +109 @@
                 struct _Unwind_Exception * cancellation;
 
+        // Non-local exception handling information
+        struct nonlocal_ehm ehm_state;
         };
         // Wrapper for gdb
@@ -242 +255 @@
         #ifdef __cforall
         extern "Cforall" {
+        static inline bool exception_in_flight() {
+            return __get_stack( &active_thread()->self_cor )->exception_context.current_exception != 0p;
+        }
+
                 static inline thread$ * volatile & ?`next ( thread$ * this ) {
                         return this->user_link.next;