X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkPackage.cxx;h=29cd1dc4463af4836125e11c4a50efb44bc0d60c;hb=6bbabb32cba07ce95376c2cdcb804ee97050d453;hp=94286b37811f8f99a3cc8b17a8b1ddbd51c0636f;hpb=4ad5b5ee44357ad873bc8c43230defb6d0a79879;p=bbtk.git

diff --git a/kernel/src/bbtkPackage.cxx b/kernel/src/bbtkPackage.cxx
index 94286b3..29cd1dc 100644
--- 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: 2008/04/18 12:59:15 $
-  Version:   $Revision: 1.13 $
+  Date:      $Date: 2008/06/10 19:19:42 $
+  Version:   $Revision: 1.20 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See doc/license.txt or
@@ -111,15 +111,17 @@ namespace bbtk
 						const std::string& descname)
   {
     // Try to release descriptor
-    bbtkDebugMessage("package",3,"--- Trying to release descriptor '"
-		     <<descname<<"'"<<bbtkendl);
     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",3,
+	bbtkDebugMessage("package",5,
 			 "    Descriptor has already been released"
 			 <<bbtkendl);
 	return;
@@ -131,11 +133,11 @@ namespace bbtk
     // if it is dead : remove it 
     if (pdesc.expired()) 
       {
-	bbtkDebugMessage("package",2,"   '"<<packname<<"::"<<descname<<"' Descriptor expired"<<bbtkendl);
+	bbtkDebugMessage("package",2," ==> '"<<packname<<"::"<<descname<<"' Descriptor expired"<<bbtkendl);
 	if (pack.expired()) 
 	  {
 	    bbtkDebugMessage("package",2,
-			     "    ... and caused its package death"
+			     "     ... and caused its package death"
 			     <<bbtkendl);
 	    return;
 	  }
@@ -145,7 +147,7 @@ namespace bbtk
       }
     else 
       {
-	bbtkDebugMessage("package",3,"    ... Descriptor still alive ("
+	bbtkDebugMessage("package",5,"    ... Descriptor still alive ("
 			 <<pdesc.use_count()<<" refs)"
 			 <<bbtkendl);
 	pack.lock()->GetBlackBoxMap()[descname] = pdesc.lock();
@@ -166,7 +168,7 @@ namespace bbtk
     long ndesc = pack.lock()->GetBlackBoxMap().size();
     long nrefs = pack.use_count();
 
-    bbtkDebugMessage("package",2," "<<nrefs<<" refs / "
+    bbtkDebugMessage("package",5," "<<nrefs<<" refs / "
 		     <<ndesc<<" descr / dyn="
 		     <<dyn<<std::endl);
 
@@ -179,7 +181,7 @@ namespace bbtk
     //  and descallocated (reset) by PACKAGENAMEDeletePackage())
     if (nrefs == ndesc + dyn) 
       {
-	bbtkDebugMessage("package",2,
+	bbtkDebugMessage("package",5,
 			 " -> No more external ref : checking descriptors"
 			 <<bbtkendl);
 	// We must take care that removing refs on descriptors 
@@ -212,7 +214,7 @@ namespace bbtk
 	    // Is package still alive ?
 	    if (pack.expired()) 
 	      {
-		bbtkDebugMessage("package",2,"--- Package::Release('"<<
+		bbtkDebugMessage("package",1,"--- Package::Release('"<<
 				 packname
 				 <<"') : package expired during release : bailing out"<<bbtkendl);
 		break;
@@ -232,7 +234,7 @@ namespace bbtk
 	
       }
     
-    bbtkDebugMessage("package",1,"<== Package::Release('"<<
+    bbtkDebugMessage("package",2,"<== Package::Release('"<<
 		     packname<<"')"<<bbtkendl);
     if (!pack.expired())
       {
@@ -247,7 +249,7 @@ namespace bbtk
       }
     else 
       {
-	bbtkDebugMessage("package",1,"   ... Package has been released"
+	bbtkDebugMessage("package",1," ... Package has been released"
 			 <<std::endl);
       }
   }
@@ -265,13 +267,14 @@ namespace bbtk
     std::string packname = pack.lock()->mName;
     std::string dname = descr.lock()->GetTypeName();    
     bbtkDebugMessage("package",3,"==> Package::ReleaseBlackBoxDescriptor('"<<
-		     packname<<"','"<<dname<<"')"<<bbtkendl);
+		     packname<<"','"<<dname<<"') : refs="
+		     <<descr.use_count()<<bbtkendl);
 
     long dyn = pack.lock()->mDynamicLibraryHandler ? 1:0; 
     long ndesc = pack.lock()->GetBlackBoxMap().size();
     long nrefs = pack.use_count();
 
-    bbtkDebugMessage("package",3," "<<nrefs<<" refs / "
+    bbtkDebugMessage("package",5," "<<nrefs<<" refs / "
 		     <<ndesc<<" descr / dynamically loaded = "
 		     <<dyn<<std::endl);
 
@@ -291,8 +294,9 @@ namespace bbtk
     // then put it in the static list mReleasedDynamicallyLoadedPackages
     UnLoadDynamicLibrary(pack,false);
         
-    bbtkDebugMessage("package",3,"<== Package::ReleaseBlackBoxDescriptor('"<<
-		     packname<<"','"<<dname<<"')"<<bbtkendl);
+    bbtkDebugMessage("package",4,"<== Package::ReleaseBlackBoxDescriptor('"<<
+		     packname<<"','"<<dname<<"'): refs="
+		     <<descr.use_count()<<bbtkendl);
     /*
     if (!pack.expired())
       {
@@ -422,6 +426,12 @@ namespace bbtk
 	bbtkMessage("package",2,
 		    "Could not open shared library [" <<libname<<"]"
 		    << std::endl);
+	DWORD dwErrorCode = 0;
+	dwErrorCode = GetLastError();
+	bbtkMessage("package",2,
+		"Windows Error: [" << dwErrorCode <<"]"
+		<< std::endl);
+	 
 	return 0;
       }
     
@@ -430,7 +440,7 @@ namespace bbtk
     getvername += 
       BBTK_STRINGIFY_SYMBOL(BBTK_GET_PACKAGE_BBTK_VERSION_FUNCTION_NAME);
     DLGetPackageBBTKVersionFunction getbbtkversion 
-      = (DLGetPackageBBTKVersionFunction)(GetProcAdress(handler,
+      = (DLGetPackageBBTKVersionFunction)(GetProcAddress(handler,
 							getvername.c_str()));
     if (!getbbtkversion)
       {
@@ -459,7 +469,7 @@ namespace bbtk
      // Loads the Package get function
     std::string getpackname(package_name);
     getpackname += BBTK_STRINGIFY_SYMBOL(BBTK_GET_PACKAGE_FUNCTION_NAME);
-    getpack = (DLGetPackageFunction)(GetProcAdress(handler, getpackname.c_str()));
+    getpack = (DLGetPackageFunction)(GetProcAddress(handler, getpackname.c_str()));
     if (!getpack)
       {
 	FreeLibrary(handler);
@@ -473,7 +483,7 @@ namespace bbtk
     // Loads the Package delete function
     std::string delpackname(package_name);
     delpackname += BBTK_STRINGIFY_SYMBOL(BBTK_DEL_PACKAGE_FUNCTION_NAME);
-    delpack = (DLDeletePackageFunction)(GetProcAdress(handler, delpackname.c_str()));
+    delpack = (DLDeletePackageFunction)(GetProcAddress(handler, delpackname.c_str()));
     if (!delpack)
       {
 	FreeLibrary(handler);
@@ -525,7 +535,7 @@ namespace bbtk
     p->SetDocURL(doc);
     p->SetDocRelativeURL(reldoc);
     
-    bbtkDebugMessage("package",1,"<== Package::CreateFromDynamicLibrary("
+    bbtkDebugMessage("package",2,"<== Package::CreateFromDynamicLibrary("
 		     <<libname<<") .. OK"<<std::endl);
     return p;
   }
@@ -543,14 +553,14 @@ namespace bbtk
     
     
     std::string packname = pack.lock()->GetName();
-    bbtkDebugMessage("package",3,"==> Package::UnLoadDynamicLibrary('"
+    bbtkDebugMessage("package",5,"==> Package::UnLoadDynamicLibrary('"
 		     <<packname<<"')"
 		     <<std::endl);
     
     if (!pack.lock()->GetBlackBoxMap().empty())
       {
 	
-	bbtkDebugMessage("package",3,"   Package not empty ... abort"
+	bbtkDebugMessage("package",5,"   Package not empty ... abort"
 			 <<std::endl);
 	return;
 	/*
@@ -571,19 +581,20 @@ namespace bbtk
     if (doit) 
       {
 	UnLoad(pack);
-	bbtkDebugMessage("package",3,"   ... dynamic library closed"
+	bbtkDebugMessage("package",5,"==> dynamic library for package '"
+			 <<packname<<"' closed"
 			 <<std::endl);    
       }
     else 
       {
 	mReleasedDynamicallyLoadedPackages.insert(pack);
-	bbtkDebugMessage("package",3,
-			 "   ... package put in the 'to unload' list"
+	bbtkDebugMessage("package",1,"==> package '"<<packname
+			 <<"' put in the 'to unload' list"
 			 <<std::endl);
 
       }
 
-    bbtkDebugMessage("package",3,"<== Package::UnLoadDynamicLibrary('"
+    bbtkDebugMessage("package",5,"<== Package::UnLoadDynamicLibrary('"
 		     <<packname<<"')"
 		     <<std::endl);
     
@@ -595,7 +606,7 @@ namespace bbtk
   /// see UnLoadDynamicLibrary and ReleaseBlackBoxDescriptor
   void Package::UnLoadReleasedDynamicallyLoadedPackages()
   {
-    bbtkDebugMessage("package",2,"==> Package::UnLoadReleasedDynamicallyLoadedPackages()"<<std::endl);
+    bbtkDebugMessage("package",5,"==> Package::UnLoadReleasedDynamicallyLoadedPackages()"<<std::endl);
 
     std::set<Package::WeakPointer>::iterator i;
     for (i=mReleasedDynamicallyLoadedPackages.begin();
@@ -604,7 +615,7 @@ namespace bbtk
       {
 	if (!i->expired()) UnLoad(*i);
       }
-    bbtkDebugMessage("package",2,"<== Package::UnLoadReleasedDynamicallyLoadedPackages()"<<std::endl);
+    bbtkDebugMessage("package",5,"<== Package::UnLoadReleasedDynamicallyLoadedPackages()"<<std::endl);
   }
   //==========================================================================
 
@@ -612,7 +623,7 @@ namespace bbtk
   void Package::UnLoad(Package::WeakPointer pack)
   {
     std::string packname = pack.lock()->GetName();
-    bbtkDebugMessage("package",2,"==> Package::UnLoad("<<packname<<")"<<std::endl);
+    bbtkDebugMessage("package",6,"==> Package::UnLoad("<<packname<<")"<<std::endl);
 
     Package* p = pack.lock().get();
     
@@ -628,7 +639,10 @@ namespace bbtk
     FreeLibrary(h);
 #endif
 
-    bbtkDebugMessage("package",2,"   ... dynamic library unloaded"<<std::endl);
+    bbtkDebugMessage("package",1,"==> dynamic library for package '"
+		     <<packname<<"' closed"
+		     <<std::endl);    
+    bbtkDebugMessage("package",6,"   ... dynamic library unloaded"<<std::endl);
   }
   //==========================================================================
 
@@ -696,7 +710,7 @@ namespace bbtk
 			<<name<<"\")"<<bbtkendl);
 
     AdaptorKey key(typein,typeout,
-		   BlackBoxDescriptor::DEFAULT_WIDGET_ADAPTOR);
+		   BlackBoxDescriptor::DEFAULT_GUI);
     AdaptorMapType::const_iterator i = mAdaptorMap.find(key);
     if (i == mAdaptorMap.end())  
       {
@@ -729,7 +743,7 @@ namespace bbtk
     AdaptorKey key(/*typein*/
 		   DataInfo(typeid(void),""),
 		   typeout,
-		   BlackBoxDescriptor::DEFAULT_WIDGET_ADAPTOR);
+		   BlackBoxDescriptor::DEFAULT_GUI);
     // First try to find a single widget adaptor
     AdaptorMapType::const_iterator i = mAdaptorMap.find(key);
     if (i == mAdaptorMap.end())  
@@ -825,7 +839,7 @@ namespace bbtk
 	  }
       }
     // If it is a default adaptor, also register it in the adaptors map
-    else if ( d->GetKind() == BlackBoxDescriptor::DEFAULT_WIDGET_ADAPTOR)
+    else if ( d->GetKind() == BlackBoxDescriptor::DEFAULT_GUI)
       {
 	bbtkDebugMessage("Kernel",8,"Package<"<<GetName()<<">::RegisterBlackBox(\""<<d->GetTypeName()<<"\") : The box is a widget adaptor, inserting it in adaptors map ..."<<std::endl);   
 	
@@ -864,7 +878,7 @@ namespace bbtk
   //===================================================================
   void Package::CheckBoxes() const
   {
-    bbtkMessage("Debug",1,"****** Checking Package "<<(void*)this
+    bbtkMessage("debug",1,"****** Checking Package "<<(void*)this
 		<<" ["<<GetName()<<"]"<<std::endl);
     BlackBoxMapType::const_iterator i;
     for (i=mBlackBoxMap.begin();
@@ -873,7 +887,7 @@ namespace bbtk
       {
 	i->second->Check(true);
       }
-    bbtkMessage("Debug",1,"****** Checking Package "<<(void*)this
+    bbtkMessage("debug",1,"****** Checking Package "<<(void*)this
 		<<" ["<<GetName()<<"] ... OK"<<std::endl);
   }
   //===================================================================
@@ -1184,7 +1198,7 @@ namespace bbtk
 	std::string name = i->second->GetTypeName();
 	Utilities::html_format(name);
 	std::string descr = i->second->GetDescription();
-	Utilities::html_format(descr);
+	//Utilities::html_format(descr);
 
         s << "<TR>";
 	s << "<TD style='vertical-align: top;'>";