epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

fixed SLL iterator performance

Browse Source
This commit is contained in:
Jeff Hill
2000-11-08 04:33:36 +00:00
parent cb6dfd31d0
commit 2c26c663cb
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/libCom/cxxTemplates/resourceLib.h
View File

@@ -478,7 +478,6 @@ void resTable<T,ID>::traverse (pSetMFArg(pCB)) const
pList = this->pTable;
while ( pList < &this->pTable[this->hashIdMask+1] ) {
tsSLIter<T> pItem ( pList->first () );
while ( pItem.valid () ) {
T * p = & ( *pItem );
(p->*pCB) ();
@@ -594,7 +593,7 @@ resTable<T,ID>::~resTable()
//
template <class T, class ID>
inline resTableIter<T,ID>::resTableIter (const resTable<T,ID> &tableIn) :
iter (tableIn.pTable[0]), index (1), table (tableIn) {}
iter ( tableIn.pTable[0].first () ), index (1), table ( tableIn ) {}
//
// resTableIter<T,ID>::next ()
@@ -602,15 +601,22 @@ inline resTableIter<T,ID>::resTableIter (const resTable<T,ID> &tableIn) :
template <class T, class ID>
inline T * resTableIter<T,ID>::next ()
{
this->iter = this->iter.itemAfter ();
if ( this->iter.valid () ) {
return & ( *this->iter );
T *p = & (*this->iter);
this->iter++;
return p;
}
if ( this->index >= (1u<<this->table.hashIdNBits) ) {
return 0;
while ( true ) {
if ( this->index >= (1u<<this->table.hashIdNBits) ) {
return 0;
}
this->iter = tsSLIter<T> ( this->table.pTable[this->index++].first () );
if ( this->iter.valid () ) {
T *p = & (*this->iter);
this->iter++;
return p;
}
}
this->iter = tsSLIter<T> ( this->table.pTable[this->index++].first () );
return & ( *this->iter );
}
//

8
src/libCom/cxxTemplates/tsSLList.h
View File

@@ -46,7 +46,7 @@
//
template < class T > class tsSLList;
template < class T > class tsSLIter;
template < class T > class tsSLIterRm;
template < class T > class tsSLIterConst;
//
// tsSLNode<T>
@@ -56,7 +56,7 @@ template <class T>
class tsSLNode {
friend class tsSLList < T >;
friend class tsSLIter < T >;
friend class tsSLIterRm < T >;
friend class tsSLIterConst < T >;
public:
tsSLNode ();
void operator = ( const tsSLNode < T > & ) const;
@@ -328,7 +328,7 @@ inline const T * tsSLIterConst<T>::operator -> () const
template < class T >
inline tsSLIterConst<T> tsSLIterConst<T>::operator ++ () // prefix ++
{
tsSLNode < T > *pCurNode = this->pConstEntry;
const tsSLNode < T > *pCurNode = this->pConstEntry;
this->pConstEntry = pCurNode->pNext;
return *this;
}
@@ -426,7 +426,7 @@ inline tsSLIter<T> tsSLIter<T>::operator ++ () // prefix ++
template < class T >
inline tsSLIter<T> tsSLIter<T>::operator ++ (int) // postfix ++
{
tsSLIterConst<T> tmp = *this;
tsSLIter<T> tmp = *this;
this->tsSLIterConst<T>::operator ++ ();
return tmp;
}