Module: $RCSfile: bbtkFactory.cxx,v $
Language: C++
-Date: $Date: 2008/02/21 09:37:23 $
-Version: $Revision: 1.23 $
+Date: $Date: 2008/03/11 12:27:21 $
+Version: $Revision: 1.30 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
#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
{
//===================================================================
/// Default ctor
Factory::Factory()
+ : mExecuter(0)
{
bbtkDebugMessage("Kernel",7,"Factory::Factory()"<<std::endl);
}
//===================================================================
void Factory::Reset()
{
+ /*
+printf("EED kkkkkkkkkkkkkkkkkkkkkkkk Factory::Reset() \n");
+printf("EED kkkkkkkkkkkkkkkkkkkkkkkk Factory::Reset() \n");
+printf("EED kkkkkkkkkkkkkkkkkkkkkkkk Factory::Reset() \n");
+printf("EED kkkkkkkkkkkkkkkkkkkkkkkk Factory::Reset() \n");
+printf("EED kkkkkkkkkkkkkkkkkkkkkkkk Factory::Reset() \n");
+printf("EED kkkkkkkkkkkkkkkkkkkkkkkk Factory::Reset() \n");
+ */
bbtkDebugMessageInc("Kernel",7,"Factory::Reset()"<<std::endl);
CloseAllPackages();
bbtkDebugDecTab("Kernel",7);
// 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() )
{
<< " whereas application build with version "
<< bbtk::GetVersion());
}
+
+ pack.mPackage->AddFactory(this);
+ mPackageMap[pkgname] = pack;
std::string separator =
ConfigurationFile::GetInstance().Get_file_separator ();
- void Factory::LoadPackage( const std::string& name,
- bool use_configuration_file)
+ void Factory::LoadPackage( const std::string& name )
{
// Note : in the following :
// name : the user supplied name
bbtkDebugMessageInc("Kernel",7,"Factory::LoadPackage(\""<<name<<"\")"<<std::endl);
bbtkMessage("Debug",1,"Factory::LoadPackage(\""<<name<<"\")"<<std::endl);
- bbtkMessage("Debug",1,"use_configuration_file ["
- << use_configuration_file << "]" << std::endl);
std::vector<std::string> package_paths;
std::string libname; // full path library name
//===================================================================
/// \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()
+ }
#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);
+ }
+ //===================================================================
+
//===================================================================
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);
}
//===================================================================
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);
<<to->bbGetName()<<"\",\""<<input
<<"\")"<<std::endl);
- return new Connection(from,output,to,input);
- /*
- Connection* c;
- // !!! WARNING : WE NEED TO TEST THE TYPE NAME EQUALITY
- // BECAUSE IN DIFFERENT DYN LIBS THE type_info EQUALITY CAN
- // BE FALSE (DIFFERENT INSTANCES !)
-
- std::string t1 ( from->bbGetOutputType(output).name() );
- std::string t2 ( to->bbGetInputType(input).name() );
-
-
- if ( t1 == t2 )
- //from->bbGetOutputType(output) ==
- // to->bbGetInputType(input) )
- {
- c = new Connection(from,output,to,input);
- }
- else
- {
- // std::cout << "Adaptive connection "<<std::endl;
- std::string name;
- name = from->bbGetName() + "." + output + "-"
- + to->bbGetName() + "." + input;
-
- BlackBox* b = 0;
- PackageMapType::const_iterator i;
- for (i = mPackageMap.begin(); i!=mPackageMap.end(); ++i )
- {
- b = i->second.mPackage->NewAdaptor(from->bbGetOutputType(output),
- to->bbGetInputType(input),
- name);
- if (b) break;
- }
- if (!b)
- {
- bbtkError("did not find any <"
- <<TypeName(from->bbGetOutputType(output))
- <<"> to <"
- <<TypeName(to->bbGetInputType(input))
- <<"> adaptor");
- }
- c = new AdaptiveConnection(from,output,to,input,b);
- }
- bbtkDebugDecTab("Kernel",7);
-
- return c;
- */
+ return new Connection(from,output,to,input,this);
}
//===================================================================
++j)
{
+ // Skip adaptors
+ if ( type==Adaptors )
+ {
+ if (j->second->GetKind() == BlackBoxDescriptor::STANDARD )
+ continue;
+ }
+ else
+ if (j->second->GetKind() != BlackBoxDescriptor::STANDARD )
+ continue;
+
std::vector<std::string> keys;
if (type==Packages)
{
keys.push_back(k);
title = "Boxes by package";
}
- else if (type==Initials)
+ else if ((type==Initials) || (type==Adaptors))
{
std::string init(" ");
init[0] = std::toupper(j->second->GetTypeName()[0]);
keys.push_back(" NONE");
title = "Boxes by category";
}
+
std::vector<std::string>::const_iterator k;
for (k=keys.begin(); k!=keys.end(); ++k )
IndexType::iterator ii;
for (ii=index.begin();ii!=index.end();++ii)
{
- s << "<a href=\"#"<<ii->first<<"\">"<<ii->first<<"</a> ";
+ s << "<a href=\"#"<<ii->first<<"\">"<<ii->first<<"</a> ";
}
for (ii=index.begin();ii!=index.end();++ii)
git://git.creatis.insa-lyon.fr / bbtk.git / blobdiff