Changes in / [a10f6b4:9b33337]

Files:

• libcfa/src/bits/locks.hfa (modified) (3 diffs)
• libcfa/src/concurrency/io.cfa (modified) (1 diff)
• libcfa/src/concurrency/kernel.cfa (modified) (2 diffs)
• libcfa/src/concurrency/ready_queue.cfa (modified) (1 diff)
• tools/jenkins/setup.sh.in (modified) (1 diff)

libcfa/src/bits/locks.hfa

@@ -31 +31 @@
                 // previous thread to acquire the lock
                 void* prev_thrd;
+                // keep track of number of times we had to spin, just in case the number is unexpectedly huge
+                size_t spin_count;
         #endif
 };
@@ -48 +50 @@
         static inline void ?{}( __spinlock_t & this ) {
                 this.lock = 0;
+                #ifdef __CFA_DEBUG__
+                        this.spin_count = 0;
+                #endif
         }
 
@@ -72 +77 @@
                 for ( unsigned int i = 1;; i += 1 ) {
                         if ( (this.lock == 0) && (__atomic_test_and_set( &this.lock, __ATOMIC_ACQUIRE ) == 0) ) break;
+                        #ifdef __CFA_DEBUG__
+                                this.spin_count++;
+                        #endif
                         #ifndef NOEXPBACK
                                 // exponential spin

libcfa/src/concurrency/io.cfa

@@ -548 +548 @@
                         /* paranoid */ verify( proc == __cfaabi_tls.this_processor );
                         /* paranoid */ verify( ! __preemption_enabled() );
+
+                        return true;
                 }
         #endif

libcfa/src/concurrency/kernel.cfa

@@ -554 +554 @@
         /* paranoid */ verify( 0x0D15EA5E0D15EA5Ep == thrd->canary );
 
-        const bool local = thrd->state != Start;
         if (thrd->preempted == __NO_PREEMPTION) thrd->state = Ready;
 
@@ -737 +736 @@
 
         // Check if there is a sleeping processor
-        int fd = __atomic_load_n(&this->procs.fd, __ATOMIC_SEQ_CST);
+        // int fd = __atomic_load_n(&this->procs.fd, __ATOMIC_SEQ_CST);
+        int fd = 0;
+        if( __atomic_load_n(&this->procs.fd, __ATOMIC_SEQ_CST) != 0 ) {
+                fd = __atomic_exchange_n(&this->procs.fd, 0, __ATOMIC_RELAXED);
+        }
 
         // If no one is sleeping, we are done

libcfa/src/concurrency/ready_queue.cfa

@@ -681 +681 @@
         // Actually pop the list
         struct thread$ * thrd;
-        unsigned long long tsc_before = ts(lane);
+        #if defined(USE_WORK_STEALING) || defined(USE_CPU_WORK_STEALING)
+                unsigned long long tsc_before = ts(lane);
+        #endif
         unsigned long long tsv;
         [thrd, tsv] = pop(lane);

tools/jenkins/setup.sh.in

@@ -48 +48 @@
                 regex1='/([[:alpha:][:digit:]@/_.-]+)'
                 regex2='(libcfa[[:alpha:][:digit:].]+) => not found'
-                regex3='linux-vdso.so.1'
+                regex3='linux-vdso.so.1|linux-gate.so.1'
                 if [[ $line =~ $regex1 ]]; then
                         retsysdeps+=(${BASH_REMATCH[1]})