bbtkPackage.cxx

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

diff --git a/kernel/src/bbtkPackage.cxx b/kernel/src/bbtkPackage.cxx
index 5f72953fa743ddc5492f287f296f5be8c2f7c1db..2a1fc8d3772fdf05e8f6aa4c535c05eb6a6e9ddb 100644 (file)
--- a/kernel/src/bbtkPackage.cxx
+++ b/kernel/src/bbtkPackage.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkPackage.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/01/13 08:45:27 $
-  Version:   $Revision: 1.24 $
+  Date:      $Date: 2009/05/28 12:18:51 $
+  Version:   $Revision: 1.28 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -34,6 +34,7 @@
  *\brief Class bbtk::Package : registers black boxes descriptors and is able to create instances of the black boxes registered.
  */
 #include "bbtkPackage.h"
+#include "bbtkComplexBlackBoxDescriptor.h"
 #include "bbtkMessageManager.h"
 #include "bbtkConfigurationFile.h"
 #include <fstream>
@@ -77,7 +78,7 @@ namespace bbtk
     mDescription(description),
     mVersion(version)
   {
-    bbtkDebugMessage("object",2,"==> Package::Package('"<<name<<"',...)"
+    bbtkDebugMessage("object",2,"==> Package('"<<name<<"',...)"
                     <<bbtkendl);
     std::string default_doc_dir = ConfigurationFile::GetInstance().Get_default_temp_dir();
     char c = default_doc_dir.c_str()[strlen(default_doc_dir.c_str())-1];
@@ -111,59 +112,55 @@ namespace bbtk
   /// Dtor
   Package::~Package()
   {
-    bbtkDebugMessage("object",2,"==> Package::~Package(\""<<mName<<"\")"<<bbtkendl);
-    bbtkDebugMessage("object",2,"<== Package::~Package(\""<<mName<<"\")"<<bbtkendl);
+    bbtkDebugMessage("object",2,"==> ~Package(\""<<mName<<"\")"<<bbtkendl);
   }
   //==========================================================================
 
 
   //==========================================================================
-  void PackageReleaseBlackBoxDescriptorInternal(Package::WeakPointer pack,
-                                               const std::string& descname)
-  {
-    // Try to release descriptor
-    std::string packname = pack.lock()->GetName();
-
-    bbtkDebugMessage("package",5,"--- Releasing descriptor '"
-                    <<packname<<"::"<<descname<<"'"<<bbtkendl);
-
-
-    Package::BlackBoxMapType::iterator desc = 
-      pack.lock()->GetBlackBoxMap().find(descname);
-    if (desc ==  pack.lock()->GetBlackBoxMap().end())
-      {
-       bbtkDebugMessage("package",5,
-                        "    Descriptor has already been released"
-                        <<bbtkendl);
-       return;
-      }
-    //    bbtkDebugMessage("package",3,
-    //              "    Trying unreferencing it ... "<<std::endl);
-    BlackBoxDescriptor::WeakPointer pdesc = desc->second;
-    desc->second.reset();
-    // if it is dead : remove it 
-    if (pdesc.expired()) 
-      {
-       bbtkDebugMessage("package",2," ==> '"<<packname<<"::"<<descname<<"' Descriptor expired"<<bbtkendl);
-       if (pack.expired()) 
+         void PackageReleaseBlackBoxDescriptorInternal(Package::WeakPointer pack,
+                                                       const std::string& descname)
          {
-           bbtkDebugMessage("package",2,
-                            "     ... and caused its package death"
-                            <<bbtkendl);
-           return;
+               // Try to release descriptor
+               std::string packname = pack.lock()->GetName();
+
+               bbtkDebugMessage("package",5,"--- Releasing descriptor '"
+                                <<packname<<"::"<<descname<<"'"<<bbtkendl);
+
+
+               Package::BlackBoxMapType::iterator desc = 
+                 pack.lock()->GetBlackBoxMap().find(descname);
+               if (desc ==  pack.lock()->GetBlackBoxMap().end())
+                 {
+               bbtkDebugMessage("package",5,
+                                "    Descriptor has already been released"
+                                <<bbtkendl);
+               return;
+                 }
+               //    bbtkDebugMessage("package",3,
+               //                   "    Trying unreferencing it ... "<<std::endl);
+               BlackBoxDescriptor::WeakPointer pdesc = desc->second;
+               desc->second.reset();
+               // if it is dead : remove it 
+               if (pdesc.expired()) 
+               {
+                 bbtkDebugMessage("package",2," ==> '"<<packname<<"::"<<descname<<"' Descriptor expired"<<bbtkendl);
+                 if (pack.expired()) 
+                 {
+                       bbtkDebugMessage("package",2,
+                                        "     ... and caused its package death"
+                                        <<bbtkendl);
+                       return;
+                 } // pack.expired
+                 desc = pack.lock()->GetBlackBoxMap().find(descname);
+                 if (desc !=  pack.lock()->GetBlackBoxMap().end())       pack.lock()->GetBlackBoxMap().erase(desc);
+               }   else    {  //pdesc.expired
+                    bbtkDebugMessage("package",5,"    ... Descriptor still alive ("
+                                <<pdesc.use_count()<<" refs)"
+                                <<bbtkendl);
+                    pack.lock()->GetBlackBoxMap()[descname] = pdesc.lock();
+               } // pdesc.expired
          }
-       desc = pack.lock()->GetBlackBoxMap().find(descname);
-       if (desc !=  pack.lock()->GetBlackBoxMap().end())
-         pack.lock()->GetBlackBoxMap().erase(desc);
-      }
-    else 
-      {
-       bbtkDebugMessage("package",5,"    ... Descriptor still alive ("
-                        <<pdesc.use_count()<<" refs)"
-                        <<bbtkendl);
-       pack.lock()->GetBlackBoxMap()[descname] = pdesc.lock();
-      }
-  }
   //==========================================================================
 
 
@@ -231,8 +228,14 @@ namespace bbtk
                break;
              }
            
-           PackageReleaseBlackBoxDescriptorInternal(pack,*descname);
-           
+#if defined(MACOSX)
+                 BlackBoxDescriptor::Pointer desc = pack.lock()->mBlackBoxMap[*descname];
+                 if ( (dyn==0) || (boost::dynamic_pointer_cast<ComplexBlackBoxDescriptor>(desc)) )
+                         PackageReleaseBlackBoxDescriptorInternal(pack,*descname);
+#else
+                 PackageReleaseBlackBoxDescriptorInternal(pack,*descname);
+#endif
+
          }
 
        //
@@ -302,7 +305,13 @@ namespace bbtk
     //  and descallocated (reset) by PACKAGENAMEDeletePackage())
     if (nrefs == ndesc + dyn) 
       {
-       PackageReleaseBlackBoxDescriptorInternal(pack,dname);
+#if defined(MACOSX)
+                 //
+                 if (dyn==0)
+                         PackageReleaseBlackBoxDescriptorInternal(pack,dname);
+#else
+                 PackageReleaseBlackBoxDescriptorInternal(pack,dname);
+#endif 
       }
     
     // If the package is released and dynamically loaded 
@@ -353,8 +362,9 @@ namespace bbtk
 
     // Open shared lib
     void *handler;
-    handler = dlopen(libname.c_str(),
-                    BBTK_RTLD_TIME | BBTK_RTLD_SCOPE );
+    handler = dlopen(libname.c_str(), BBTK_RTLD_TIME | BBTK_RTLD_SCOPE );
+//EED     handler = dlopen(libname.c_str(), RTLD_LAZY | RTLD_LOCAL );
+         
     if (!handler)
       {
        bbtkMessage("package",2,
@@ -624,12 +634,17 @@ namespace bbtk
     bbtkDebugMessage("package",5,"==> Package::UnLoadReleasedDynamicallyLoadedPackages()"<<std::endl);
 
     std::set<Package::WeakPointer>::iterator i;
-    for (i=mReleasedDynamicallyLoadedPackages.begin();
-        i!=mReleasedDynamicallyLoadedPackages.end();
-        ++i)
-      {
-       if (!i->expired()) UnLoad(*i);
-      }
+
+//JCP- 21-04-09
+       if(mReleasedDynamicallyLoadedPackages.size()>0){
+               for (i=mReleasedDynamicallyLoadedPackages.begin();
+               i!=mReleasedDynamicallyLoadedPackages.end();
+               ++i)
+               {
+               if (!i->expired()) UnLoad(*i);
+               }
+       }
+//JCP- 21-04-09
     bbtkDebugMessage("package",5,"<== Package::UnLoadReleasedDynamicallyLoadedPackages()"<<std::endl);
   }
   //==========================================================================
@@ -649,7 +664,13 @@ namespace bbtk
     
     // closes the dl handler
 #if defined(__GNUC__)  
-    dlclose(h);  
+         if (dlclose(h)!=0)
+         {
+                 printf("EED Package::UnLoad ERROR %s\n", packname.c_str() );
+                 bbtkWarning("Failed to close dynamic library for package '"<<packname
+                                         <<"'"<<std::endl);
+         }  
+         
 #elif defined(_WIN32)
     FreeLibrary(h);
 #endif