mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-08-04 13:13:25 +03:00
0026515: Exponential memory usage problems with BOPDS_IndexedMapOfPaveBlock and NCollection_IncAllocator
Correcting the usage of NCollection_IncAllocator Conflicts: src/BOPAlgo/BOPAlgo_BOP.cxx src/BOPAlgo/BOPAlgo_Builder.cxx src/BOPAlgo/BOPAlgo_BuilderSolid.cxx src/BOPAlgo/BOPAlgo_Builder_2.cxx src/BOPAlgo/BOPAlgo_MakerVolume.cxx src/BOPAlgo/BOPAlgo_PaveFiller.cdl src/BOPAlgo/BOPAlgo_PaveFiller_1.cxx src/BOPAlgo/BOPAlgo_PaveFiller_10.cxx src/BOPAlgo/BOPAlgo_PaveFiller_3.cxx src/BOPAlgo/BOPAlgo_PaveFiller_4.cxx src/BOPAlgo/BOPAlgo_PaveFiller_5.cxx src/BOPAlgo/BOPAlgo_PaveFiller_6.cxx src/BOPAlgo/BOPAlgo_PaveFiller_7.cxx src/BOPAlgo/BOPAlgo_PaveFiller_8.cxx src/BOPAlgo/BOPAlgo_Section.cxx src/BOPDS/BOPDS_DS.cxx src/BOPDS/BOPDS_Iterator.cxx src/BOPDS/BOPDS_IteratorSI.cxx src/BOPDS/BOPDS_SubIterator.cxx src/BOPTest/BOPTest_BOPCommands.cxx src/BOPTest/BOPTest_PartitionCommands.cxx src/IntTools/IntTools_Context.cxx additional corrections Adaptation of test case bugs fclasses bug7287_1 (limit for detection of memory leak reduced due to leak reduction) Adjusting test-case bugs fclasses bug7287_1
This commit is contained in:
@@ -40,7 +40,6 @@
|
||||
#include <IntTools_FaceFace.hxx>
|
||||
#include <IntTools_PntOn2Faces.hxx>
|
||||
#include <NCollection_BaseAllocator.hxx>
|
||||
#include <NCollection_IncAllocator.hxx>
|
||||
#include <TCollection_AsciiString.hxx>
|
||||
#include <TopoDS_Compound.hxx>
|
||||
#include <TopoDS_Iterator.hxx>
|
||||
@@ -153,7 +152,8 @@ Standard_Integer bop(Draw_Interpretor& di,
|
||||
delete pPF;
|
||||
pPF=NULL;
|
||||
}
|
||||
Handle(NCollection_BaseAllocator)aAL=new NCollection_IncAllocator;
|
||||
Handle(NCollection_BaseAllocator)aAL=
|
||||
NCollection_BaseAllocator::CommonBaseAllocator();
|
||||
pPF=new BOPAlgo_PaveFiller(aAL);
|
||||
//
|
||||
pPF->SetArguments(aLC);
|
||||
@@ -484,7 +484,8 @@ Standard_Integer bsmt (Draw_Interpretor& di,
|
||||
aTol=BOPTest_Objects::FuzzyValue();
|
||||
bRunParallel = BOPTest_Objects::RunParallel();
|
||||
//
|
||||
Handle(NCollection_BaseAllocator)aAL=new NCollection_IncAllocator;
|
||||
Handle(NCollection_BaseAllocator)aAL=
|
||||
NCollection_BaseAllocator::CommonBaseAllocator();
|
||||
//
|
||||
//---------------------------------------------------------------
|
||||
BOPAlgo_PaveFiller aPF(aAL);
|
||||
|
@@ -19,7 +19,6 @@
|
||||
#include <BOPAlgo_Section.hxx>
|
||||
#include <BOPTest_Objects.hxx>
|
||||
#include <NCollection_BaseAllocator.hxx>
|
||||
#include <NCollection_IncAllocator.hxx>
|
||||
|
||||
static Handle(NCollection_BaseAllocator)& Allocator1();
|
||||
|
||||
@@ -42,8 +41,8 @@ class BOPTest_Session {
|
||||
void Init() {
|
||||
Handle(NCollection_BaseAllocator) pA1, pA2;
|
||||
//
|
||||
pA1=new NCollection_IncAllocator;
|
||||
pA2=new NCollection_IncAllocator;
|
||||
pA1=NCollection_BaseAllocator::CommonBaseAllocator();
|
||||
pA2=NCollection_BaseAllocator::CommonBaseAllocator();
|
||||
//
|
||||
myPaveFiller=new BOPAlgo_PaveFiller(pA1);
|
||||
myBuilderDefault=new BOPAlgo_Builder(pA2);
|
||||
@@ -279,6 +278,6 @@ Standard_Real BOPTest_Objects::FuzzyValue()
|
||||
Handle(NCollection_BaseAllocator)& Allocator1()
|
||||
{
|
||||
static Handle(NCollection_BaseAllocator) sAL1=
|
||||
new NCollection_IncAllocator;
|
||||
NCollection_BaseAllocator::CommonBaseAllocator();
|
||||
return sAL1;
|
||||
}
|
||||
|
@@ -25,7 +25,6 @@
|
||||
#include <Draw.hxx>
|
||||
#include <Draw_Color.hxx>
|
||||
#include <DrawTrSurf.hxx>
|
||||
#include <NCollection_IncAllocator.hxx>
|
||||
#include <OSD_Timer.hxx>
|
||||
#include <TopoDS_Shape.hxx>
|
||||
|
||||
|
Reference in New Issue
Block a user