Changeset 7042c60 for libcfa/src/concurrency

Timestamp:

Apr 25, 2024, 3:48:17 PM (18 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

eb7586e

Parents:

cf191ac (diff), 55c97e4 (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

Location:

libcfa/src/concurrency

Files:

• actor.hfa (modified) (2 diffs)
• kernel/fwd.hfa (modified) (1 diff)

libcfa/src/concurrency/actor.hfa

@@ -299 +299 @@
 
         if ( seperate_clus ) {
-                cluster = alloc();
+                this.cluster = alloc();
                 (*cluster){};
         } else cluster = active_cluster();
@@ -360 +360 @@
         adelete( worker_req_queues );
         adelete( processors );
-        if ( seperate_clus ) delete( cluster );
+        if ( seperate_clus ) delete( this.cluster );
 
         #ifdef ACTOR_STATS // print formatted stats

libcfa/src/concurrency/kernel/fwd.hfa

@@ -374 +374 @@
                                 // since if that is the case, the oneshot was fulfilled (unparking this thread)
                                 // and the oneshot should not be needed any more
-                                __attribute__((unused)) struct oneshot * was = this.ptr;
+                                struct oneshot * was __attribute__((unused)) = this.ptr; // used in option verify
                                 /* paranoid */ verifyf( was == future_FULFILLED, "Expected this.ptr to be 1p, was %p\n", was );