Changeset 28d73c1 for libcfa/src/concurrency/ready_queue.cfa

Timestamp:

Jul 20, 2020, 3:30:25 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:

124c1b7

Parents:

3f1d9b5

Message:

Moved processor registration to constructor

File:

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

libcfa/src/concurrency/ready_queue.cfa

@@ -186 +186 @@
 //=======================================================================
 void ?{}(__ready_queue_t & this) with (this) {
-
-        lanes.data = alloc(4);
-        for( i; 4 ) {
-                (lanes.data[i]){};
-        }
-        lanes.count = 4;
-        snzi{ log2( lanes.count / 8 ) };
+        lanes.data  = 0p;
+        lanes.count = 0;
 }
 
 void ^?{}(__ready_queue_t & this) with (this) {
-        verify( 4  == lanes.count );
+        verify( 0  == lanes.count );
         verify( !query( snzi ) );
-
-        ^(snzi){};
-
-        for( i; 4 ) {
-                ^(lanes.data[i]){};
-        }
         free(lanes.data);
 }
@@ -495 +484 @@
 }
 
+#warning remove when alloc is fixed
+forall( dtype T | sized(T) )
+static inline T * correct_alloc( T ptr[], size_t dim ) {
+        if( dim == 0 ) {
+                free(ptr);
+                return 0p;
+        }
+        T * temp = alloc( dim );
+        if(ptr) {
+                memcpy( temp, ptr, dim * sizeof(T));
+                free(ptr);
+        }
+        return temp;
+}
+
 // Grow the ready queue
 void ready_queue_grow  (struct cluster * cltr) {
@@ -513 +517 @@
 
                 // Allocate new array (uses realloc and memcpies the data)
-                lanes.data = alloc(lanes.data, ncount);
+                lanes.data = correct_alloc(lanes.data, ncount);
 
                 // Fix the moved data
@@ -558 +562 @@
                 size_t ocount = lanes.count;
                 // Check that we have some space left
-                if(ocount < 8) abort("Program attempted to destroy more Ready Queues than were created");
+                if(ocount < 4) abort("Program attempted to destroy more Ready Queues than were created");
 
                 // reduce the actual count so push doesn't use the old queues
@@ -600 +604 @@
 
                 // Allocate new array (uses realloc and memcpies the data)
-                lanes.data = alloc(lanes.data, lanes.count);
+                lanes.data = correct_alloc(lanes.data, lanes.count);
 
                 // Fix the moved data