Changes in libcfa/src/bits/locks.hfa [6d1790c:a7aea7d]

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