ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-11-15 10:08:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

0020463: EDF 1099 SMESH: performance regression from V4 to V5

Browse Source 
Remove memory leaks and optimize ParseParameters()
This commit is contained in:
eap 2009-09-14 13:05:16 +00:00
parent ed0a000310
commit 44f899d82d
1 changed files with 48 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/SMESH_I/SMESH_Gen_i_1.cxx
View File

@ -914,10 +914,11 @@ void SMESH_Gen_i::UpdateParameters(CORBA::Object_ptr theObject, const char* theP
anAttr = aStudyBuilder->FindOrCreateAttribute( aSObj, "AttributeString");
SALOMEDS::AttributeString_var aStringAttr = SALOMEDS::AttributeString::_narrow(anAttr);
CORBA::String_var oldparVar = aStringAttr->Value();
CORBA::String_var inpparVar = ParseParameters(theParameters);
TCollection_AsciiString aNewParams;
TCollection_AsciiString aOldParameters(aStringAttr->Value());
TCollection_AsciiString anInputParams(ParseParameters(theParameters));
TCollection_AsciiString aOldParameters(oldparVar.inout());
TCollection_AsciiString anInputParams(inpparVar.inout());
if(!hasAttr)
aNewParams = anInputParams;
else
@ -930,7 +931,6 @@ void SMESH_Gen_i::UpdateParameters(CORBA::Object_ptr theObject, const char* theP
cout<<"New Parameters : "<<aNewParams<<endl;
}
aStringAttr->SetValue( aNewParams.ToCString() );
}
@ -940,21 +940,45 @@ void SMESH_Gen_i::UpdateParameters(CORBA::Object_ptr theObject, const char* theP
//=======================================================================
char* SMESH_Gen_i::ParseParameters(const char* theParameters)
{
const char* aParameters = CORBA::string_dup(theParameters);
//const char* aParameters = theParameters;
// const char* aParameters = CORBA::string_dup(theParameters);
TCollection_AsciiString anInputParams;
SALOMEDS::Study_ptr aStudy = GetCurrentStudy();
SALOMEDS::Study_var aStudy = GetCurrentStudy();
if( !aStudy->_is_nil() ) {
SALOMEDS::ListOfListOfStrings_var aSections = aStudy->ParseVariables(aParameters);
for(int j=0;j<aSections->length();j++) {
SALOMEDS::ListOfStrings aVars= aSections[j];
for(int i=0;i<aVars.length();i++ ) {
anInputParams += aStudy->IsVariable(aVars[i].in()) ?
TCollection_AsciiString(aVars[i].in()) : TCollection_AsciiString("");
if(i != aVars.length()-1)
anInputParams+=":";
// SALOMEDS::ListOfListOfStrings_var aSections = aStudy->ParseVariables(theParameters);
// for(int j=0;j<aSections->length();j++) {
// SALOMEDS::ListOfStrings aVars= aSections[j];
// for(int i=0;i<aVars.length();i++ ) {
// anInputParams += aStudy->IsVariable(aVars[i].in()) ?
// TCollection_AsciiString(aVars[i].in()) : TCollection_AsciiString("");
// if(i != aVars.length()-1)
// anInputParams+=":";
// }
// if(j!=aSections->length()-1)
// anInputParams+="|";
// }
TCollection_AsciiString paramStr( theParameters );
static TCollection_AsciiString separators(":|");
int beg = 0, end;
char sep, *pParams = (char*)paramStr.ToCString();
while ( beg < paramStr.Length() )
{
end = beg-1;
while ( ++end < paramStr.Length() )
if ( pParams[end] == ':' || pParams[end] == '|')
break;
if ( end < paramStr.Length())
{
sep = pParams[end];
pParams[end] = '\0';
}
if(j!=aSections->length()-1)
anInputParams+="|";
if ( aStudy->IsVariable( pParams+beg ))
anInputParams += pParams+beg;
if ( end < paramStr.Length() )
anInputParams += sep;
else
break;
beg = end + 1;
}
}
return CORBA::string_dup(anInputParams.ToCString());