Changeset 342af53 for libcfa/src/bits/locks.hfa

Timestamp:

Jan 14, 2021, 12:23:14 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

8e4aa05

Parents:

4468a70 (diff), ec19b21 (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

File:

• libcfa/src/bits/locks.hfa (modified) (3 diffs)

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;
                 }