Changeset 8a930c03 for libcfa/src/concurrency/actor.hfa

Timestamp:

Jun 12, 2023, 12:05:58 PM (17 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

fec8bd1

Parents:

2b78949 (diff), 38e266ca (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

File:

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

libcfa/src/concurrency/actor.hfa

@@ -13 +13 @@
 #endif // CFA_DEBUG
 
+#define DEBUG_ABORT( cond, string ) CFA_DEBUG( if ( cond ) abort( string ) )
+
 // Define the default number of processors created in the executor. Must be greater than 0.
 #define __DEFAULT_EXECUTOR_PROCESSORS__ 2
@@ -42 +44 @@
 struct executor;
 
-enum Allocation { Nodelete, Delete, Destroy, Finished }; // allocation status
-
-typedef Allocation (*__receive_fn)(actor &, message &);
+enum allocation { Nodelete, Delete, Destroy, Finished }; // allocation status
+
+typedef allocation (*__receive_fn)(actor &, message &);
 struct request {
     actor * receiver;
@@ -393 +395 @@
 struct actor {
     size_t ticket;                                          // executor-queue handle
-    Allocation allocation_;                                         // allocation action
+    allocation allocation_;                                         // allocation action
     inline virtual_dtor;
 };
@@ -400 +402 @@
     // Once an actor is allocated it must be sent a message or the actor system cannot stop. Hence, its receive
     // member must be called to end it
-    verifyf( __actor_executor_, "Creating actor before calling start_actor_system() can cause undefined behaviour.\n" ); 
+    DEBUG_ABORT( __actor_executor_ == 0p, "Creating actor before calling start_actor_system() can cause undefined behaviour.\n" );
     allocation_ = Nodelete;
     ticket = __get_next_ticket( *__actor_executor_ );
@@ -430 +432 @@
 
 struct message {
-    Allocation allocation_;                     // allocation action
+    allocation allocation_;                     // allocation action
     inline virtual_dtor;
 };
@@ -437 +439 @@
     this.allocation_ = Nodelete;
 }
-static inline void ?{}( message & this, Allocation allocation ) {
-    memcpy( &this.allocation_, &allocation, sizeof(allocation) ); // optimization to elide ctor
-    verifyf( this.allocation_ != Finished, "The Finished Allocation status is not supported for message types.\n");
+static inline void ?{}( message & this, allocation alloc ) {
+    memcpy( &this.allocation_, &alloc, sizeof(allocation) ); // optimization to elide ctor
+    DEBUG_ABORT( this.allocation_ == Finished, "The Finished allocation status is not supported for message types.\n" );
 }
 static inline void ^?{}( message & this ) with(this) {
@@ -453 +455 @@
     } // switch
 }
-static inline void set_allocation( message & this, Allocation state ) {
+static inline void set_allocation( message & this, allocation state ) {
     this.allocation_ = state;
 }
 
 static inline void deliver_request( request & this ) {
+    DEBUG_ABORT( this.receiver->ticket == (unsigned long int)MAX, "Attempted to send message to deleted/dead actor\n" );
     this.receiver->allocation_ = this.fn( *this.receiver, *this.msg );
     check_message( *this.msg );
@@ -631 +634 @@
 
 static inline void send( actor & this, request & req ) {
-    verifyf( this.ticket != (unsigned long int)MAX, "Attempted to send message to deleted/dead actor\n" );
+    DEBUG_ABORT( this.ticket == (unsigned long int)MAX, "Attempted to send message to deleted/dead actor\n" );
     send( *__actor_executor_, req, this.ticket );
 }
@@ -680 +683 @@
 // assigned at creation to __base_msg_finished to avoid unused message warning
 message __base_msg_finished @= { .allocation_ : 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; }
-Allocation receive( actor & this, __DestroyMsg & msg ) { return Destroy; }
-Allocation receive( actor & this, __FinishedMsg & msg ) { return Finished; }
-
+struct __delete_msg_t { inline message; } delete_msg = __base_msg_finished;
+struct __destroy_msg_t { inline message; } destroy_msg = __base_msg_finished;
+struct __finished_msg_t { inline message; } finished_msg = __base_msg_finished;
+
+allocation receive( actor & this, __delete_msg_t & msg ) { return Delete; }
+allocation receive( actor & this, __destroy_msg_t & msg ) { return Destroy; }
+allocation receive( actor & this, __finished_msg_t & msg ) { return Finished; }
+