Changes in libcfa/src/concurrency/actor.hfa [e23169b:99fb52c]

File:

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

libcfa/src/concurrency/actor.hfa

@@ -371 +371 @@
 
 // this is a static field of executor but have to forward decl for get_next_ticket
-static size_t __next_ticket = 0; 
-
-static inline size_t __get_next_ticket( executor & this ) with(this) {
-    #ifdef __CFA_DEBUG__
-    size_t temp = __atomic_fetch_add( &__next_ticket, 1, __ATOMIC_SEQ_CST) % nrqueues;
+static unsigned long int __next_ticket = 0; 
+
+static inline unsigned long int __get_next_ticket( executor & this ) with(this) {
+    unsigned long int temp = __atomic_fetch_add( &__next_ticket, 1, __ATOMIC_SEQ_CST) % nrqueues;
 
     // reserve MAX for dead actors
-    if ( unlikely( temp == MAX ) ) temp = __atomic_fetch_add( &__next_ticket, 1, __ATOMIC_SEQ_CST) % nrqueues;
+    if ( temp == MAX ) temp = __atomic_fetch_add( &__next_ticket, 1, __ATOMIC_SEQ_CST) % nrqueues;
     return temp;
-    #else
-    return __atomic_fetch_add( &__next_ticket, 1, __ATOMIC_RELAXED) % nrqueues;
-    #endif
 } // tickets
 
@@ -388 +384 @@
 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 unsigned long int __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
+    unsigned long int ticket;                           // executor-queue handle
     Allocation allocation_;                                         // allocation action
 };
 
-static inline void ?{}( actor & this ) with(this) {
+static inline void ?{}( actor & this ) {
     // 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" ); 
-    allocation_ = Nodelete;
-    ticket = __get_next_ticket( *__actor_executor_ );
-    __atomic_fetch_add( &__num_actors_, 1, __ATOMIC_RELAXED );
+    this.allocation_ = Nodelete;
+    this.ticket = __get_next_ticket( *__actor_executor_ );
+    __atomic_fetch_add( &__num_actors_, 1, __ATOMIC_SEQ_CST );
     #ifdef STATS
     __atomic_fetch_add( &__num_actors_stats, 1, __ATOMIC_SEQ_CST );
@@ -422 +418 @@
         }
 
-        if ( unlikely( __atomic_add_fetch( &__num_actors_, -1, __ATOMIC_RELAXED ) == 0 ) ) { // all actors have terminated
+        if ( unlikely( __atomic_add_fetch( &__num_actors_, -1, __ATOMIC_SEQ_CST ) == 0 ) ) { // all actors have terminated
             unpark( __actor_executor_thd );
         }
@@ -434 +430 @@
 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
+    this.allocation_ = allocation;
     verifyf( this.allocation_ != Finished, "The Finished Allocation status is not supported for message types.\n");
 }
@@ -442 +438 @@
 
 static inline void check_message( message & this ) {
-    CFA_DEBUG( this.allocation_ = Finished; )
-    switch ( this.allocation_ ) {                                               // analyze message status
+    #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;
@@ -453 +455 @@
 
 static inline void deliver_request( request & this ) {
-    this.receiver->allocation_ = this.fn( *this.receiver, *this.msg );
+    Allocation actor_allocation = this.fn( *this.receiver, *this.msg );
+    this.receiver->allocation_ = actor_allocation;
     check_actor( *this.receiver );
     check_message( *this.msg );
@@ -566 +569 @@
     unsigned int empty_count = 0;
     request & req;
+    unsigned int curr_idx;
     work_queue * curr_work_queue;
 
     Exit:
     for ( unsigned int i = 0;; i = (i + 1) % range ) { // cycle through set of request buffers
-        curr_work_queue = request_queues[i + start];
+        curr_idx = i + start;
+        curr_work_queue = request_queues[curr_idx];
         
         // check if queue is empty before trying to gulp it