Global factory in course of removal... does not compile but have to commit to continu...

[bbtk.git] / kernel / src / bbtkFactory.cxx

diff --git a/kernel/src/bbtkFactory.cxx b/kernel/src/bbtkFactory.cxx
index 74d515ded67b1fb1106fe203631eac73c8eeba44..5e9c395b9ff66c5119043a2c7c6105a4e4427c08 100644 (file)
--- a/kernel/src/bbtkFactory.cxx
+++ b/kernel/src/bbtkFactory.cxx
@@ -4,8 +4,8 @@ Program:   bbtk
 Module:    $RCSfile: bbtkFactory.cxx,v $
 Language:  C++
 
-Date:      $Date: 2008/03/04 08:09:04 $
-Version:   $Revision: 1.26 $
+Date:      $Date: 2008/03/07 08:40:14 $
+Version:   $Revision: 1.27 $
                                                                                 
 
 Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
@@ -37,20 +37,6 @@ PURPOSE.  See the above copyright notices for more information.
 
 #include <cctype>    // std::toupper
 
-// was in gdcm ...
-/*
-#ifdef _MSC_VER
-#   define getcwd _getcwd
-#endif
-
-#if defined(_MSC_VER) || defined(__BORLANDC__)
-#   include <direct.h>
-#else
-#   include <unistd.h>
-#endif
-
-*/
-
 
 namespace bbtk
 {
@@ -61,6 +47,7 @@ namespace bbtk
   //===================================================================
   /// Default ctor
   Factory::Factory()
+    : mExecuter(0)
   {
     bbtkDebugMessage("Kernel",7,"Factory::Factory()"<<std::endl);
   }
@@ -202,8 +189,6 @@ namespace bbtk
     // Invokes the accessor to the PackageUnit pointer
     pack.mPackage = ((PackageAccessor)getpack)();
     
-    mPackageMap[pkgname] = pack;
-    
     // Test bbtk build version ok
     if ( pack.mPackage->GetBBTKVersion() != bbtk::GetVersion() )
       {
@@ -215,6 +200,9 @@ namespace bbtk
                  << " whereas application build with version "
                  << bbtk::GetVersion());
       }
+
+    pack.mPackage->AddFactory(this);
+    mPackageMap[pkgname] = pack;
     
     std::string separator =
       ConfigurationFile::GetInstance().Get_file_separator ();
@@ -444,71 +432,85 @@ namespace bbtk
 
   //===================================================================
   /// \brief Close the package referenced by the iterator 
-  ///
-  /// If it is a dynamically loaded package 
-  /// - Loads and calls the function "<name>DeletePackage" of the dynamic library (responsible for package desallocation)
-  /// - Closes the dynamic library
-  /// - Erases the package entry in the packages map
-  ///
-  /// Else simply erases the package entry in the packages map
-  void Factory::ClosePackage(PackageMapType::iterator& i) 
+ ///
+ /// First removes the factory from the set of factories which use the package
+ /// If the set is empty then :
+ /// If it is a dynamically loaded package :
+ /// - Loads and calls the function "<name>DeletePackage" of the dynamic library (responsible for package desallocation)
+ /// - Closes the dynamic library
+ /// Else :
+ /// - deletes the package normally
+ /// 
+ /// Finally erases the package entry in the packages map
+ void Factory::ClosePackage(PackageMapType::iterator& i) 
   {   
      bbtkDebugMessageInc("Kernel",7,"Factory::ClosePackage(\""
                          <<i->second.mPackage->GetName()
                         <<"\")"<<std::endl);
 
-     if (i->second.mDynamicLibraryHandler) 
-     {
- 
-      // If it is a dynamically loaded package
-      // Loads the Package delete function
-
-        std::string delfname(i->second.mPackage->GetName());
-        delfname += "DeletePackage";
+     
+     // Removes this from the set of factories which use the package
+     i->second.mPackage->RemoveFactory(this);
+     
+     // If no more factory which use it 
+     if (i->second.mPackage->GetFactorySet().empty())
+       {
+        // If it is a dynamically loaded package       
+        if (i->second.mDynamicLibraryHandler) 
+          {
+            
+            
+            // Loads the Package delete function
+            
+            std::string delfname(i->second.mPackage->GetName());
+            delfname += "DeletePackage";
 #if defined(__GNUC__)     
-        void *delf = dlsym(i->second.mDynamicLibraryHandler, delfname.c_str());
-        if (!delf)
-        {
-           bbtkError("could not close package \""
-                     <<i->second.mPackage->GetName()
-                     <<"\" :"<<dlerror());
-        }    
+            void *delf = dlsym(i->second.mDynamicLibraryHandler, delfname.c_str());
+            if (!delf)
+              {
+                bbtkError("could not close package \""
+                          <<i->second.mPackage->GetName()
+                          <<"\" :"<<dlerror());
+              }    
 #elif defined(_WIN32)
-   void *delf = GetProcAddress(i->second.mDynamicLibraryHandler, 
-                                 delfname.c_str());
-     if (!delf)
-     {  
-       bbtkError("could not close package \""
-                <<i->second.mPackage->GetName()
-                <<"\" : "<<delfname
-                <<" symbol not found (how did you open it ???");
-               //<<"\" :"<<dlerror());
-     }    
+            void *delf = GetProcAddress(i->second.mDynamicLibraryHandler, 
+                                        delfname.c_str());
+            if (!delf)
+              {  
+                bbtkError("could not close package \""
+                          <<i->second.mPackage->GetName()
+                          <<"\" : "<<delfname
+                          <<" symbol not found (how did you open it ???");
+                //<<"\" :"<<dlerror());
+              }    
 #endif     
-
-   // deletes the package
-   ((PackageDeleteFunction)delf)();
-
-   // closes the dl handler
+            
+            // deletes the package
+            ((PackageDeleteFunction)delf)();
+            
+            // closes the dl handler
 #if defined(__GNUC__)  
-    dlclose(i->second.mDynamicLibraryHandler);  
+            dlclose(i->second.mDynamicLibraryHandler);  
 #elif defined(_WIN32)
-
-    FreeLibrary(i->second.mDynamicLibraryHandler);
+            
+            FreeLibrary(i->second.mDynamicLibraryHandler);
 #endif
-    }
-    else 
-    {  
-       // If it is a manually inserted package 
-       delete i->second.mPackage;
-    }
+          }
 
-    // remove the entry in the map
-    mPackageMap.erase(i);
-    bbtkDebugDecTab("Kernel",7);
- }
-  //===================================================================
+        else 
+          {  
+            // If it is a manually inserted package : delete it normally
+            delete i->second.mPackage;
+          }
+       }
+     
+     // in any cases remove the entry in the map
+     mPackageMap.erase(i);
 
+     bbtkDebugDecTab("Kernel",7);
+  }
+  //===================================================================
+  
 
 
   //===================================================================  
@@ -614,12 +616,12 @@ namespace bbtk
     bbtkDebugMessageInc("Kernel",9,"Factory::InsertPackage(\""<<
                         p->GetName()<<"\")"<<std::endl);
 
+    p->AddFactory(this);
     PackageInfoType pack;
     pack.mDynamicLibraryHandler = 0;
-    
     pack.mPackage = p;
-
     mPackageMap[p->GetName()] = pack;
+
     bbtkDebugDecTab("Kernel",9);
   }
   //===================================================================
@@ -639,12 +641,12 @@ namespace bbtk
     
     if (i!=mPackageMap.end())
       {
-      ClosePackage(i);
+       ClosePackage(i);
       }
     else 
       {
-      bbtkError("Factory::RemovePackage(\""<<
-                 p->GetName()<<"\") : package absent from factory");
+       bbtkError("Factory::RemovePackage(\""<<
+                 p->GetName()<<"\") : package absent from factory");
       }
 
     bbtkDebugDecTab("Kernel",9);