Changeset c4c8571 for libcfa/src/concurrency/ready_queue.cfa

Timestamp:

Jul 28, 2022, 12:04:25 PM (2 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, master, pthread-emulation

Children:

32d1383, d0fcc82

Parents:

3f95dab (diff), 2af1943 (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.

Message:

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

File:

• libcfa/src/concurrency/ready_queue.cfa (modified) (7 diffs)

libcfa/src/concurrency/ready_queue.cfa

@@ -81 +81 @@
                                 /* paranoid */ verify( i < lanes_count );
                                 // If we can't lock it retry
-                        } while( !__atomic_try_acquire( &readyQ.data[i].lock ) );
+                        } while( !__atomic_try_acquire( &readyQ.data[i].l.lock ) );
                 } else {
                         do {
                                 i = __tls_rand() % lanes_count;
-                        } while( !__atomic_try_acquire( &readyQ.data[i].lock ) );
+                        } while( !__atomic_try_acquire( &readyQ.data[i].l.lock ) );
                 }
         } else {
@@ -93 +93 @@
                         /* paranoid */ verify( i < lanes_count );
                         // If we can't lock it retry
-                } while( !__atomic_try_acquire( &readyQ.data[i].lock ) );
+                } while( !__atomic_try_acquire( &readyQ.data[i].l.lock ) );
         }
 
@@ -100 +100 @@
 
         // Unlock and return
-        __atomic_unlock( &readyQ.data[i].lock );
+        __atomic_unlock( &readyQ.data[i].l.lock );
 
         #if !defined(__CFA_NO_STATISTICS__)
@@ -136 +136 @@
         else {
                 const unsigned target = proc->rdq.target;
-                __cfadbg_print_safe(ready_queue, "Kernel : %u considering helping %u, tcsc %llu\n", this, target, readyQ.tscs[target].tv);
-                /* paranoid */ verify( readyQ.tscs[target].tv != ULLONG_MAX );
+                __cfadbg_print_safe(ready_queue, "Kernel : %u considering helping %u, tcsc %llu\n", this, target, readyQ.tscs[target].t.tv);
+                /* paranoid */ verify( readyQ.tscs[target].t.tv != ULLONG_MAX );
                 if(target < lanes_count) {
                         const unsigned long long cutoff = calc_cutoff(ctsc, proc->rdq.id, lanes_count, cltr->sched.readyQ.data, cltr->sched.readyQ.tscs, __shard_factor.readyq);
-                        const unsigned long long age = moving_average(ctsc, readyQ.tscs[target].tv, readyQ.tscs[target].ma);
+                        const unsigned long long age = moving_average(ctsc, readyQ.tscs[target].t.tv, readyQ.tscs[target].t.ma);
                         __cfadbg_print_safe(ready_queue, "Kernel : Help attempt on %u from %u, age %'llu vs cutoff %'llu, %s\n", target, this, age, cutoff, age > cutoff ? "yes" : "no");
                         if(age > cutoff) {
@@ -188 +188 @@
 
         // If we can't get the lock retry
-        if( !__atomic_try_acquire(&lane.lock) ) {
+        if( !__atomic_try_acquire(&lane.l.lock) ) {
                 return 0p;
         }
@@ -194 +194 @@
         // If list is empty, unlock and retry
         if( is_empty(lane) ) {
-                __atomic_unlock(&lane.lock);
+                __atomic_unlock(&lane.l.lock);
                 return 0p;
         }
@@ -206 +206 @@
         /* paranoid */ verify(thrd);
         /* paranoid */ verify(ts_next);
-        /* paranoid */ verify(lane.lock);
+        /* paranoid */ verify(lane.l.lock);
 
         // Unlock and return
-        __atomic_unlock(&lane.lock);
+        __atomic_unlock(&lane.l.lock);
 
         // Update statistics