Changeset 64aeca0 for libcfa/src

Timestamp:

Jan 10, 2021, 5:47:16 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

2501ae5

Parents:

5a51798 (diff), 58fe85a (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

Location:

libcfa/src

Files:

• Makefile.am (modified) (2 diffs)
• bits/locks.hfa (modified) (3 diffs)
• concurrency/future.hfa (added)
• concurrency/monitor.hfa (modified) (1 diff)
• vec/vec.hfa (added)
• vec/vec2.hfa (added)
• vec/vec3.hfa (added)
• vec/vec4.hfa (added)

libcfa/src/Makefile.am

@@ -58 +58 @@
         concurrency/iofwd.hfa \
         containers/list.hfa \
-        containers/stackLockFree.hfa
+        containers/stackLockFree.hfa \
+        vec/vec.hfa \
+        vec/vec2.hfa \
+        vec/vec3.hfa \
+        vec/vec4.hfa
 
 inst_headers_src = \
@@ -94 +98 @@
         concurrency/clib/cfathread.h \
         concurrency/invoke.h \
+        concurrency/future.hfa \
         concurrency/kernel/fwd.hfa
 

libcfa/src/bits/locks.hfa

@@ -283 +283 @@
                 void ^?{}(future_t &) {}
 
+                void reset(future_t & this) {
+                        // needs to be in 0p or 1p
+                        __atomic_exchange_n( &this.ptr, 0p, __ATOMIC_SEQ_CST);
+                }
+
                 // check if the future is available
                 bool available( future_t & this ) {
@@ -340 +345 @@
 
                 // Mark the future as abandoned, meaning it will be deleted by the server
-                void abandon( future_t & this ) {
+                bool abandon( future_t & this ) {
+                        /* paranoid */ verify( this.ptr != 3p );
+
+                        // Mark the future as abandonned
                         struct oneshot * got = __atomic_exchange_n( &this.ptr, 3p, __ATOMIC_SEQ_CST);
+
+                        // If the future isn't already fulfilled, let the server delete it
+                        if( got == 0p ) return false;
 
                         // got == 2p: the future is ready but the context hasn't fully been consumed
@@ -347 +358 @@
                         if( got == 2p ) {
                                 while( this.ptr != 1p ) Pause();
-                        }
-                        return;
+                                got = 1p;
+                        }
+
+                        // The future is completed delete it now
+                        /* paranoid */ verify( this.ptr != 1p );
+                        free( &this );
+                        return true;
                 }
 

libcfa/src/concurrency/monitor.hfa

@@ -132 +132 @@
 
               void wait        ( condition & this, uintptr_t user_info = 0 );
+static inline bool is_empty    ( condition & this ) { return this.blocked.head == 1p; }
               bool signal      ( condition & this );
               bool signal_block( condition & this );
-static inline bool is_empty    ( condition & this ) { return this.blocked.head == 1p; }
+static inline bool signal_all  ( condition & this ) { bool ret = false; while(!is_empty(this)) { ret = signal(this) || ret; } return ret; }
          uintptr_t front       ( condition & this );