*** MAJOR CHANGE *** NOT WORKING YET !!!

[bbtk.git] / kernel / src / bbtkAtomicBlackBoxMacros.h

diff --git a/kernel/src/bbtkAtomicBlackBoxMacros.h b/kernel/src/bbtkAtomicBlackBoxMacros.h
index 9bc56ad02c3d59b53d957fe7adcfc962f93700b1..aa70474fbb3b0f0682d9f5b98485c3fec7718e74 100644 (file)
--- a/kernel/src/bbtkAtomicBlackBoxMacros.h
+++ b/kernel/src/bbtkAtomicBlackBoxMacros.h
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkAtomicBlackBoxMacros.h,v $
   Language:  C++
-  Date:      $Date: 2009/04/30 14:31:30 $
-  Version:   $Revision: 1.15 $
+  Date:      $Date: 2009/05/14 14:43:33 $
+  Version:   $Revision: 1.16 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -53,13 +53,18 @@
   { return std::string(#CLASS)+std::string(" '")                       \
       +bbGetNameWithParent()+std::string("'"); }                       \
   virtual void bbLockDescriptor();                                     \
-  virtual void bbConstructor() {                                       \
-    PARENT::bbConstructor();                                           \
-    CLASS::bbUserConstructor();                                                \
+  virtual void bbUserSetDefaultValues();                               \
+  virtual void bbUserInitializeProcessing();                           \
+  virtual void bbUserFinalizeProcessing();                             \
+  virtual void bbRecursiveInitializeProcessing()                       \
+  {                                                                    \
+    PARENT::bbRecursiveInitializeProcessing();                         \
+    CLASS::bbUserInitializeProcessing();                               \
   }                                                                    \
-  virtual void bbDestructor() {                                                \
-    PARENT::bbDestructor();                                            \
-    CLASS::bbUserDestructor();                                         \
+  virtual void bbRecursiveFinalizeProcessing()                         \
+  {                                                                    \
+    CLASS::bbUserFinalizeProcessing();                                 \
+    PARENT::bbRecursiveFinalizeProcessing();                           \
   }                                                                    \
   private:                                                             \
   CLASS() : PARENT("") {}                                              \
@@ -101,13 +106,18 @@
     return p;                                                          \
   }                                                                    \
   virtual void bbLockDescriptor();                                     \
-  virtual void bbConstructor() {                                       \
-    PARENT::bbConstructor();                                           \
-    CLASS::bbUserConstructor();                                                \
+  virtual void bbUserSetDefaultValues();                               \
+  virtual void bbUserInitializeProcessing();                           \
+  virtual void bbUserFinalizeProcessing();                             \
+  virtual void bbRecursiveInitializeProcessing()                       \
+  {                                                                    \
+    PARENT::bbRecursiveInitializeProcessing();                         \
+    CLASS::bbUserInitializeProcessing();                               \
   }                                                                    \
-  virtual void bbDestructor() {                                                \
-    PARENT::bbDestructor();                                            \
-    CLASS::bbUserDestructor();                                         \
+  virtual void bbRecursiveFinalizeProcessing()                         \
+  {                                                                    \
+    CLASS::bbUserFinalizeProcessing();                                 \
+    PARENT::bbRecursiveFinalizeProcessing();                           \
   }                                                                    \
   private:                                                             \
   CLASS() : PARENT("") {}                                              \
@@ -199,7 +209,8 @@
     {                                                                  \
       bbLockDescriptor();                                              \
       bbAllocateConnectors();                                          \
-    }
+    }                                                                  
+
 //============================================================================
 
 //============================================================================
@@ -217,21 +228,26 @@
     {                                                                  \
       bbLockDescriptor();                                              \
       bbAllocateConnectors();                                          \
-      bbCopyIOValues(FROM);                                            \
-   }
+    }
 //============================================================================
 
 //============================================================================
-#define BBTK_END_BLACK_BOX_COPY_CONSTRUCTOR(CLASS,FROM)                        \
+#define BBTK_END_BLACK_BOX_COPY_CONSTRUCTOR(CLASS,FROM,ALLOC)          \
   bbtkDebugMessage("object",2,"<== "<<#CLASS<<"::"<<#CLASS             \
                   <<"("<<FROM.bbGetFullName()<<",\""                   \
-                  <<bbGetName()<<"\")"<<std::endl);            
+                  <<bbGetName()<<"\")"<<std::endl);                    \
+  if (ALLOC)                                                           \
+    {                                                                  \
+      bbCopyIOValues(FROM);                                            \
+    }
 //============================================================================
 
 //============================================================================
 #define BBTK_BEGIN_BLACK_BOX_DESTRUCTOR(CLASS)                         \
   bbtkDebugMessage("object",2,"==> "<<#CLASS <<"::~"<< #CLASS          \
-                  <<"() ["<<this->bbGetFullName()<<"]"<<std::endl);
+                  <<"() ["<<this->bbGetFullName()<<"]"<<std::endl);    
+
+
 //============================================================================
 
 //============================================================================
@@ -249,7 +265,7 @@
     : PARENT(name,false)                                               \
   {                                                                    \
     BBTK_BEGIN_BLACK_BOX_CONSTRUCTOR(CLASS,allocate_connectors);       \
-    /*CLASS::bbUserConstructor();      */                              \
+    CLASS::bbUserSetDefaultValues();                                           \
     BBTK_END_BLACK_BOX_CONSTRUCTOR(CLASS);                             \
   }                                                                    \
   CLASS::CLASS(CLASS& from,                                            \
@@ -257,13 +273,13 @@
     : PARENT(from,name,false)                                          \
   {                                                                    \
     BBTK_BEGIN_BLACK_BOX_COPY_CONSTRUCTOR(CLASS,from,allocate_connectors); \
-    /*CLASS::bbUserCopyConstructor(from.GetThisPointer<bbtk::BlackBox>());*/ \
-    BBTK_END_BLACK_BOX_COPY_CONSTRUCTOR(CLASS,from);                   \
+    CLASS::bbUserSetDefaultValues();                                           \
+    BBTK_END_BLACK_BOX_COPY_CONSTRUCTOR(CLASS,from,allocate_connectors);                       \
   }                                                                    \
   CLASS::~CLASS()                                                      \
   {                                                                    \
     BBTK_BEGIN_BLACK_BOX_DESTRUCTOR(CLASS);                            \
-    /*CLASS::bbUserDestructor();*/                                     \
+    CLASS::bbUserFinalizeProcessing();                                 \
     BBTK_END_BLACK_BOX_DESTRUCTOR(CLASS);                              \
   }                                                                    \
   void CLASS::bbLockDescriptor()                                       \
@@ -536,7 +552,7 @@
     : PARENT(name,false)                                               \
   {                                                                    \
     BBTK_BEGIN_BLACK_BOX_CONSTRUCTOR(CLASS,alloc);                     \
-    /*CLASS<T>::bbUserConstructor();*/                                 \
+    CLASS<T>::bbUserSetDefaultValues();                                        \
     BBTK_END_BLACK_BOX_CONSTRUCTOR(CLASS);                             \
   }                                                                    \
   template <class T>                                                   \
@@ -545,14 +561,14 @@
     : PARENT(from,name,false)                                          \
   {                                                                    \
     BBTK_BEGIN_BLACK_BOX_COPY_CONSTRUCTOR(CLASS,from,allocate_connectors); \
-    /*CLASS<T>::bbUserCopyConstructor(from.GetThisPointer<bbtk::BlackBox>());*/ \
-    BBTK_END_BLACK_BOX_COPY_CONSTRUCTOR(CLASS,from);                   \
+    CLASS<T>::bbUserSetDefaultValues();                                        \
+    BBTK_END_BLACK_BOX_COPY_CONSTRUCTOR(CLASS,from,allocate_connectors);                       \
   }                                                                    \
   template <class T>                                                   \
   CLASS<T>::~CLASS()                                                   \
   {                                                                    \
     BBTK_BEGIN_BLACK_BOX_DESTRUCTOR(CLASS);                            \
-    /*CLASS<T>::bbUserDestructor();*/                                  \
+    CLASS<T>::bbFinalizeProcessing();                                  \
     BBTK_END_BLACK_BOX_DESTRUCTOR(CLASS);                              \
   }                                                                    \
   template <class T>                                                   \
@@ -711,7 +727,7 @@
     : PARENT(name,false)                                               \
   {                                                                    \
     BBTK_BEGIN_BLACK_BOX_CONSTRUCTOR(CLASS,alloc);                     \
-    /*CLASS<T1,T2>::bbUserConstructor();*/                             \
+    CLASS<T1,T2>::bbUserSetDefaultValues();                            \
     BBTK_END_BLACK_BOX_CONSTRUCTOR(CLASS);                             \
   }                                                                    \
   template <class T1, class T2>                                                \
@@ -720,14 +736,14 @@
     : PARENT(from,name,false)                                          \
   {                                                                    \
     BBTK_BEGIN_BLACK_BOX_COPY_CONSTRUCTOR(CLASS,from,allocate_connectors); \
-    /*CLASS<T1,T2>::bbUserCopyConstructor(from.GetThisPointer<bbtk::BlackBox>());*/ \
-    BBTK_END_BLACK_BOX_COPY_CONSTRUCTOR(CLASS,from);                   \
+    CLASS<T1,T2>::bbUserSetDefaultValues();                            \
+    BBTK_END_BLACK_BOX_COPY_CONSTRUCTOR(CLASS,from,allocate_connectors);                       \
   }                                                                    \
   template <class T1, class T2>                                                \
   CLASS<T1,T2>::~CLASS()                                               \
   {                                                                    \
     BBTK_BEGIN_BLACK_BOX_DESTRUCTOR(CLASS);                            \
-    /*CLASS<T1,T2>::bbUserDestructor();*/                              \
+    CLASS<T1,T2>::bbFinalizeProcessing();                              \
     BBTK_END_BLACK_BOX_DESTRUCTOR(CLASS);                              \
   }                                                                    \
   template <class T1, class T2>                                                \