From: prascle Date: Fri, 16 Dec 2005 14:52:59 +0000 (+0000) Subject: PR: comment not useful traces X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=509c38e48aa1fd4c52a001b15dbcde703a77f44a;p=modules%2Fkernel.git PR: comment not useful traces --- diff --git a/src/Container/Component_i.cxx b/src/Container/Component_i.cxx index 258a7acf7..feec099fd 100644 --- a/src/Container/Component_i.cxx +++ b/src/Container/Component_i.cxx @@ -250,7 +250,7 @@ void Engines_Component_i::destroy() Engines::Container_ptr Engines_Component_i::GetContainerRef() { - MESSAGE("Engines_Component_i::GetContainerRef"); + // MESSAGE("Engines_Component_i::GetContainerRef"); CORBA::Object_ptr o = _poa->id_to_reference(*_contId) ; return Engines::Container::_narrow(o); } diff --git a/src/Container/Container_i.cxx b/src/Container/Container_i.cxx index 8d21a5809..48b3ac787 100644 --- a/src/Container/Container_i.cxx +++ b/src/Container/Container_i.cxx @@ -220,7 +220,7 @@ char* Engines_Container_i::name() char* Engines_Container_i::getHostName() { string s = GetHostname(); - MESSAGE("Engines_Container_i::getHostName " << s); + // MESSAGE("Engines_Container_i::getHostName " << s); return CORBA::string_dup(s.c_str()) ; } diff --git a/src/Container/SALOME_ContainerManager.cxx b/src/Container/SALOME_ContainerManager.cxx index ddd796bb8..9bcf64371 100644 --- a/src/Container/SALOME_ContainerManager.cxx +++ b/src/Container/SALOME_ContainerManager.cxx @@ -249,7 +249,7 @@ GetFittingResources(const Engines::MachineParameters& params, //return ret; } - MESSAGE("Machine list length "<length(vec.size()); for(unsigned int i=0;iisMPI = false; SCRUTE(params->container_name); - SCRUTE(params->hostname); - SCRUTE(params->OS); - SCRUTE(params->mem_mb); - SCRUTE(params->cpu_clock); - SCRUTE(params->nb_proc_per_node); - SCRUTE(params->nb_node); - SCRUTE(params->isMPI); +// SCRUTE(params->hostname); +// SCRUTE(params->OS); +// SCRUTE(params->mem_mb); +// SCRUTE(params->cpu_clock); +// SCRUTE(params->nb_proc_per_node); +// SCRUTE(params->nb_node); +// SCRUTE(params->isMPI); free(stContainer); return FindOrLoad_Component(params,componentName); @@ -381,8 +381,8 @@ _FindComponent(const Engines::MachineParameters& params, const char *containerName = params.container_name; int nbproc = NbProc(params); - MESSAGE("_FindComponent, required " << containerName << - " " << componentName << " " << nbproc); +// MESSAGE("_FindComponent, required " << containerName << +// " " << componentName << " " << nbproc); Engines::MachineList_var machinesOK = new Engines::MachineList; @@ -392,7 +392,7 @@ _FindComponent(const Engines::MachineParameters& params, for(unsigned int i=0; iResolveComponent(currentMachine, containerName, componentName, diff --git a/src/LifeCycleCORBA_SWIG/libSALOME_LifeCycleCORBA.i b/src/LifeCycleCORBA_SWIG/libSALOME_LifeCycleCORBA.i index 215d55985..eec1217f7 100644 --- a/src/LifeCycleCORBA_SWIG/libSALOME_LifeCycleCORBA.i +++ b/src/LifeCycleCORBA_SWIG/libSALOME_LifeCycleCORBA.i @@ -30,8 +30,8 @@ %typemap(python,out) Engines::Container_ptr, Engines::Component_ptr { - MESSAGE("typemap out on CORBA object ptr"); - SCRUTE($1); + //MESSAGE("typemap out on CORBA object ptr"); + //SCRUTE($1); // --- Get the Python orb @@ -49,11 +49,11 @@ char **argv = &xargv; CORBA::ORB_var ORB = CORBA::ORB_init(argc, argv); string s = ORB->object_to_string($1); - SCRUTE(s); + //SCRUTE(s); PyObject * tmp = PyString_FromString(s.c_str()); - SCRUTE(tmp); + //SCRUTE(tmp); $result = PyObject_CallMethod(orb, "string_to_object", "O", tmp); - SCRUTE($result); + //SCRUTE($result); } diff --git a/src/ModuleCatalog/SALOME_ModuleCatalog_impl.cxx b/src/ModuleCatalog/SALOME_ModuleCatalog_impl.cxx index 87e57d287..b6def6a59 100644 --- a/src/ModuleCatalog/SALOME_ModuleCatalog_impl.cxx +++ b/src/ModuleCatalog/SALOME_ModuleCatalog_impl.cxx @@ -536,8 +536,8 @@ SALOME_ModuleCatalogImpl::findComponent(const string & name) { if (name.compare(_general_module_list[ind].name) == 0) { - if(MYDEBUG) MESSAGE("Component named " << name - << " found in the general catalog"); + // if(MYDEBUG) MESSAGE("Component named " << name + // << " found in the general catalog"); C_parser = &(_general_module_list[ind]); break; } @@ -638,7 +638,7 @@ void SALOME_ModuleCatalogImpl::duplicate // duplicate service list unsigned int _length = I_parser.services.size(); - if(MYDEBUG) SCRUTE(_length); + // if(MYDEBUG) SCRUTE(_length); // I_corba.interfaceservicelist // = new SALOME_ModuleCatalog::ListOfInterfaceService; I_corba.interfaceservicelist.length(_length); @@ -700,7 +700,7 @@ void SALOME_ModuleCatalogImpl::duplicate // duplicate out DataStreamParameters _length = S_parser.outDataStreamParameters.size(); - if(MYDEBUG) SCRUTE(_length); + // if(MYDEBUG) SCRUTE(_length); S_corba.ServiceoutDataStreamParameter.length(_length); #ifndef WNT diff --git a/src/NamingService/SALOME_NamingService.cxx b/src/NamingService/SALOME_NamingService.cxx index bce5f2338..0c046c9ea 100644 --- a/src/NamingService/SALOME_NamingService.cxx +++ b/src/NamingService/SALOME_NamingService.cxx @@ -344,7 +344,7 @@ void SALOME_NamingService::Register(CORBA::Object_ptr ObjRef, CORBA::Object_ptr SALOME_NamingService::Resolve(const char* Path) throw(ServiceUnreachable) { - MESSAGE("BEGIN OF Resolve: " << Path); +// MESSAGE("BEGIN OF Resolve: " << Path); Utils_Locker lock (&_myMutex); @@ -430,10 +430,10 @@ CORBA::Object_ptr SALOME_NamingService::Resolve(const char* Path) CORBA::Object_ptr SALOME_NamingService::ResolveFirst(const char* Path) throw(ServiceUnreachable) { - MESSAGE("ResolveFirst"); +// MESSAGE("ResolveFirst"); Utils_Locker lock (&_myMutex); - SCRUTE(Path); +// SCRUTE(Path); string thePath = Path; string basePath = ""; @@ -445,10 +445,10 @@ CORBA::Object_ptr SALOME_NamingService::ResolveFirst(const char* Path) { basePath = thePath.substr(0, idx); name = thePath.substr(idx + 1); - SCRUTE(basePath); +// SCRUTE(basePath); } - SCRUTE(name); +// SCRUTE(name); CORBA::Object_ptr obj = CORBA::Object::_nil(); bool isOk = false; @@ -503,7 +503,7 @@ SALOME_NamingService::ResolveComponent(const char* hostname, const int nbproc) throw(ServiceUnreachable) { - MESSAGE("ResolveComponent"); +// MESSAGE("ResolveComponent"); Utils_Locker lock (&_myMutex); @@ -791,7 +791,7 @@ throw(ServiceUnreachable) bool SALOME_NamingService::Change_Directory(const char* Path) throw(ServiceUnreachable) { - MESSAGE("BEGIN OF Change_Directory " << Path); +// MESSAGE("BEGIN OF Change_Directory " << Path); Utils_Locker lock (&_myMutex); string path(Path); @@ -805,7 +805,7 @@ throw(ServiceUnreachable) if (path == "/") { - MESSAGE("Change_Directory is called to go to the root_context"); +// MESSAGE("Change_Directory is called to go to the root_context"); _current_context = _root_context; return true; } @@ -823,7 +823,7 @@ throw(ServiceUnreachable) ASSERT(!CORBA::is_nil(current_context)); if (path[path.length()-1] != '/') path += '/'; - SCRUTE(path); +// SCRUTE(path); CosNaming::Name context_name; vector splitPath; int dimension_resultat = _createContextNameDir(path.c_str(), @@ -1010,7 +1010,7 @@ throw(ServiceUnreachable) vector SALOME_NamingService::list_directory() throw(ServiceUnreachable) { - MESSAGE("list_directory"); +// MESSAGE("list_directory"); vector dirList ; dirList.resize(0); @@ -1038,8 +1038,8 @@ throw(ServiceUnreachable) } } - for (unsigned int ind = 0; ind < dirList.size(); ind++) - MESSAGE("list_directory : Object : " << dirList[ind]); +// for (unsigned int ind = 0; ind < dirList.size(); ind++) +// MESSAGE("list_directory : Object : " << dirList[ind]); binding_iterator->destroy(); @@ -1573,17 +1573,17 @@ SALOME_NamingService::_createContextNameDir(string path, context_name.length(dim); for (int i=0; i::const_iterator iter = - _resources_list.begin(); - iter != _resources_list.end(); - iter++) - { - SCRUTE((*iter).second.Alias); - SCRUTE((*iter).second.UserName); - SCRUTE((*iter).second.AppliPath); - SCRUTE((*iter).second.PreReqFilePath); - SCRUTE((*iter).second.OS); - SCRUTE((*iter).second.Protocol); - SCRUTE((*iter).second.Mode); - } +// for (map::const_iterator iter = +// _resources_list.begin(); +// iter != _resources_list.end(); +// iter++) +// { +// SCRUTE((*iter).second.Alias); +// SCRUTE((*iter).second.UserName); +// SCRUTE((*iter).second.AppliPath); +// SCRUTE((*iter).second.PreReqFilePath); +// SCRUTE((*iter).second.OS); +// SCRUTE((*iter).second.Protocol); +// SCRUTE((*iter).second.Mode); +// } - MESSAGE("This is the end of document"); +// MESSAGE("This is the end of document"); return true; } diff --git a/src/ResourcesManager/SALOME_ResourcesManager.cxx b/src/ResourcesManager/SALOME_ResourcesManager.cxx index e20832edf..434aa876b 100644 --- a/src/ResourcesManager/SALOME_ResourcesManager.cxx +++ b/src/ResourcesManager/SALOME_ResourcesManager.cxx @@ -124,7 +124,7 @@ GetFittingResources(const Engines::MachineParameters& params, const char *moduleName) throw(SALOME_Exception) { - MESSAGE("ResourcesManager::GetFittingResources"); +// MESSAGE("ResourcesManager::GetFittingResources"); vector ret; // --- To be sure that we search in a correct list. @@ -135,14 +135,14 @@ throw(SALOME_Exception) if (hostname[0] != '\0') { - MESSAGE("ResourcesManager::GetFittingResources : hostname specified" ); +// MESSAGE("ResourcesManager::GetFittingResources : hostname specified" ); if ( strcmp(hostname, "localhost") == 0 || strcmp(hostname, GetHostname().c_str()) == 0 ) { - MESSAGE("ResourcesManager::GetFittingResources : localhost" ); +// MESSAGE("ResourcesManager::GetFittingResources : localhost" ); ret.push_back(GetHostname().c_str()); - MESSAGE("ResourcesManager::GetFittingResources : " << ret.size()); +// MESSAGE("ResourcesManager::GetFittingResources : " << ret.size()); } else if (_resourcesList.find(hostname) != _resourcesList.end()) @@ -197,7 +197,7 @@ throw(SALOME_Exception) ret[i++] = (*iter2)._hostName; } - MESSAGE("ResourcesManager::GetFittingResources : return" << ret.size()); + // MESSAGE("ResourcesManager::GetFittingResources : return" << ret.size()); return ret; }