Changes in libcfa/src/concurrency/kernel.cfa [a633f6f:1757f98]

File:

• libcfa/src/concurrency/kernel.cfa (modified) (6 diffs)

libcfa/src/concurrency/kernel.cfa

@@ -124 +124 @@
 static void __wake_one(cluster * cltr);
 
+static void idle_sleep(processor * proc);
 static bool mark_idle (__cluster_proc_list & idles, processor & proc);
 static void mark_awake(__cluster_proc_list & idles, processor & proc);
@@ -228 +229 @@
                                 }
 
-                                #if !defined(__CFA_NO_STATISTICS__)
-                                        if(this->print_halts) {
-                                                __cfaabi_bits_print_safe( STDOUT_FILENO, "PH:%d - %lld 0\n", this->unique_id, rdtscl());
-                                        }
-                                #endif
-
-                                __cfadbg_print_safe(runtime_core, "Kernel : core %p waiting on eventfd %d\n", this, this->idle);
-
-                                {
-                                        eventfd_t val;
-                                        ssize_t ret = read( this->idle, &val, sizeof(val) );
-                                        if(ret < 0) {
-                                                switch((int)errno) {
-                                                case EAGAIN:
-                                                #if EAGAIN != EWOULDBLOCK
-                                                        case EWOULDBLOCK:
-                                                #endif
-                                                case EINTR:
-                                                        // No need to do anything special here, just assume it's a legitimate wake-up
-                                                        break;
-                                                default:
-                                                        abort( "KERNEL : internal error, read failure on idle eventfd, error(%d) %s.", (int)errno, strerror( (int)errno ) );
-                                                }
-                                        }
-                                }
-
-                                #if !defined(__CFA_NO_STATISTICS__)
-                                        if(this->print_halts) {
-                                                __cfaabi_bits_print_safe( STDOUT_FILENO, "PH:%d - %lld 1\n", this->unique_id, rdtscl());
-                                        }
-                                #endif
+                                idle_sleep( this );
 
                                 // We were woken up, remove self from idle
@@ -349 +320 @@
 
                                 __STATS( if(this->print_halts) __cfaabi_bits_print_safe( STDOUT_FILENO, "PH:%d - %lld 0\n", this->unique_id, rdtscl()); )
-                                __cfadbg_print_safe(runtime_core, "Kernel : core %p waiting on eventfd %d\n", this, this->idle);
+                                __cfadbg_print_safe(runtime_core, "Kernel : core %p waiting on eventfd %d\n", this, this->idle_fd);
 
                                 {
                                         eventfd_t val;
-                                        ssize_t ret = read( this->idle, &val, sizeof(val) );
+                                        ssize_t ret = read( this->idle_fd, &val, sizeof(val) );
                                         if(ret < 0) {
                                                 switch((int)errno) {
@@ -798 +769 @@
                 eventfd_t val;
                 val = 1;
-                eventfd_write( this->idle, val );
+                eventfd_write( this->idle_fd, val );
         __enable_interrupts_checked();
+}
+
+static void idle_sleep(processor * this) {
+        #if !defined(__CFA_NO_STATISTICS__)
+                if(this->print_halts) {
+                        __cfaabi_bits_print_safe( STDOUT_FILENO, "PH:%d - %lld 0\n", this->unique_id, rdtscl());
+                }
+        #endif
+
+        __cfadbg_print_safe(runtime_core, "Kernel : core %p waiting on eventfd %d\n", this, this->idle_fd);
+
+        {
+                eventfd_t val;
+                ssize_t ret = read( this->idle_fd, &val, sizeof(val) );
+                if(ret < 0) {
+                        switch((int)errno) {
+                        case EAGAIN:
+                        #if EAGAIN != EWOULDBLOCK
+                                case EWOULDBLOCK:
+                        #endif
+                        case EINTR:
+                                // No need to do anything special here, just assume it's a legitimate wake-up
+                                break;
+                        default:
+                                abort( "KERNEL : internal error, read failure on idle eventfd, error(%d) %s.", (int)errno, strerror( (int)errno ) );
+                        }
+                }
+        }
+
+        #if !defined(__CFA_NO_STATISTICS__)
+                if(this->print_halts) {
+                        __cfaabi_bits_print_safe( STDOUT_FILENO, "PH:%d - %lld 1\n", this->unique_id, rdtscl());
+                }
+        #endif
 }
 
@@ -810 +815 @@
                 insert_first(this.idles, proc);
 
-                __atomic_store_n(&this.fd, proc.idle, __ATOMIC_SEQ_CST);
+                __atomic_store_n(&this.fd, proc.idle_fd, __ATOMIC_SEQ_CST);
         unlock( this );
         /* paranoid */ verify( ! __preemption_enabled() );
@@ -827 +832 @@
                 {
                         int fd = 0;
-                        if(!this.idles`isEmpty) fd = this.idles`first.idle;
+                        if(!this.idles`isEmpty) fd = this.idles`first.idle_fd;
                         __atomic_store_n(&this.fd, fd, __ATOMIC_SEQ_CST);
                 }