Changes in src/Concurrency/Waituntil.cpp [fc0996a:c86b08d]

File:

• src/Concurrency/Waituntil.cpp (modified) (11 diffs)

src/Concurrency/Waituntil.cpp

@@ -14 +14 @@
 //
 
+#include <string>
+
 #include "Waituntil.hpp"
-
-#include <string>
-
-#include "AST/Copy.hpp"
 #include "AST/Expr.hpp"
 #include "AST/Pass.hpp"
@@ -95 +93 @@
                         case 0:
                             try {
-                                    on_selected( A, clause1 );
+                                if (on_selected( A, clause1 ))
                                     doA();
                             }
@@ -122 +120 @@
         // the unregister and on_selected calls are needed to support primitives where the acquire has side effects
         // so the corresponding block MUST be run for those primitives to not lose state (example is channels)
-        if ( !has_run(clause_statuses[0]) && whenA && unregister_select(A, clause1) )
-            on_selected( A, clause1 )
+        if ( ! has_run(clause_statuses[0]) && whenA && unregister_select(A, clause1) && on_selected( A, clause1 ) )
             doA(); 
         ... repeat if above for B and C ...
@@ -620 +617 @@
 
 // Generates:
-/* on_selected( target_1, node_1 ); ... corresponding body of target_1 ... 
+/* if ( on_selected( target_1, node_1 )) ... corresponding body of target_1 ... 
 */
 CompoundStmt * GenerateWaitUntilCore::genStmtBlock( const WhenClause * clause, const ClauseData * data ) {
@@ -626 +623 @@
     return new CompoundStmt( cLoc,
         {
-            new ExprStmt( cLoc,
-                genSelectTraitCall( clause, data, "on_selected" )
-            ),
-            ast::deepCopy( clause->stmt )
+            new IfStmt( cLoc,
+                genSelectTraitCall( clause, data, "on_selected" ),
+                new CompoundStmt( cLoc,
+                    {
+                        ast::deepCopy( clause->stmt )
+                    }
+                )
+            )
         }
     );
@@ -641 +642 @@
             case 0:
                 try {
-                    on_selected( target1, clause1 );
-                    dotarget1stmt();
+                    if (on_selected( target1, clause1 ))
+                        dotarget1stmt();
                 }
                 finally { clause_statuses[i] = __SELECT_RUN; unregister_select(target1, clause1); }
@@ -661 +662 @@
         case 0:
             try {
-                on_selected( target1, clause1 );
-                dotarget1stmt();
+                if (on_selected( target1, clause1 ))
+                    dotarget1stmt();
             }
             finally { clause_statuses[i] = __SELECT_RUN; unregister_select(target1, clause1); }
@@ -937 +938 @@
         }
 
+    // C_TODO: will remove this commented code later. Currently it isn't needed but may switch to a modified version of this later if it has better performance
+    // std::vector<ptr<CaseClause>> switchCases;
+
+    // int idx = 0;
+    // for ( const auto & clause: stmt->clauses ) {
+    //     const CodeLocation & cLoc = clause->location;
+    //     switchCases.push_back(
+    //         new CaseClause( cLoc,
+    //             new CastExpr( cLoc, 
+    //                 new AddressExpr( cLoc, new NameExpr( cLoc, data.at(idx)->targetName ) ),
+    //                 new BasicType( BasicType::Kind::LongUnsignedInt ), GeneratedFlag::ExplicitCast 
+    //             ),
+    //             {
+    //                 new CompoundStmt( cLoc,
+    //                     {
+    //                         ast::deepCopy( clause->stmt ),
+    //                         new BranchStmt( cLoc, BranchStmt::Kind::Break, Label( cLoc ) )
+    //                     }
+    //                 )
+    //             }
+    //         )
+    //     );
+    //     idx++;
+    // }
+
     return new CompoundStmt( loc,
         {
             new ExprStmt( loc, new UntypedExpr( loc, new NameExpr( loc, "park" ) ) ),
             outerIf
+            // new SwitchStmt( loc,
+            //     new NameExpr( loc, statusName ),
+            //     std::move( switchCases )
+            // )
         }
     );
@@ -983 +1013 @@
     const CodeLocation & cLoc = stmt->clauses.at(idx)->location;
 
-    Expr * baseCond = genSelectTraitCall( stmt->clauses.at(idx), data.at(idx), "register_select" );
     Expr * ifCond;
 
@@ -994 +1023 @@
             ),
             new CastExpr( cLoc,
-                baseCond,
+                genSelectTraitCall( stmt->clauses.at(idx), data.at(idx), "register_select" ),
                 new BasicType( BasicType::Kind::Bool ), GeneratedFlag::ExplicitCast 
             ),
             LogicalFlag::AndExpr
         );
-    } else ifCond = baseCond;
+    } else ifCond = genSelectTraitCall( stmt->clauses.at(idx), data.at(idx), "register_select" );
 
     return new CompoundStmt( cLoc,
@@ -1017 +1046 @@
                 ifCond,
                 genStmtBlock( stmt->clauses.at(idx), data.at(idx) ),
+                // ast::deepCopy( stmt->clauses.at(idx)->stmt ),
                 recursiveOrIfGen( stmt, data, idx + 1, elseWhenName )
             )