Changeset 983edfd

Timestamp:

Dec 12, 2019, 11:52:11 AM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

c84b4be

Parents:

2a3d446

Message:

Ready queue seems to work but clearly shows quiescing is broken

File:

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

libcfa/src/concurrency/ready_queue.cfa

@@ -484 +484 @@
                         verifyf((empty.mask[word] & (1ull << bit)) != 0, "After set %llu:%llu (%u), %llx & %llx", word, bit, i, empty.mask[word], (1ull << bit));
                 }
-                verify(empty.count <= (int)list.count);
-                verify( list.data[i].last_id == kernelTLS.this_processor->id );
-                verify( list.data[i].lock );
+                verifyf( empty.count <= list.count, "Non-empty count (%zu) exceeds actual count (%zu)\n", empty.count, list.count );
+                verifyf( list.data[i].last_id == kernelTLS.this_processor->id, "Expected last processor to lock queue %u to be %u, was %u\n", i, list.data[i].last_id, kernelTLS.this_processor->id );
+                verifyf( list.data[i].lock, "List %u is not locked\n", i );
 
                 // Unlock and return
@@ -768 +768 @@
                         __cfa_readyQ_mask_t clears = ~0;
 
-                        for( b ; fbit ~ lbit ) {
+                        for( b ; lbit ~ fbit ) {
                                 clears ^= 1 << b;
                         }
 
                         empty.mask[fword] &= clears;
+
+
+                        empty.count = 0;
+                        for( i ; lword ) {
+                                empty.count += __builtin_popcountl(empty.mask[i]);
+                        }
                 }