Changeset 681d8f2

Timestamp:

Mar 9, 2023, 12:36:43 PM (3 years ago)

Author:

caparsons <caparson@…>

Branches:

ADT, ast-experimental, master

Children:

2ceb2bf

Parents:

0f275f7

Message:

After many red herrings I think the race between checking a message and shutdown is the true cause of the matrix.cfa bug and should be fixed

File:

• libcfa/src/concurrency/actor.hfa (modified) (2 diffs)

libcfa/src/concurrency/actor.hfa

@@ -460 +460 @@
 static inline void deliver_request( request & this ) {
     this.receiver->allocation_ = this.fn( *this.receiver, *this.msg );
+    check_message( *this.msg );
     check_actor( *this.receiver );
-    check_message( *this.msg );
 }
 
@@ -681 +681 @@
 // assigned at creation to __base_msg_finished to avoid unused message warning
 message __base_msg_finished @= { .allocation_ : Finished };
-struct __DeleteMsg { inline message; };
-struct __DestroyMsg { inline message; };
-struct __FinishedMsg { inline message; };
-
-// These are needed so that the compiler doesn't make a temporary when initializing below
-static inline void ?{}( __DeleteMsg & this, message & other ) { this.allocation_ = other.allocation_; }
-static inline void ?{}( __DestroyMsg & this, message & other ) { this.allocation_ = other.allocation_; }
-static inline void ?{}( __FinishedMsg & this, message & other ) { this.allocation_ = other.allocation_; }
-
-__DeleteMsg DeleteMsg = __base_msg_finished;
-__DestroyMsg DestroyMsg = __base_msg_finished;
-__FinishedMsg FinishedMsg = __base_msg_finished;
+struct __DeleteMsg { inline message; } DeleteMsg = __base_msg_finished;
+struct __DestroyMsg { inline message; } DestroyMsg = __base_msg_finished;
+struct __FinishedMsg { inline message; } FinishedMsg = __base_msg_finished;
 
 Allocation receive( actor & this, __DeleteMsg & msg ) { return Delete; }