Changes in libcfa/src/concurrency/actor.hfa [8512a2f:681d8f2]

File:

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

libcfa/src/concurrency/actor.hfa

@@ -5 +5 @@
 #include <kernel.hfa>
 #include <iofwd.hfa>
-#include <virtual_dtor.hfa>
 
 #ifdef __CFA_DEBUG__
@@ -358 +357 @@
     if ( seperate_clus ) delete( cluster );
 
-    #ifdef STATS // print formatted stats
+    #ifdef STATS
     printf("    Actor System Stats:\n");
     printf("\tActors Created:\t\t\t\t%lu\n\tMessages Sent:\t\t\t\t%lu\n", __num_actors_stats, __all_processed);
@@ -389 +388 @@
 static executor * __actor_executor_ = 0p;
 static bool __actor_executor_passed = false;            // was an executor passed to start_actor_system
-static size_t __num_actors_ = 0;                                        // number of actor objects in system
+static size_t __num_actors_ = 0;                                // number of actor objects in system
 static struct thread$ * __actor_executor_thd = 0p;              // used to wake executor after actors finish
 struct actor {
-    size_t ticket;                                          // executor-queue handle
+    size_t ticket;                              // executor-queue handle
     Allocation allocation_;                                         // allocation action
-    inline virtual_dtor;
 };
 
@@ -408 +406 @@
     #endif
 }
+static inline void ^?{}( actor & this ) {}
 
 static inline void check_actor( actor & this ) {
@@ -431 +430 @@
 struct message {
     Allocation allocation_;                     // allocation action
-    inline virtual_dtor;
 };
 
-static inline void ?{}( message & this ) {
-    this.allocation_ = Nodelete;
-}
+static inline void ?{}( message & this ) { 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 ) with(this) {
-    CFA_DEBUG( if ( allocation_ == Nodelete ) printf("A message at location %p was allocated but never sent.\n", &this); )
+static inline void ^?{}( message & this ) {
+    CFA_DEBUG( if ( this.allocation_ == Nodelete ) printf("A message at location %p was allocated but never sent.\n", &this); )
 }
 
 static inline void check_message( message & this ) {
-    switch ( this.allocation_ ) {                                               // analyze message status
-        case Nodelete: CFA_DEBUG(this.allocation_ = Finished); break;
+    #ifdef __CFA_DEBUG__
+    Allocation temp = this.allocation_;
+    this.allocation_ = Finished;
+    switch ( temp )
+    #else
+    switch ( this.allocation_ )
+    #endif
+    {                                           // analyze message status
+        case Nodelete: break;
         case Delete: delete( &this ); break;
         case Destroy: ^?{}(this); break;
@@ -453 +456 @@
     } // switch
 }
-static inline void set_allocation( message & this, Allocation state ) {
-    this.allocation_ = state;
-}
+static inline void set_allocation( message & this, Allocation state ) { this.allocation_ = state; }
 
 static inline void deliver_request( request & this ) {
@@ -687 +688 @@
 Allocation receive( actor & this, __DestroyMsg & msg ) { return Destroy; }
 Allocation receive( actor & this, __FinishedMsg & msg ) { return Finished; }
-