Changeset 00f5fde for libcfa/src/concurrency

Timestamp:

Jan 12, 2022, 9:30:48 PM (4 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, master, pthread-emulation, qualifiedEnum

Children:

42daeb4

Parents:

1959528 (diff), 07a1e7a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Peter A. Buhr <pabuhr@…> (01/12/22 18:35:04)

git-committer:

Peter A. Buhr <pabuhr@…> (01/12/22 21:30:48)

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

libcfa/src/concurrency

Files:

• io.cfa (modified) (1 diff)
• kernel.cfa (modified) (2 diffs)
• ready_queue.cfa (modified) (1 diff)
• thread.cfa (modified) (2 diffs)

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);

libcfa/src/concurrency/thread.cfa

@@ -10 +10 @@
 // Created On       : Tue Jan 17 12:27:26 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jan 12 18:28:18 2022
-// Update Count     : 35
+// Last Modified On : Wed Jan 12 18:46:48 2022
+// Update Count     : 36
 //
 
@@ -197 +197 @@
 } // LCG
 
-void set_seed( uint32_t seed ) { active_thread()->random_state = seed; __global_random_seed = seed; }
+void set_seed( uint32_t seed ) {
+        active_thread()->random_state = __global_random_seed = seed;
+        GENERATOR( active_thread()->random_state );
+} // set_seed
 uint32_t prng( void ) { return GENERATOR( active_thread()->random_state ); } // [0,UINT_MAX]