Changeset 3381ed7 for libcfa/src/bits/containers.hfa

Timestamp:

Feb 13, 2020, 4:18:07 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

50b8885

Parents:

9f575ea

Message:

Added park/unpark primitives thread and removed BlockInternal?.
Converted monitors to use park unpark.
Intrusive Queue now mark next field when thread is inside queue.
Added several asserts to kernel and monitor.
Added a few tests for park and unpark.

File:

• libcfa/src/bits/containers.hfa (modified) (2 diffs)

libcfa/src/bits/containers.hfa

@@ -146 +146 @@
         static inline forall( dtype T | is_node(T) ) {
                 void ?{}( __queue(T) & this ) with( this ) {
-                        head{ 0p };
+                        head{ 1p };
                         tail{ &head };
+                        verify(*tail == 1p);
                 }
 
                 void append( __queue(T) & this, T * val ) with( this ) {
                         verify(tail != 0p);
+                        verify(*tail == 1p);
                         *tail = val;
                         tail = &get_next( *val );
+                        *tail = 1p;
                 }
 
                 T * pop_head( __queue(T) & this ) {
+                        verify(*this.tail == 1p);
                         T * head = this.head;
-                        if( head ) {
+                        if( head != 1p ) {
                                 this.head = get_next( *head );
-                                if( !get_next( *head ) ) {
+                                if( get_next( *head ) == 1p ) {
                                         this.tail = &this.head;
                                 }
                                 get_next( *head ) = 0p;
-                        }
-                        return head;
+                                verify(*this.tail == 1p);
+                                return head;
+                        }
+                        verify(*this.tail == 1p);
+                        return 0p;
                 }
 
@@ -180 +187 @@
                         get_next( *val ) = 0p;
 
-                        verify( (head == 0p) == (&head == tail) );
-                        verify( *tail == 0p );
+                        verify( (head == 1p) == (&head == tail) );
+                        verify( *tail == 1p );
                         return val;
                 }