Changeset c3d0182a

Timestamp:

Jan 27, 2025, 9:23:35 PM (42 hours ago)

Author:

kyoung <lseo@…>

Branches:

master

Children:

2e0bb92, 71ca5b9

Parents:

11f92fac

git-author:

kyoung <lseo@…> (01/27/25 14:34:28)

git-committer:

kyoung <lseo@…> (01/27/25 21:23:35)

Message:

plan9 inline ordering for concurrency keywords.

Files:

• libcfa/src/concurrency/future.hfa (modified) (4 diffs)
• libcfa/src/concurrency/pthread.cfa (modified) (2 diffs)
• src/Concurrency/Keywords.cpp (modified) (2 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&)*(&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&)*(&this+sizeof(monitor$)) ) != 0p;
                 }
 
@@ -275 +275 @@
                         bool w = !sw;
                         if ( sw ) {
-                                w = wait( (future_t&)this );
+                                w = wait( (future_t&)*(&this+sizeof(monitor$)) );
                                 $first_done( this );
                         }

libcfa/src/concurrency/pthread.cfa

@@ -9 +9 @@
 // Author           : Zhenyan Zhu
 // Created On       : Sat Aug 6 16:29:18 2022
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Sep  4 15:37:51 2023
+// Last Modified By : Kyoung Seo
+// Last Modified On : Mon Jan 27 20:35:00 2025
 // Update Count     : 1
 //
@@ -392 +392 @@
 
         pthread_t pthread_self(void) libcfa_public __THROW {
-                return (pthread_t)((uintptr_t)active_thread() - (sizeof(cfaPthread) - sizeof(thread$)));
+                return (pthread_t)((uintptr_t)active_thread());
         }
 

src/Concurrency/Keywords.cpp

@@ -10 +10 @@
 // Created On       : Tue Nov 16  9:53:00 2021
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Jan 26 15:16:16 2025
-// Update Count     : 15
+// Last Modified On : Fri Jan 24 18:33:02 2025
+// Update Count     : 14
 //
 
@@ -534 +534 @@
         auto mutDecl = ast::mutate( decl );
         // Insert at start of special aggregate structures => front of vector
-        //mutDecl->members.insert( mutDecl->members.begin(), field );
-        mutDecl->members.push_back( field );
+        mutDecl->members.insert( mutDecl->members.begin(), field );
 
         return {mutDecl, field};