From 1145e2bc729a8d61f1a915e8f30a4f68f3f4fb7d Mon Sep 17 00:00:00 2001 From: Roman Lygin Date: Thu, 4 Jul 2013 14:31:57 +0400 Subject: [PATCH] 0024042: Performance improvements: Foundation Classes Removed code under former __OPTIM_ARRAY macro --- src/Bnd/Bnd_Box2d.cxx | 3 +- .../NCollection_BaseCollection.hxx | 3 + src/TCollection/TCollection_Array1.cdl | 4 + src/TCollection/TCollection_Array1.gxx | 78 ----------------- src/TCollection/TCollection_Array1.lxx | 64 ++++++++++++++ src/TCollection/TCollection_Array2.cdl | 5 ++ src/TCollection/TCollection_Array2.gxx | 83 ------------------- src/TCollection/TCollection_Array2.lxx | 69 +++++++++++++++ src/TCollection/TCollection_HArray1.cdl | 3 + src/TCollection/TCollection_HArray1.gxx | 40 +-------- src/TCollection/TCollection_HArray1.lxx | 34 ++++++++ src/TCollection/TCollection_HArray2.cdl | 6 ++ src/TCollection/TCollection_HArray2.gxx | 62 -------------- src/TCollection/TCollection_HArray2.lxx | 55 ++++++++++++ 14 files changed, 245 insertions(+), 264 deletions(-) diff --git a/src/Bnd/Bnd_Box2d.cxx b/src/Bnd/Bnd_Box2d.cxx index d443d3cb90..9129ab140a 100755 --- a/src/Bnd/Bnd_Box2d.cxx +++ b/src/Bnd/Bnd_Box2d.cxx @@ -264,9 +264,8 @@ Standard_Boolean Bnd_Box2d::IsOut (const Bnd_Box2d& Other) const else if (Other.IsWhole()) return Standard_False; else if (Other.IsVoid()) return Standard_True; else { - Bnd_Box2d OtherBox2d = Other; // DownEqual Standard_Real OXmin,OXmax,OYmin,OYmax; - OtherBox2d.Get(OXmin,OYmin,OXmax,OYmax); + Other.Get(OXmin,OYmin,OXmax,OYmax); if (!(Flags & XminMask) && (OXmax < (Xmin-Gap))) return Standard_True; else if (!(Flags & XmaxMask) && (OXmin > (Xmax+Gap))) return Standard_True; else if (!(Flags & YminMask) && (OYmax < (Ymin-Gap))) return Standard_True; diff --git a/src/NCollection/NCollection_BaseCollection.hxx b/src/NCollection/NCollection_BaseCollection.hxx index 62a31194c6..017a7290ab 100755 --- a/src/NCollection/NCollection_BaseCollection.hxx +++ b/src/NCollection/NCollection_BaseCollection.hxx @@ -102,6 +102,9 @@ template class NCollection_BaseCollection //! Destructor - must be implemented to release the memory virtual ~NCollection_BaseCollection (void) {} + //! Returns attached allocator + const Handle(NCollection_BaseAllocator)& Allocator() const { return myAllocator; } + protected: // --------- PROTECTED METHOD ----------- const Handle(NCollection_BaseAllocator)& IterAllocator(void) const diff --git a/src/TCollection/TCollection_Array1.cdl b/src/TCollection/TCollection_Array1.cdl index 079ac0bc25..bf1501414f 100755 --- a/src/TCollection/TCollection_Array1.cdl +++ b/src/TCollection/TCollection_Array1.cdl @@ -65,6 +65,7 @@ is raises RangeError from Standard, OutOfMemory from Standard; + ---C++: inline Create(Item : Array1Item; Low, Up: Integer from Standard) @@ -80,9 +81,11 @@ is -- the Array1. raises RangeError from Standard; + ---C++: inline Init (me: in out; V: Array1Item); ---Purpose: Initializes the array with a given value. + ---C++: inline Destroy (me: in out); ---Purpose: Frees the allocated area corresponding to the @@ -91,6 +94,7 @@ is -- the Destroy doesn't delete the area. -- ---C++: alias ~ + ---C++: inline IsAllocated (me) returns Boolean from Standard; ---Purpose: Returns True if the data was allocated by the array constructors. diff --git a/src/TCollection/TCollection_Array1.gxx b/src/TCollection/TCollection_Array1.gxx index 5f81614544..a1dfdde06d 100755 --- a/src/TCollection/TCollection_Array1.gxx +++ b/src/TCollection/TCollection_Array1.gxx @@ -17,85 +17,7 @@ // and conditions governing the rights and limitations under the License. #include -#include -#include -#include -// ###### REFERENCER LE STORAGE MANAGER DES COLLECTIONS ###### - -//======================================================================= -//function : TCollection_Array1 -//purpose : -//======================================================================= - -TCollection_Array1::TCollection_Array1 (const Standard_Integer Low, - const Standard_Integer Up) : - myLowerBound(Low), - myUpperBound(Up), - isAllocated(Standard_True) -{ - Standard_RangeError_Raise_if(Up < Low,"TCollection_Array1::Create"); - - Array1Item* p = 0; -#ifdef __OPTIM_ARRAY - // p = new char [(Up-Low+1)*sizeof (Array1Item)]; - p = (Array1Item *)Standard::Allocate((Up-Low+1)*sizeof (Array1Item)); -#else - p = new Array1Item[Up-Low+1]; -#endif - - if (!p) Standard_OutOfMemory::Raise("Array1 : Allocation failed"); - myStart = (void*)(p - myLowerBound); -} - - - -//======================================================================= -//function : Init -//purpose : -//======================================================================= - -void TCollection_Array1::Init (const Array1Item& V) { - Array1Item* p = &ChangeValue(myLowerBound); - Standard_Integer i; - for(i = myLowerBound; i <= myUpperBound; i++) { - *p++ = V; - } -} - -//======================================================================= -//function : TCollection_Array1 -//purpose : C Array constructor -//======================================================================= - -TCollection_Array1::TCollection_Array1(const Array1Item& AnItem, - const Standard_Integer Low, - const Standard_Integer Up) : - myLowerBound(Low), - myUpperBound(Up), - isAllocated(Standard_False) -{ - - Standard_RangeError_Raise_if(Up < Low,"Array1::CArray"); - myStart = (void*)( &AnItem - Low ); -} - -//======================================================================= -//function : Destroy -//purpose : -//======================================================================= - -void TCollection_Array1::Destroy() -{ - if (isAllocated) { -#ifdef __OPTIM_ARRAY - Standard_Address it = (Standard_Address)&((Array1Item *)myStart)[myLowerBound]; - Standard::Free(it); -#else - delete [] &ChangeValue(myLowerBound); -#endif - } -} //======================================================================= //function : Assign diff --git a/src/TCollection/TCollection_Array1.lxx b/src/TCollection/TCollection_Array1.lxx index c477c64299..5e43c5a63b 100755 --- a/src/TCollection/TCollection_Array1.lxx +++ b/src/TCollection/TCollection_Array1.lxx @@ -16,10 +16,74 @@ // purpose or non-infringement. Please see the License for the specific terms // and conditions governing the rights and limitations under the License. +#include +#include #include +#include #include Array1Item_hxx + +//======================================================================= +//function : TCollection_Array1 +//purpose : +//======================================================================= + +inline TCollection_Array1::TCollection_Array1 (const Standard_Integer Low, + const Standard_Integer Up) : + myLowerBound(Low), + myUpperBound(Up), + isAllocated(Standard_True) +{ + Standard_RangeError_Raise_if(Up < Low,"TCollection_Array1::Create"); + + Array1Item* p = new Array1Item[Up-Low+1]; + + if (!p) Standard_OutOfMemory::Raise("Array1 : Allocation failed"); + myStart = (void*)(p - myLowerBound); +} + +//======================================================================= +//function : TCollection_Array1 +//purpose : C Array constructor +//======================================================================= + +inline TCollection_Array1::TCollection_Array1(const Array1Item& AnItem, + const Standard_Integer Low, + const Standard_Integer Up) : + myLowerBound(Low), + myUpperBound(Up), + isAllocated(Standard_False) +{ + Standard_RangeError_Raise_if(Up < Low,"Array1::CArray"); + myStart = (void*)( &AnItem - Low ); +} + +//======================================================================= +//function : Init +//purpose : +//======================================================================= + +inline void TCollection_Array1::Init (const Array1Item& V) { + Array1Item* p = &ChangeValue(myLowerBound); + const Standard_Integer n = Length(); + for(Standard_Integer i = 0; i < n; i++) { + p[i] = V; + } +} + +//======================================================================= +//function : Destroy +//purpose : +//======================================================================= + +inline void TCollection_Array1::Destroy() +{ + if (isAllocated) { + delete [] &ChangeValue(myLowerBound); + } +} + //======================================================================= //function : Length //purpose : diff --git a/src/TCollection/TCollection_Array2.cdl b/src/TCollection/TCollection_Array2.cdl index 03522871b1..4a3fe6ca42 100755 --- a/src/TCollection/TCollection_Array2.cdl +++ b/src/TCollection/TCollection_Array2.cdl @@ -50,11 +50,13 @@ is raises RangeError from Standard, OutOfMemory from Standard; + ---C++: inline Create (AnArray : Array2) returns Array2 from TCollection ---Purpose: creates an Array2 by copy of an Array2. raises OutOfMemory from Standard is private ; + ---C++: inline Create (Item : Array2Item; R1, R2, C1, C2: Integer from Standard) returns Array2 from TCollection @@ -73,9 +75,11 @@ is raises RangeError from Standard, OutOfMemory from Standard; + ---C++: inline Init(me : in out; V : Array2Item); ---Purpose: Initializes this array with the value . + ---C++: inline Destroy (me : in out ); ---Level: Advanced @@ -84,6 +88,7 @@ is -- DoubleArray the Destroy doesn't delete the area. -- ---C++: alias ~ + ---C++: inline Assign (me: in out; Other: Array2) returns Array2 from TCollection diff --git a/src/TCollection/TCollection_Array2.gxx b/src/TCollection/TCollection_Array2.gxx index 2d907b8268..059391311a 100755 --- a/src/TCollection/TCollection_Array2.gxx +++ b/src/TCollection/TCollection_Array2.gxx @@ -42,12 +42,7 @@ void TCollection_Array2::Allocate () Standard_RangeError_Raise_if(( RowSize <= 0 || ColumnSize <= 0 ), "TCollection_Array2::Create"); // Modified by Sergey KHROMOV - Mon Feb 10 11:46:15 2003 End -#ifdef __OPTIM_ARRAY - myData = Standard::Allocate(Size*sizeof (Array2Item)); - // myData = (Array2Item *) new char [Size * sizeof (Array2Item)]; -#else myData = new Array2Item [Size]; -#endif if (!myData) Standard_OutOfMemory::Raise("Array2 : Allocation failed"); } @@ -64,84 +59,6 @@ void TCollection_Array2::Allocate () myData = (void*) (q - myLowerRow); } -//======================================================================= -//function : TCollection_Array2 -//purpose : -//======================================================================= - -TCollection_Array2::TCollection_Array2 (const Standard_Integer R1, - const Standard_Integer R2, - const Standard_Integer C1, - const Standard_Integer C2) : - myLowerRow(R1), - myLowerColumn(C1), - myUpperRow(R2), - myUpperColumn(C2), - myDeletable(Standard_True) -{ - Allocate (); -} - -//======================================================================= -//function : TCollection_Array2 -//purpose : User allocated data -//======================================================================= - -TCollection_Array2::TCollection_Array2 (const Array2Item& Item, - const Standard_Integer R1, - const Standard_Integer R2, - const Standard_Integer C1, - const Standard_Integer C2) : - myLowerRow(R1), - myLowerColumn(C1), - myUpperRow(R2), - myUpperColumn(C2), - myDeletable(Standard_False), - myData((void*)&Item) -{ - Allocate (); -} - - -//======================================================================= -//function : Init -//purpose : -//======================================================================= - -void TCollection_Array2::Init (const Array2Item& V) -{ - Standard_Integer Size = RowLength() * ColLength(); - Array2Item* p = &(ChangeValue(myLowerRow,myLowerColumn)); - for (Standard_Integer I = 0; I < Size ; I++) p[I] = V; -} - -//======================================================================= -//function : Destroy -//purpose : -//======================================================================= - -void TCollection_Array2::Destroy () -{ - Array2Item** anItemPtr = ((Array2Item**)myData + myLowerRow); - - // delete the data - // - if (myDeletable) -#ifdef __OPTIM_ARRAY - { - Standard_Integer RowSize = myUpperColumn-myLowerColumn+1; - Standard_Integer ColumnSize = myUpperRow-myLowerRow+1; - Standard_Integer Size = RowSize * ColumnSize; - Standard_Address it = (Standard_Address)&((Array2Item **)myData)[myLowerRow][myLowerColumn]; - Standard::Free(it); - } -#else - delete [] &ChangeValue(myLowerRow,myLowerColumn); -#endif - - // delete the indirection table - Standard::Free((void*&)anItemPtr); -} //======================================================================= //function : Assign diff --git a/src/TCollection/TCollection_Array2.lxx b/src/TCollection/TCollection_Array2.lxx index 2a212ad715..405a2711d3 100755 --- a/src/TCollection/TCollection_Array2.lxx +++ b/src/TCollection/TCollection_Array2.lxx @@ -16,10 +16,79 @@ // purpose or non-infringement. Please see the License for the specific terms // and conditions governing the rights and limitations under the License. +#include #include #include Array2Item_hxx +//======================================================================= +//function : TCollection_Array2 +//purpose : +//======================================================================= + +inline TCollection_Array2::TCollection_Array2 (const Standard_Integer R1, + const Standard_Integer R2, + const Standard_Integer C1, + const Standard_Integer C2) : + myLowerRow(R1), + myLowerColumn(C1), + myUpperRow(R2), + myUpperColumn(C2), + myDeletable(Standard_True) +{ + Allocate (); +} + +//======================================================================= +//function : TCollection_Array2 +//purpose : User allocated data +//======================================================================= + +inline TCollection_Array2::TCollection_Array2 (const Array2Item& Item, + const Standard_Integer R1, + const Standard_Integer R2, + const Standard_Integer C1, + const Standard_Integer C2) : + myLowerRow(R1), + myLowerColumn(C1), + myUpperRow(R2), + myUpperColumn(C2), + myDeletable(Standard_False), + myData((void*)&Item) +{ + Allocate (); +} + +//======================================================================= +//function : Init +//purpose : +//======================================================================= + +inline void TCollection_Array2::Init (const Array2Item& V) +{ + Standard_Integer Size = RowLength() * ColLength(); + Array2Item* p = &(ChangeValue(myLowerRow,myLowerColumn)); + for (Standard_Integer I = 0; I < Size ; I++) p[I] = V; +} + +//======================================================================= +//function : Destroy +//purpose : +//======================================================================= + +inline void TCollection_Array2::Destroy () +{ + Array2Item** anItemPtr = ((Array2Item**)myData + myLowerRow); + + // delete the data + // + if (myDeletable) + delete [] &ChangeValue(myLowerRow,myLowerColumn); + + // delete the indirection table + Standard::Free((void*&)anItemPtr); +} + //======================================================================= //function : ColLength //purpose : diff --git a/src/TCollection/TCollection_HArray1.cdl b/src/TCollection/TCollection_HArray1.cdl index f995bb3d14..194a019c7c 100755 --- a/src/TCollection/TCollection_HArray1.cdl +++ b/src/TCollection/TCollection_HArray1.cdl @@ -57,6 +57,7 @@ is raises RangeError from Standard, OutOfMemory from Standard; + ---C++: inline Create (Low, Up: Integer from Standard; V : ItemHArray1) returns mutable HArray1 from TCollection @@ -65,9 +66,11 @@ is raises RangeError from Standard, OutOfMemory from Standard; + ---C++: inline Init(me : mutable; V : ItemHArray1); ---Purpose: Initialize the array with the value + ---C++: inline Length (me) returns Integer from Standard ---Level: Public diff --git a/src/TCollection/TCollection_HArray1.gxx b/src/TCollection/TCollection_HArray1.gxx index 2a6ffa2365..dacdbc2b10 100755 --- a/src/TCollection/TCollection_HArray1.gxx +++ b/src/TCollection/TCollection_HArray1.gxx @@ -16,45 +16,7 @@ // purpose or non-infringement. Please see the License for the specific terms // and conditions governing the rights and limitations under the License. -#include -#include -#include -#include - - -//======================================================================= -//function : TCollection_HArray1 -//purpose : -//======================================================================= - -TCollection_HArray1::TCollection_HArray1(const Standard_Integer First, - const Standard_Integer Last) : - myArray(First,Last) -{ -} - -//======================================================================= -//function : TCollection_HArray1 -//purpose : -//======================================================================= -TCollection_HArray1::TCollection_HArray1(const Standard_Integer First, - const Standard_Integer Last, - const ItemHArray1& V) : - myArray(First,Last) -{ - myArray.Init(V); -} - - -//======================================================================= -//function : TCollection_HArray1 -//purpose : -//======================================================================= - -void TCollection_HArray1::Init(const ItemHArray1& V) -{ - myArray.Init(V); -} + diff --git a/src/TCollection/TCollection_HArray1.lxx b/src/TCollection/TCollection_HArray1.lxx index 56bd6a43f8..d1b36cc04d 100755 --- a/src/TCollection/TCollection_HArray1.lxx +++ b/src/TCollection/TCollection_HArray1.lxx @@ -19,6 +19,17 @@ // and conditions governing the rights and limitations under the License. +//======================================================================= +//function : TCollection_HArray1 +//purpose : +//======================================================================= + +inline TCollection_HArray1::TCollection_HArray1(const Standard_Integer First, + const Standard_Integer Last) : + myArray(First,Last) +{ +} + //======================================================================= //function : Length //purpose : @@ -29,6 +40,29 @@ inline Standard_Integer TCollection_HArray1::Length () const return myArray.Length(); } +//======================================================================= +//function : TCollection_HArray1 +//purpose : +//======================================================================= +inline TCollection_HArray1::TCollection_HArray1(const Standard_Integer First, + const Standard_Integer Last, + const ItemHArray1& V) : + myArray(First,Last) +{ + myArray.Init(V); +} + + +//======================================================================= +//function : Init +//purpose : +//======================================================================= + +inline void TCollection_HArray1::Init(const ItemHArray1& V) +{ + myArray.Init(V); +} + //======================================================================= //function : Lower //purpose : diff --git a/src/TCollection/TCollection_HArray2.cdl b/src/TCollection/TCollection_HArray2.cdl index d5e6c179c2..e85c412db9 100755 --- a/src/TCollection/TCollection_HArray2.cdl +++ b/src/TCollection/TCollection_HArray2.cdl @@ -58,6 +58,7 @@ is raises RangeError from Standard, OutOfMemory from Standard; + ---C++: inline Create (R1, R2, C1, C2: Integer from Standard; V : ItemHArray2) @@ -68,8 +69,10 @@ is raises RangeError from Standard, OutOfMemory from Standard; + ---C++: inline Init(me : mutable; V : ItemHArray2) ; ---Purpose: Initializes the array with the value + ---C++: inline ColLength (me) returns Integer from Standard ---Purpose: Returns the number of rows of . @@ -102,6 +105,7 @@ is is static ; SetValue (me : mutable; Row, Col: Integer from Standard; + ---C++: inline Value: ItemHArray2) ---Purpose: Assigns the value Value to the (Row,Col) item of this array. ---C++: inline @@ -112,6 +116,7 @@ is ---Level: Public ---Purpose: Returns the value of the element of index ---C++: return const & + ---C++: inline raises OutOfRange from Standard is static; @@ -120,6 +125,7 @@ is ---Level: Public ---Purpose: Returns the value of the element of index ---C++: return & + ---C++: inline raises OutOfRange from Standard is static; diff --git a/src/TCollection/TCollection_HArray2.gxx b/src/TCollection/TCollection_HArray2.gxx index 2fdfa25f7a..27aa1c3165 100755 --- a/src/TCollection/TCollection_HArray2.gxx +++ b/src/TCollection/TCollection_HArray2.gxx @@ -16,45 +16,6 @@ // purpose or non-infringement. Please see the License for the specific terms // and conditions governing the rights and limitations under the License. -#include -#include -#include -#include - -//======================================================================= -//function : TCollection_HArray2 -//purpose : -//======================================================================= - -TCollection_HArray2::TCollection_HArray2 (const Standard_Integer R1, - const Standard_Integer R2, - const Standard_Integer C1, - const Standard_Integer C2) : - myArray(R1,R2,C1,C2) -{} - - -//======================================================================= -//function : TCollection_HArray2 -//purpose : -//======================================================================= - -TCollection_HArray2::TCollection_HArray2 (const Standard_Integer R1, - const Standard_Integer R2, - const Standard_Integer C1, - const Standard_Integer C2, - const ItemHArray2& V) : - myArray(R1,R2,C1,C2) -{myArray.Init(V);} - -//======================================================================= -//function : TCollection_HArray2 -//purpose : -//======================================================================= - -void TCollection_HArray2::Init(const ItemHArray2& V) -{ myArray.Init(V);} - //======================================================================= //function : IsSameState @@ -77,26 +38,3 @@ void TCollection_HArray2::Init(const ItemHArray2& V) // } // return Standard_True; //} - - -//======================================================================= -//function : Value -//purpose : -//======================================================================= - -const ItemHArray2& TCollection_HArray2::Value(const Standard_Integer Row, - const Standard_Integer Col) const -{ - return myArray(Row,Col); -} - -//======================================================================= -//function : ChangeValue -//purpose : -//======================================================================= - -ItemHArray2& TCollection_HArray2::ChangeValue(const Standard_Integer Row, - const Standard_Integer Col) -{ - return myArray(Row,Col); -} diff --git a/src/TCollection/TCollection_HArray2.lxx b/src/TCollection/TCollection_HArray2.lxx index 2ac308ce34..f9207281b4 100755 --- a/src/TCollection/TCollection_HArray2.lxx +++ b/src/TCollection/TCollection_HArray2.lxx @@ -19,6 +19,40 @@ // and conditions governing the rights and limitations under the License. +//======================================================================= +//function : TCollection_HArray2 +//purpose : +//======================================================================= + +inline TCollection_HArray2::TCollection_HArray2 (const Standard_Integer R1, + const Standard_Integer R2, + const Standard_Integer C1, + const Standard_Integer C2) : + myArray(R1,R2,C1,C2) +{} + + +//======================================================================= +//function : TCollection_HArray2 +//purpose : +//======================================================================= + +inline TCollection_HArray2::TCollection_HArray2 (const Standard_Integer R1, + const Standard_Integer R2, + const Standard_Integer C1, + const Standard_Integer C2, + const ItemHArray2& V) : + myArray(R1,R2,C1,C2) +{myArray.Init(V);} + +//======================================================================= +//function : TCollection_HArray2 +//purpose : +//======================================================================= + +inline void TCollection_HArray2::Init(const ItemHArray2& V) +{ myArray.Init(V);} + //======================================================================= //function : ColLength //purpose : @@ -91,6 +125,27 @@ inline void TCollection_HArray2::SetValue ( const Standard_Integer Row, myArray.SetValue(Row,Col,Value); } +//======================================================================= +//function : Value +//purpose : +//======================================================================= + +inline const ItemHArray2& TCollection_HArray2::Value(const Standard_Integer Row, + const Standard_Integer Col) const +{ + return myArray(Row,Col); +} + +//======================================================================= +//function : ChangeValue +//purpose : +//======================================================================= + +inline ItemHArray2& TCollection_HArray2::ChangeValue(const Standard_Integer Row, + const Standard_Integer Col) +{ + return myArray(Row,Col); +} //=======================================================================