X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkBlackBox.cxx;h=ddfc3ed9576598ad5b150716c67dbec7ccafe65e;hb=1e2df7fb6ae571ce1cf72e6af1715f0e34675cbf;hp=c21285cd6b136b7e4a7a96aaf92675ed61b561fd;hpb=6575a389b71b1b85c79e4444885becb76ecf16e4;p=bbtk.git

diff --git a/kernel/src/bbtkBlackBox.cxx b/kernel/src/bbtkBlackBox.cxx
index c21285c..ddfc3ed 100644
--- a/kernel/src/bbtkBlackBox.cxx
+++ b/kernel/src/bbtkBlackBox.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkBlackBox.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/10/17 08:18:12 $
-  Version:   $Revision: 1.25 $
+  Date:      $Date: 2008/11/25 11:17:13 $
+  Version:   $Revision: 1.29 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -50,7 +50,7 @@ namespace bbtk
 
   static bool bbmgSomeBoxExecuting = false;
   static bool bbmgFreezeExecution = false;
-  static std::set<BlackBox::Pointer> bbmgExecutionList;
+  static std::set<BlackBox::WeakPointer> bbmgExecutionList;
 
   //=========================================================================
   BlackBox::Deleter::Deleter()
@@ -103,6 +103,7 @@ namespace bbtk
   BlackBox::BlackBox(const std::string &name) 
     : 
     bbmStatus(MODIFIED), 
+    bbmExecuting(false),
     bbmName(name),
     bbmBoxProcessMode("Pipeline"),
     bbmParent()
@@ -123,6 +124,7 @@ namespace bbtk
   BlackBox::BlackBox(BlackBox& from, const std::string &name) 
     :
       bbmStatus(from.bbmStatus), 
+      bbmExecuting(false),
       bbmName(name), 
       bbmBoxProcessMode(from.bbmBoxProcessMode),
       bbmParent()
@@ -155,9 +157,16 @@ namespace bbtk
   void BlackBox::bbExecute(bool force)
   {
     bbtkDebugMessageInc("process",2,
-			"=> BlackBox::bbExecute() ["
+			"=> BlackBox::bbExecute("<<(int)force<<") ["
 			<<bbGetFullName()<<"]"<<std::endl);
  
+    // If already executing : return
+    if (bbGetExecuting()) 
+      {
+	bbtkDebugMessage("process",2,
+			 " -> already executing : bailing out"<<std::endl);
+	return;
+      }
 
     // If execution frozen : return
     if (bbGlobalGetFreezeExecution()) 
@@ -334,7 +343,7 @@ namespace bbtk
   /// Copies the input / output values from another box
   void BlackBox::bbCopyIOValues(BlackBox& from)
   {
-    bbtkDebugMessageInc("Kernel",9,
+    bbtkDebugMessageInc("Kernel",1,
     			"BlackBox::bbCopyIOValues("
 			<<from.bbGetFullName()<<") ["
 			<<bbGetFullName()<<"]"<<std::endl);
@@ -346,6 +355,7 @@ namespace bbtk
       {		
 	if (! i->second->GetCopyConstruct() ) continue;
 	std::string input = i->second->GetName();
+	bbtkDebugMessage("Kernel",2,"* Copying input "<<input<<std::endl);
 	this->bbSetInput(input, from.bbGetInput(input) );
       }									
     // copies the output values
@@ -356,6 +366,7 @@ namespace bbtk
       {							
 	if (! o->second->GetCopyConstruct() ) continue;
 	std::string output = o->second->GetName();
+	bbtkDebugMessage("Kernel",2,"* Copying output "<<output<<std::endl);
 	this->bbSetOutput(output, from.bbGetOutput(output) );
       }
 
@@ -1127,22 +1138,38 @@ namespace bbtk
    }
   //=========================================================================
 
+  static bool bbmgGlobalProcessingExecutionList = false;
 
   //=========================================================================
    void BlackBox::bbGlobalProcessExecutionList()
    {   
      bbtkDebugMessageInc("process",3,
 			 "=> BlackBox::bbGlobalProcessExecutionList()"
-			 <<std::endl);     
-     
-     std::set<BlackBox::Pointer>::iterator i;
-     for (i=bbmgExecutionList.begin();
-	  i!=bbmgExecutionList.end();
-	  ++i)
+			 <<std::endl);    
+     if (bbmgGlobalProcessingExecutionList) 
        {
-	 bbtkDebugMessage("process",4,
-			  " -> Executing "<<(*i)->bbGetFullName()<<std::endl);
-	 (*i)->bbExecute(true);
+	 bbtkDebugMessage("process",3,"BlackBox::bbGlobalProcessExecutionList() reentered !");
+	 return;
+       }
+     bbmgGlobalProcessingExecutionList = true;
+
+     std::set<BlackBox::WeakPointer>::iterator i; 
+     while (bbmgExecutionList.size()>0)
+       {
+	 i = bbmgExecutionList.begin();
+	 BlackBox::WeakPointer p = *i;
+	 bbmgExecutionList.erase(i);
+	 if (p.lock())
+	   {
+	     bbtkDebugMessage("process",4,
+			      " -> Executing "<<
+			      p.lock()->bbGetFullName()<<std::endl);
+	     p.lock()->bbExecute(true);
+	   }
+	 else 
+	   {
+	     bbtkGlobalError("Strange error in BlackBox::bbGlobalProcessExecutionList() : Weak bb pointer in bbmgExecutionList is no more valid...");
+	   }
        }
      
      bbmgExecutionList.clear();
@@ -1150,6 +1177,7 @@ namespace bbtk
 			 "<= BlackBox::bbGlobalProcessExecutionList()"
 			 <<std::endl);     
      
+     bbmgGlobalProcessingExecutionList = false;
      
    }
   //=========================================================================
@@ -1175,9 +1203,14 @@ namespace bbtk
 	}
 
   void BlackBox::bbGlobalAddToExecutionList( BlackBox::Pointer b )
-	{  
-		bbmgExecutionList.insert(b); 
-	} 
+  {  
+    bbtkDebugMessage("process",3,"* bbGlobalAddToExecutionList("<<b->bbGetFullName()<<")"<<std::endl);
+    if (bbmgGlobalProcessingExecutionList) 
+      {
+	bbtkDebugMessage("process",3,"bbGlobalAddToExecutionList called inside bbGlobalProcessExecutionList !");
+      }
+    bbmgExecutionList.insert(b); 
+  } 
 
 
    //=========================================================================