TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 02:42:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

changed to nassertv and print_to to ouput

Browse Source
This commit is contained in:
Dave Schuyler 2003-03-18 01:22:17 +00:00
parent 95a59a664c
commit de252b8793
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
panda/src/putil/uniqueIdAllocator.cxx
View File

@ -57,9 +57,9 @@ UniqueIdAllocator(U32 min, U32 max)
: _min(min), _max(max) { : _min(min), _max(max) {
uniqueIdAllocator_debug("UniqueIdAllocator("<<min<<", "<<max<<")"); uniqueIdAllocator_debug("UniqueIdAllocator("<<min<<", "<<max<<")");
_size=_max-_min+1; // +1 because min and max are inclusive. _size=_max-_min+1; // +1 because min and max are inclusive.
assert(_size); // size must be > 0. nassertv(_size); // size must be > 0.
_table=new U32[_size]; _table=new U32[_size];
assert(_table); // This should be redundant if new throws an exception. nassertv(_table); // This should be redundant if new throws an exception.
for (U32 i=0; i<_size; ++i) { for (U32 i=0; i<_size; ++i) {
_table[i]=i+1; _table[i]=i+1;
} }
@ -97,7 +97,7 @@ allocate() {
} }
U32 id=_min+_next_free; U32 id=_min+_next_free;
_next_free=_table[_next_free]; _next_free=_table[_next_free];
assert(_table[id-_min]=-2); // this assignment is debug only. nassertr(_table[id-_min]=-2, -1); // this assignment is debug only.
--_free; --_free;
uniqueIdAllocator_debug("allocate() returning "<<id); uniqueIdAllocator_debug("allocate() returning "<<id);
return id; return id;
@ -113,10 +113,10 @@ allocate() {
void UniqueIdAllocator:: void UniqueIdAllocator::
free(U32 index) { free(U32 index) {
uniqueIdAllocator_debug("free("<<index<<")"); uniqueIdAllocator_debug("free("<<index<<")");
assert(index>=_min); // Attempt to free out-of-range id. nassertv(index>=_min); // Attempt to free out-of-range id.
assert(index<=_max); // Attempt to free out-of-range id. nassertv(index<=_max); // Attempt to free out-of-range id.
index=index-_min; // Convert to _table index. index=index-_min; // Convert to _table index.
assert(_table[index]==-2); // Attempt to free non-allocated id. nassertv(_table[index]==-2); // Attempt to free non-allocated id.
_table[index]=-1; // Mark this element as the end of the list. _table[index]=-1; // Mark this element as the end of the list.
_table[_last_free]=index; _table[_last_free]=index;
if (_next_free==-1) { if (_next_free==-1) {
@ -146,7 +146,7 @@ percent_used() const {
// Description: ...intended for debugging only. // Description: ...intended for debugging only.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void UniqueIdAllocator:: void UniqueIdAllocator::
print_to(ostream& os, bool verbose) const { output(ostream& os, bool verbose) const {
os <<"[_next_free: "<<long(_next_free) os <<"[_next_free: "<<long(_next_free)
<<"; _last_free: "<<long(_last_free) <<"; _last_free: "<<long(_last_free)
<<"; _size: "<<_size <<"; _size: "<<_size

2
panda/src/putil/uniqueIdAllocator.h
View File

@ -36,7 +36,7 @@ PUBLISHED:
U32 allocate(); U32 allocate();
void free(U32 index); void free(U32 index);
float percent_used() const; float percent_used() const;
void print_to(ostream& os, bool verbose=false) const; void output(ostream& os, bool verbose=false) const;
protected: protected:
U32* _table; U32* _table;