OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-06-05 11:24:17 +03:00
Code

Coding - Small optimization of StepData_StepReaderData #543

Browse Source 
Refactor SetEntityNumbers to use reusable memory pool.
Update SetRecord to avoid extra map searches.
This commit is contained in:
Pasukhin Dmitry 2025-05-19 12:07:31 +01:00 committed by dpasukhi
parent b9629dba1c
commit ebdb6abee7
1 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/StepData/StepData_StepReaderData.cxx
View File

@ -33,6 +33,7 @@
#include <StepData_SelectReal.hxx> #include <StepData_SelectReal.hxx>
#include <StepData_SelectType.hxx> #include <StepData_SelectType.hxx>
#include <StepData_StepReaderData.hxx> #include <StepData_StepReaderData.hxx>
#include <NCollection_IncAllocator.hxx>
#include <TCollection_AsciiString.hxx> #include <TCollection_AsciiString.hxx>
#include <TCollection_ExtendedString.hxx> #include <TCollection_ExtendedString.hxx>
#include <NCollection_UtfIterator.hxx> #include <NCollection_UtfIterator.hxx>
@ -387,28 +388,11 @@ void StepData_StepReaderData::SetRecord(const Standard_Integer num,
const Standard_Integer /* nbpar */) const Standard_Integer /* nbpar */)
{ {
Standard_Integer numlst; Standard_Integer numlst;
/*
if (strcmp(type,"/ * (SUB) * /") == 0) { // defini dans recfile.pc
thetypes.SetValue (num,sublist);
} else {
thenbents ++; // total de termes propres du fichier
thetypes.SetValue(num,TCollection_AsciiString(type));
// if (strcmp(ident,"SCOPE") != 0) thenbscop ++; // ?? a verifier
}
*/
if (type[0] != '(') if (type[0] != '(')
thenbents++; // total de termes propres du fichier thenbents++; // total de termes propres du fichier
// thetypes.ChangeValue(num).SetValue(1,type); gka memory thetypes.ChangeValue(num) = thenametypes.Add(TCollection_AsciiString(type));
//============================================
Standard_Integer index = 0;
TCollection_AsciiString strtype(type);
if (thenametypes.Contains(type))
index = thenametypes.FindIndex(strtype);
else
index = thenametypes.Add(strtype);
thetypes.ChangeValue(num) = index;
//===========================================
if (ident[0] == '$') if (ident[0] == '$')
{ {
@ -1998,12 +1982,14 @@ void StepData_StepReaderData::SetEntityNumbers(const Standard_Boolean withmap)
// Passe initiale : Resolution directe par Map // Passe initiale : Resolution directe par Map
// si tout passe (pas de collision), OK. Sinon, autres passes a prevoir // si tout passe (pas de collision), OK. Sinon, autres passes a prevoir
// On resoud du meme coup les sous-listes // On resoud du meme coup les sous-listes
Standard_Integer nbdirec = NbRecords(); Standard_Integer nbdirec = NbRecords();
Handle(NCollection_IncAllocator) anAlloc =
new NCollection_IncAllocator(NCollection_IncAllocator::THE_MINIMUM_BLOCK_SIZE);
TColStd_Array1OfInteger subn(0, thelastn); TColStd_Array1OfInteger subn(0, thelastn);
Standard_Boolean pbmap = Standard_False; // au moins un conflit Standard_Boolean pbmap = Standard_False; // au moins un conflit
Standard_Integer nbmap = 0; Standard_Integer nbmap = 0;
TColStd_IndexedMapOfInteger imap(thenbents); TColStd_IndexedMapOfInteger imap(thenbents, anAlloc);
TColStd_Array1OfInteger indm(0, nbdirec); // Index Map -> Record Number (seulement si map) TColStd_Array1OfInteger indm(0, nbdirec); // Index Map -> Record Number (seulement si map)
Standard_Integer num; // svv Jan11 2000 : porting on DEC Standard_Integer num; // svv Jan11 2000 : porting on DEC
@ -2099,10 +2085,11 @@ void StepData_StepReaderData::SetEntityNumbers(const Standard_Boolean withmap)
Handle(TColStd_HArray1OfInteger) indx; // pour EXPORT (silya) Handle(TColStd_HArray1OfInteger) indx; // pour EXPORT (silya)
imap.Clear(); imap.Clear();
anAlloc->Reset();
Standard_Boolean iamap = withmap; // (par defaut True) Standard_Boolean iamap = withmap; // (par defaut True)
nbmap = 0; nbmap = 0;
TColStd_SequenceOfInteger scopile; // chainage des scopes note par pile TColStd_SequenceOfInteger scopile(anAlloc); // chainage des scopes note par pile
Standard_Integer nr = 0; Standard_Integer nr = 0;
for (num = 1; num <= nbdirec; num++) for (num = 1; num <= nbdirec; num++)
{ {