Changeset 0794365

Timestamp:

Jun 4, 2023, 8:38:45 AM (15 months ago)

Author:

caparsons <caparson@…>

Branches:

ast-experimental, master

Children:

c880a7b

Parents:

46e6e47

Message:

refactored allocation enum to match naming style and refactored some verifyf's to be aborts

Files:

• libcfa/src/concurrency/actor.hfa (modified) (9 diffs)
• src/Concurrency/Actors.cpp (modified) (7 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 ) {
-    verifyf( this.receiver->ticket != (unsigned long int)MAX, "Attempted to send message to deleted/dead actor\n" );
+    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 );
@@ -632 +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 );
 }
@@ -685 +687 @@
 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; }
-
+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; }
+

src/Concurrency/Actors.cpp

@@ -38 +38 @@
     bool namedDecl = false;
 
-    // finds and sets a ptr to the Allocation enum, which is needed in the next pass
+    // finds and sets a ptr to the allocation enum, which is needed in the next pass
     void previsit( const EnumDecl * decl ) {
-        if( decl->name == "Allocation" ) *allocationDecl = decl;
+        if( decl->name == "allocation" ) *allocationDecl = decl;
     }
 
@@ -227 +227 @@
                 static inline derived_actor & ?|?( derived_actor & receiver, derived_msg & msg ) {
                     request new_req;
-                    Allocation (*my_work_fn)( derived_actor &, derived_msg & ) = receive;
+                    allocation (*my_work_fn)( derived_actor &, derived_msg & ) = receive;
                     __receive_fn fn = (__receive_fn)my_work_fn;
                     new_req{ &receiver, &msg, fn };
@@ -246 +246 @@
             ));
             
-            // Function type is: Allocation (*)( derived_actor &, derived_msg & )
+            // Function type is: allocation (*)( derived_actor &, derived_msg & )
             FunctionType * derivedReceive = new FunctionType();
             derivedReceive->params.push_back( ast::deepCopy( derivedActorRef ) );
@@ -252 +252 @@
             derivedReceive->returns.push_back( new EnumInstType( *allocationDecl ) );
 
-            // Generates: Allocation (*my_work_fn)( derived_actor &, derived_msg & ) = receive;
+            // Generates: allocation (*my_work_fn)( derived_actor &, derived_msg & ) = receive;
             sendBody->push_back( new DeclStmt(
                 decl->location,
@@ -263 +263 @@
             ));
 
-            // Function type is: Allocation (*)( actor &, message & )
+            // Function type is: allocation (*)( actor &, message & )
             FunctionType * genericReceive = new FunctionType();
             genericReceive->params.push_back( new ReferenceType( new StructInstType( *actorDecl ) ) );
@@ -269 +269 @@
             genericReceive->returns.push_back( new EnumInstType( *allocationDecl ) );
 
-            // Generates: Allocation (*fn)( actor &, message & ) = (Allocation (*)( actor &, message & ))my_work_fn;
+            // Generates: allocation (*fn)( actor &, message & ) = (allocation (*)( actor &, message & ))my_work_fn;
             // More readable synonymous code: 
-            //     typedef Allocation (*__receive_fn)(actor &, message &);
+            //     typedef allocation (*__receive_fn)(actor &, message &);
             //     __receive_fn fn = (__receive_fn)my_work_fn;
             sendBody->push_back( new DeclStmt(
@@ -422 +422 @@
     const StructDecl ** msgDecl = &msgDeclPtr;
 
-    // first pass collects ptrs to Allocation enum, request type, and generic receive fn typedef
+    // first pass collects ptrs to allocation enum, request type, and generic receive fn typedef
     // also populates maps of all derived actors and messages
     Pass<CollectactorStructDecls>::run( translationUnit, actorStructDecls, messageStructDecls, requestDecl,