Text archives Help

---

Author: abe
Date: Tue Aug 30 10:57:41 2005
New Revision: 515

Modified:
   branches/AFR/Engine/Control/AFRPipeline.cc
Log:
Small change re: deadlock problem, there are probably other bad cases

Modified: branches/AFR/Engine/Control/AFRPipeline.cc
==============================================================================
--- branches/AFR/Engine/Control/AFRPipeline.cc  (original)
+++ branches/AFR/Engine/Control/AFRPipeline.cc  Tue Aug 30 10:57:41 2005
@@ -284,7 +284,8 @@
 {
   static bool changed = true;
   static bool firstFrame = true;
-  static bool wait_for_transactions = false;
+
+  bool wait_for_transactions = false;
   
 
   Real last_display_time = 0.0;
@@ -329,9 +330,8 @@
     if ( transactions.size() || pipelineNeedsSetup || firstFrame ) {
     
       // Re sync after state changes.
-      if (proc == 0) {
-        wait_for_transactions = true;
-      }
+      wait_for_transactions = true;
+      
     
       outer_loop_barrier.wait( workersRendering );
                
@@ -384,12 +384,15 @@
       // Reset barrier conditions.
       if (proc == 0) {
         pipelineNeedsSetup = false;
-        wait_for_transactions = false;
+        
         changed = false;
       }
+
+      wait_for_transactions = false;
       
                        // Wait for all of the other processors to finish 
setup.
-                       pipeline_setup_barrier.wait(numProcs);
+                       // pipeline_setup_barrier.wait(numProcs);
+      outer_loop_barrier.wait(numProcs);
                }
     
                

---

• [MANTA] r515 - branches/AFR/Engine/Control, abe, 08/30/2005

---

Archive powered by MHonArc 2.6.16.