Changeset 49510db for libcfa/src/concurrency/future.hfa

Timestamp:

Jan 29, 2025, 9:09:20 AM (8 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

a22e8b4

Parents:

a950021 (diff), c699602 (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/concurrency/future.hfa (modified) (4 diffs)

libcfa/src/concurrency/future.hfa

@@ -9 +9 @@
 // Author           : Thierry Delisle & Peiran Hong & Colby Parsons
 // Created On       : Wed Jan 06 17:33:18 2021
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Nov 29 16:07:34 2024
-// Update Count     : 30
+// Last Modified By : Kyoung Seo
+// Last Modified On : Mon Jan 27 20:35:00 2025
+// Update Count     : 3
 //
 
@@ -260 +260 @@
                         if( this.has_first != false) abort("Attempting to reset a multi_future with at least one blocked threads");
                         if( !is_empty(this.blocked) ) abort("Attempting to reset a multi_future with multiple blocked threads");
-                        reset( (future_t&)this );
+                        reset( (future_t&)*(future_t*)((uintptr_t)&this + sizeof(monitor$)) );
                 }
 
@@ -266 +266 @@
                 bool fulfil( multi_future(T) & this, T result ) {
                         this.result = result;
-                        return fulfil( (future_t&)this ) != 0p;
+                        return fulfil( (future_t&)*(future_t*)((uintptr_t)&this + sizeof(monitor$)) ) != 0p;
                 }
 
@@ -275 +275 @@
                         bool w = !sw;
                         if ( sw ) {
-                                w = wait( (future_t&)this );
+                                w = wait( (future_t&)*(future_t*)((uintptr_t)&this + sizeof(monitor$)) );
                                 $first_done( this );
                         }