TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-16 00:54:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename all member variables to follow the style guidelines (prefixed with the 'm') - class NetStringTable

Browse source
This commit is contained in:
bank 2014-05-13 16:58:06 +04:00
parent bcb0b8e088
commit d6b003e508
2 changed files with 79 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

144
Engine/source/sim/netStringTable.cpp
View file

@ -31,79 +31,79 @@ NetStringTable *gNetStringTable = NULL;
NetStringTable::NetStringTable() NetStringTable::NetStringTable()
{ {
firstFree = 1; mFirstFree = 1;
firstValid = 1; mFirstValid = 1;
table = (Entry *) dMalloc(sizeof(Entry) * InitialSize); mTable = (Entry *) dMalloc(sizeof(Entry) * InitialSize);
size = InitialSize; mSize = InitialSize;
for(U32 i = 0; i < InitialSize; i++) for(U32 i = 0; i < InitialSize; i++)
{ {
table[i].next = i + 1; mTable[i].next = i + 1;
table[i].refCount = 0; mTable[i].refCount = 0;
table[i].scriptRefCount = 0; mTable[i].scriptRefCount = 0;
} }
table[InitialSize-1].next = InvalidEntry; mTable[InitialSize-1].next = InvalidEntry;
for(U32 j = 0; j < HashTableSize; j++) for(U32 j = 0; j < HashTableSize; j++)
hashTable[j] = 0; mHashTable[j] = 0;
allocator = new DataChunker(DataChunkerSize); mAllocator = new DataChunker(DataChunkerSize);
} }
NetStringTable::~NetStringTable() NetStringTable::~NetStringTable()
{ {
delete allocator; delete mAllocator;
dFree( table ); dFree( mTable );
} }
void NetStringTable::incStringRef(U32 id) void NetStringTable::incStringRef(U32 id)
{ {
AssertFatal(table[id].refCount != 0 || table[id].scriptRefCount != 0 , "Cannot inc ref count from zero."); AssertFatal(mTable[id].refCount != 0 || mTable[id].scriptRefCount != 0 , "Cannot inc ref count from zero.");
table[id].refCount++; mTable[id].refCount++;
} }
void NetStringTable::incStringRefScript(U32 id) void NetStringTable::incStringRefScript(U32 id)
{ {
AssertFatal(table[id].refCount != 0 || table[id].scriptRefCount != 0 , "Cannot inc ref count from zero."); AssertFatal(mTable[id].refCount != 0 || mTable[id].scriptRefCount != 0 , "Cannot inc ref count from zero.");
table[id].scriptRefCount++; mTable[id].scriptRefCount++;
} }
U32 NetStringTable::addString(const char *string) U32 NetStringTable::addString(const char *string)
{ {
U32 hash = _StringTable::hashString(string); U32 hash = _StringTable::hashString(string);
U32 bucket = hash % HashTableSize; U32 bucket = hash % HashTableSize;
for(U32 walk = hashTable[bucket];walk; walk = table[walk].next) for(U32 walk = mHashTable[bucket];walk; walk = mTable[walk].next)
{ {
if(!dStrcmp(table[walk].string, string)) if(!dStrcmp(mTable[walk].string, string))
{ {
table[walk].refCount++; mTable[walk].refCount++;
return walk; return walk;
} }
} }
U32 e = firstFree; U32 e = mFirstFree;
firstFree = table[e].next; mFirstFree = mTable[e].next;
if(firstFree == InvalidEntry) if(mFirstFree == InvalidEntry)
{ {
// in this case, we should expand the table for next time... // in this case, we should expand the table for next time...
U32 newSize = size * 2; U32 newSize = mSize * 2;
table = (Entry *) dRealloc(table, newSize * sizeof(Entry)); mTable = (Entry *) dRealloc(mTable, newSize * sizeof(Entry));
for(U32 i = size; i < newSize; i++) for(U32 i = mSize; i < newSize; i++)
{ {
table[i].next = i + 1; mTable[i].next = i + 1;
table[i].refCount = 0; mTable[i].refCount = 0;
table[i].scriptRefCount = 0; mTable[i].scriptRefCount = 0;
} }
firstFree = size; mFirstFree = mSize;
table[newSize - 1].next = InvalidEntry; mTable[newSize - 1].next = InvalidEntry;
size = newSize; mSize = newSize;
} }
table[e].refCount++; mTable[e].refCount++;
table[e].string = (char *) allocator->alloc(dStrlen(string) + 1); mTable[e].string = (char *) mAllocator->alloc(dStrlen(string) + 1);
dStrcpy(table[e].string, string); dStrcpy(mTable[e].string, string);
table[e].next = hashTable[bucket]; mTable[e].next = mHashTable[bucket];
hashTable[bucket] = e; mHashTable[bucket] = e;
table[e].link = firstValid; mTable[e].link = mFirstValid;
table[firstValid].prevLink = e; mTable[mFirstValid].prevLink = e;
firstValid = e; mFirstValid = e;
table[e].prevLink = 0; mTable[e].prevLink = 0;
return e; return e;
} }
@ -114,75 +114,75 @@ U32 GameAddTaggedString(const char *string)
const char *NetStringTable::lookupString(U32 id) const char *NetStringTable::lookupString(U32 id)
{ {
if(table[id].refCount == 0 && table[id].scriptRefCount == 0) if(mTable[id].refCount == 0 && mTable[id].scriptRefCount == 0)
return NULL; return NULL;
return table[id].string; return mTable[id].string;
} }
void NetStringTable::removeString(U32 id, bool script) void NetStringTable::removeString(U32 id, bool script)
{ {
if(!script) if(!script)
{ {
AssertFatal(table[id].refCount != 0, "Error, ref count is already 0!!"); AssertFatal(mTable[id].refCount != 0, "Error, ref count is already 0!!");
if(--table[id].refCount) if(--mTable[id].refCount)
return; return;
if(table[id].scriptRefCount) if(mTable[id].scriptRefCount)
return; return;
} }
else else
{ {
// If both ref counts are already 0, this id is not valid. Ignore // If both ref counts are already 0, this id is not valid. Ignore
// the remove // the remove
if (table[id].scriptRefCount == 0 && table[id].refCount == 0) if (mTable[id].scriptRefCount == 0 && mTable[id].refCount == 0)
return; return;
if(table[id].scriptRefCount == 0 && table[id].refCount) if(mTable[id].scriptRefCount == 0 && mTable[id].refCount)
{ {
Con::errorf("removeTaggedString failed! Ref count is already 0 for string: %s", table[id].string); Con::errorf("removeTaggedString failed! Ref count is already 0 for string: %s", mTable[id].string);
return; return;
} }
if(--table[id].scriptRefCount) if(--mTable[id].scriptRefCount)
return; return;
if(table[id].refCount) if(mTable[id].refCount)
return; return;
} }
// unlink first: // unlink first:
U32 prev = table[id].prevLink; U32 prev = mTable[id].prevLink;
U32 next = table[id].link; U32 next = mTable[id].link;
if(next) if(next)
table[next].prevLink = prev; mTable[next].prevLink = prev;
if(prev) if(prev)
table[prev].link = next; mTable[prev].link = next;
else else
firstValid = next; mFirstValid = next;
// remove it from the hash table // remove it from the hash table
U32 hash = _StringTable::hashString(table[id].string); U32 hash = _StringTable::hashString(mTable[id].string);
U32 bucket = hash % HashTableSize; U32 bucket = hash % HashTableSize;
for(U32 *walk = &hashTable[bucket];*walk; walk = &table[*walk].next) for(U32 *walk = &mHashTable[bucket];*walk; walk = &mTable[*walk].next)
{ {
if(*walk == id) if(*walk == id)
{ {
*walk = table[id].next; *walk = mTable[id].next;
break; break;
} }
} }
table[id].next = firstFree; mTable[id].next = mFirstFree;
firstFree = id; mFirstFree = id;
} }
void NetStringTable::repack() void NetStringTable::repack()
{ {
DataChunker *newAllocator = new DataChunker(DataChunkerSize); DataChunker *newAllocator = new DataChunker(DataChunkerSize);
for(U32 walk = firstValid; walk; walk = table[walk].link) for(U32 walk = mFirstValid; walk; walk = mTable[walk].link)
{ {
const char *prevStr = table[walk].string; const char *prevStr = mTable[walk].string;
table[walk].string = (char *) newAllocator->alloc(dStrlen(prevStr) + 1); mTable[walk].string = (char *) newAllocator->alloc(dStrlen(prevStr) + 1);
dStrcpy(table[walk].string, prevStr); dStrcpy(mTable[walk].string, prevStr);
} }
delete allocator; delete mAllocator;
allocator = newAllocator; mAllocator = newAllocator;
} }
void NetStringTable::create() void NetStringTable::create()
@ -249,21 +249,21 @@ void NetStringTable::dumpToConsole()
{ {
U32 count = 0; U32 count = 0;
S32 maxIndex = -1; S32 maxIndex = -1;
for ( U32 i = 0; i < size; i++ ) for ( U32 i = 0; i < mSize; i++ )
{ {
if ( table[i].refCount > 0 || table[i].scriptRefCount > 0) if ( mTable[i].refCount > 0 || mTable[i].scriptRefCount > 0)
{ {
Con::printf( "%d: \"%c%s%c\" REF: %d", i, 0x10, table[i].string, 0x11, table[i].refCount ); Con::printf( "%d: \"%c%s%c\" REF: %d", i, 0x10, mTable[i].string, 0x11, mTable[i].refCount );
if ( maxIndex == -1 || table[i].refCount > table[maxIndex].refCount ) if ( maxIndex == -1 || mTable[i].refCount > mTable[maxIndex].refCount )
maxIndex = i; maxIndex = i;
count++; count++;
} }
} }
Con::printf( ">> STRINGS: %d MAX REF COUNT: %d \"%c%s%c\" <<", Con::printf( ">> STRINGS: %d MAX REF COUNT: %d \"%c%s%c\" <<",
count, count,
( maxIndex == -1 ) ? 0 : table[maxIndex].refCount, ( maxIndex == -1 ) ? 0 : mTable[maxIndex].refCount,
0x10, 0x10,
( maxIndex == -1 ) ? "" : table[maxIndex].string, ( maxIndex == -1 ) ? "" : mTable[maxIndex].string,
0x11 ); 0x11 );
} }

14
Engine/source/sim/netStringTable.h
View file

@ -60,14 +60,14 @@ class NetStringTable
U32 prevLink; U32 prevLink;
U32 seq; U32 seq;
}; };
U32 size; U32 mSize;
U32 firstFree; U32 mFirstFree;
U32 firstValid; U32 mFirstValid;
U32 sequenceCount; U32 mSequenceCount;
Entry *table; Entry *mTable;
U32 hashTable[HashTableSize]; U32 mHashTable[HashTableSize];
DataChunker *allocator; DataChunker *mAllocator;
NetStringTable(); NetStringTable();
~NetStringTable(); ~NetStringTable();