Changeset a7aea7d

Timestamp:

Jan 7, 2021, 1:17:47 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:

44e37ef

Parents:

2fc9664b

Message:

Fixed abandon function and futures and added test for it.

Files:

• libcfa/src/bits/locks.hfa (modified) (2 diffs)
• tests/concurrent/futures/.expect/abandon.txt (added)
• tests/concurrent/futures/abandon.cfa (added)

libcfa/src/bits/locks.hfa

@@ -345 +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
@@ -352 +358 @@
                         if( got == 2p ) {
                                 while( this.ptr != 1p ) Pause();
-                        }
-
+                                got = 1p;
+                        }
+
+                        // The future is completed delete it now
+                        /* paranoid */ verify( this.ptr != 1p );
                         free( &this );
-                        return;
+                        return true;
                 }