OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00
Code Packages Releases Activity

0024044: Performance improvements: Foundation Classes (math)

Browse Source
This commit is contained in:
Roman Lygin 2013-06-25 21:42:25 +04:00 committed by bugmaster
parent 6f94f1dff9
commit b28e7cc6d1
4 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/math/math_DoubleTab.cdl
View File

@ -67,6 +67,9 @@ is
fields
Addr : Address;
AddrBuf : Address[32];
Buf : Item[512];
isAddrAllocated: Boolean;
isAllocated : Boolean;
LowR : Integer;
UppR : Integer;

22
src/math/math_DoubleTab.gxx
View File

@ -24,12 +24,16 @@
#include <Standard_Failure.hxx>
#include <Standard_Integer.hxx>
// macro to get size of C array
#define CARRAY_LENGTH(arr) (sizeof(arr)/sizeof(arr[0]))
void math_DoubleTab::Allocate()
{
Standard_Integer RowNumber = UppR - LowR + 1;
Standard_Integer ColNumber = UppC - LowC + 1;
Item** TheAddr = (Item**) Standard::Allocate(RowNumber * sizeof(Item*));
Item** TheAddr = !isAddrAllocated? (Item**)&AddrBuf :
(Item**) Standard::Allocate(RowNumber * sizeof(Item*));
Item* Address;
if(isAllocated)
Address = (Item*) Standard::Allocate(RowNumber * ColNumber * sizeof(Item));
@ -50,7 +54,9 @@ math_DoubleTab::math_DoubleTab(const Standard_Integer LowerRow,
const Standard_Integer UpperRow,
const Standard_Integer LowerCol,
const Standard_Integer UpperCol) :
isAllocated(Standard_True),
Addr(Buf),
isAddrAllocated(UpperRow - LowerRow + 1 > CARRAY_LENGTH(AddrBuf)),
isAllocated((UpperRow - LowerRow + 1) * (UpperCol - LowerCol + 1) > CARRAY_LENGTH(Buf)),
LowR(LowerRow),
UppR(UpperRow),
LowC(LowerCol),
@ -66,6 +72,7 @@ math_DoubleTab::math_DoubleTab(const Item& Tab,
const Standard_Integer LowerCol,
const Standard_Integer UpperCol) :
Addr((void *) &Tab),
isAddrAllocated(UpperRow - LowerRow + 1 > CARRAY_LENGTH(AddrBuf)),
isAllocated(Standard_False),
LowR(LowerRow),
UppR(UpperRow),
@ -87,7 +94,10 @@ void math_DoubleTab::Init(const Item& InitValue)
math_DoubleTab::math_DoubleTab(const math_DoubleTab& Other) :
isAllocated(Standard_True),
Addr(Buf),
isAddrAllocated(Other.UppR - Other.LowR + 1 > CARRAY_LENGTH(AddrBuf)),
isAllocated((Other.UppR - Other.LowR + 1) *
(Other.UppC - Other.LowC + 1) > CARRAY_LENGTH(Buf)),
LowR(Other.LowR),
UppR(Other.UppR),
LowC(Other.LowC),
@ -112,8 +122,10 @@ void math_DoubleTab::Free()
Standard::Free(it);
}
// free the pointers
Standard_Address it = (Standard_Address)(((Item**)Addr) + LowR);
Standard::Free (it);
if(isAddrAllocated) {
Standard_Address it = (Standard_Address)(((Item**)Addr) + LowR);
Standard::Free (it);
}
Addr = 0;
}

1
src/math/math_SingleTab.cdl
View File

@ -59,6 +59,7 @@ is
fields
Addr : Address;
Buf : Item[512];
isAllocated : Boolean;
First : Integer;
Last : Integer;

19
src/math/math_SingleTab.gxx
View File

@ -21,15 +21,18 @@
#include <Standard_OutOfRange.hxx>
#include <Standard_Failure.hxx>
// macro to get size of C array
#define CARRAY_LENGTH(arr) (sizeof(arr)/sizeof(arr[0]))
math_SingleTab::math_SingleTab(const Standard_Integer LowerIndex,
const Standard_Integer UpperIndex) :
isAllocated(Standard_True),
Addr(Buf),
isAllocated(UpperIndex - LowerIndex + 1 > CARRAY_LENGTH(Buf)),
First(LowerIndex), Last(UpperIndex)
{
Item* TheAddr = (Item*) Standard::Allocate((Last-First+1) * sizeof(Item));
Item* TheAddr = !isAllocated? Buf :
(Item*) Standard::Allocate((Last-First+1) * sizeof(Item));
Addr = (Standard_Address) (TheAddr - First);
//cout << " Vector allocation = " << Addr << endl;
}
math_SingleTab::math_SingleTab(const Item& Tab,
@ -40,7 +43,6 @@ math_SingleTab::math_SingleTab(const Item& Tab,
First(LowerIndex), Last(UpperIndex)
{
//cout << " Vector allocation = " << Addr << endl;
}
void math_SingleTab::Init(const Item& InitValue)
@ -53,14 +55,14 @@ void math_SingleTab::Init(const Item& InitValue)
math_SingleTab::math_SingleTab(const math_SingleTab& Other) :
isAllocated(Standard_True),
isAllocated(Other.Last - Other.First + 1 > CARRAY_LENGTH(Buf)),
First(Other.First),
Last(Other.Last)
{
Item* TheAddr = (Item*) Standard::Allocate((Last-First+1) * sizeof(Item));
Item* TheAddr = !isAllocated? Buf :
(Item*) Standard::Allocate((Last-First+1) * sizeof(Item));
Addr = (Standard_Address) (TheAddr - First);
//cout << " Vector allocation = " << Addr << endl;
Item* TheOtherAddr = (Item*) Other.Addr;
memmove((void*) TheAddr, (const void*) (TheOtherAddr + First),
(size_t)(Last - First + 1) * sizeof(Item));
@ -69,7 +71,6 @@ math_SingleTab::math_SingleTab(const math_SingleTab& Other) :
void math_SingleTab::Free()
{
//cout << " Vector deallocation = " << Addr << endl;
if(isAllocated) {
Standard_Address it = (Standard_Address)&((Item*)Addr)[First];
Standard::Free(it);