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

Timestamp:

Dec 13, 2019, 1:45:49 PM (4 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:

75ca7f4

Parents:

983edfd

Message:

new ready queue seems to work but halting does not, had to be disabled

File:

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

libcfa/src/concurrency/ready_queue.cfa

@@ -240 +240 @@
         this.lock = false;
         this.last_id = -1u;
+        this.count = 0u;
 
         this.before.link.prev = 0p;
@@ -283 +284 @@
         /* paranoid */ verify(tail(this)->link.next == 0p );
         /* paranoid */ verify(tail(this)->link.prev == head(this) );
+        /* paranoid */ verify(this.count == 0u );
 }
 
@@ -292 +294 @@
         verify(node->link.next == 0p);
         verify(node->link.prev == 0p);
+
+        this.count++;
 
         if(this.before.link.ts == 0l) {
@@ -345 +349 @@
         }
 
+        this.count--;
         /* paranoid */ verify(node);
 
@@ -693 +698 @@
 void ready_queue_grow  (struct cluster * cltr) {
         uint_fast32_t last_size = ready_mutate_lock( *cltr );
+        __cfaabi_dbg_print_safe("Kernel : Growing ready queue\n");
         check( cltr->ready_queue );
 
@@ -723 +729 @@
         // Make sure that everything is consistent
         check( cltr->ready_queue );
+        __cfaabi_dbg_print_safe("Kernel : Growing ready queue done\n");
         ready_mutate_unlock( *cltr, last_size );
 }
@@ -728 +735 @@
 void ready_queue_shrink(struct cluster * cltr) {
         uint_fast32_t last_size = ready_mutate_lock( *cltr );
+        __cfaabi_dbg_print_safe("Kernel : Shrinking ready queue\n");
         with( cltr->ready_queue ) {
+                #if defined(__CFA_WITH_VERIFY__)
+                        size_t nthreads = 0;
+                        for( idx; (size_t)list.count ) {
+                                nthreads += list.data[idx].count;
+                        }
+                #endif
+
                 size_t ocount = list.count;
                 // Check that we have some space left
@@ -737 +752 @@
                 // redistribute old data
                 verify(ocount > list.count);
+                __attribute__((unused)) size_t displaced = 0;
                 for( idx; (size_t)list.count ~ ocount) {
                         // This is not strictly needed but makes checking invariants much easier
@@ -747 +763 @@
                                 verify(thrd);
                                 push(cltr, thrd);
+                                displaced++;
                         }
 
@@ -755 +772 @@
                         ^(list.data[idx]){};
                 }
+
+                __cfaabi_dbg_print_safe("Kernel : Shrinking ready queue displaced %zu threads\n", displaced);
 
                 // clear the now unused masks
@@ -776 +795 @@
 
                         empty.count = 0;
-                        for( i ; lword ) {
+                        for( i ; 0 ~= lword ) {
                                 empty.count += __builtin_popcountl(empty.mask[i]);
                         }
@@ -788 +807 @@
                         fix(list.data[idx]);
                 }
+
+                #if defined(__CFA_WITH_VERIFY__)
+                        for( idx; (size_t)list.count ) {
+                                nthreads -= list.data[idx].count;
+                        }
+                        assertf(nthreads == 0, "Shrinking changed number of threads");
+                #endif
         }
 
         // Make sure that everything is consistent
         check( cltr->ready_queue );
+        __cfaabi_dbg_print_safe("Kernel : Shrinking ready queue done\n");
         ready_mutate_unlock( *cltr, last_size );
 }