Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 18:01:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix bug based on dynamic end of agentList iterator

Browse source
This commit is contained in:
Stephen Birarda 2013-04-25 15:10:08 -07:00
parent 2850d74a84
commit ad530b4eb8
1 changed files with 6 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
libraries/shared/src/AgentList.cpp
View file

@ -37,7 +37,6 @@ const int DOMAINSERVER_PORT = 40102;
bool silentAgentThreadStopFlag = false; bool silentAgentThreadStopFlag = false;
bool domainServerCheckinStopFlag = false; bool domainServerCheckinStopFlag = false;
bool pingUnknownAgentThreadStopFlag = false; bool pingUnknownAgentThreadStopFlag = false;
pthread_mutex_t vectorChangeMutex = PTHREAD_MUTEX_INITIALIZER;
AgentList* AgentList::_sharedInstance = NULL; AgentList* AgentList::_sharedInstance = NULL;
@ -374,7 +373,7 @@ void *removeSilentAgents(void *args) {
while (!silentAgentThreadStopFlag) { while (!silentAgentThreadStopFlag) {
checkTimeUSecs = usecTimestampNow(); checkTimeUSecs = usecTimestampNow();
for(AgentList::iterator agent = agentList->begin(); agent != agentList->end(); agent++) { for(AgentList::iterator agent = agentList->begin(); agent != agentList->end(); ++agent) {
if ((checkTimeUSecs - (*agent).getLastRecvTimeUsecs()) > AGENT_SILENCE_THRESHOLD_USECS if ((checkTimeUSecs - (*agent).getLastRecvTimeUsecs()) > AGENT_SILENCE_THRESHOLD_USECS
&& (*agent).getType() != AGENT_TYPE_VOXEL) { && (*agent).getType() != AGENT_TYPE_VOXEL) {
@ -383,8 +382,6 @@ void *removeSilentAgents(void *args) {
Agent::printLog(*agent); Agent::printLog(*agent);
(*agent).setAlive(false); (*agent).setAlive(false);
} else {
agent++;
} }
} }
@ -480,30 +477,18 @@ AgentList::iterator AgentList::begin() const {
} }
AgentList::iterator AgentList::end() const { AgentList::iterator AgentList::end() const {
Agent** agentBucket = _agentBuckets[(_numAgents - 1) / AGENTS_PER_BUCKET]; return AgentListIterator(this, _numAgents);
for (int i = _numAgents - 1; i >= 0; i--) {
if (i % AGENTS_PER_BUCKET == 0) {
agentBucket = _agentBuckets[i / AGENTS_PER_BUCKET];
}
if (agentBucket[i % AGENTS_PER_BUCKET]->isAlive()) {
return AgentListIterator(this, i + 1);
}
}
return AgentListIterator(this, 0);
} }
AgentListIterator::AgentListIterator(const AgentList* agentList, int agentIndex) : AgentListIterator::AgentListIterator(const AgentList* agentList, int agentIndex) :
_agentIndex(agentIndex) { _agentIndex(agentIndex) {
_agentList = agentList; _agentList = agentList;
} }
AgentListIterator& AgentListIterator::operator=(const AgentListIterator& otherValue) { AgentListIterator& AgentListIterator::operator=(const AgentListIterator& otherValue) {
_agentList = otherValue._agentList; _agentList = otherValue._agentList;
_agentIndex = otherValue._agentIndex; _agentIndex = otherValue._agentIndex;
return (*this); return *this;
} }
bool AgentListIterator::operator==(const AgentListIterator &otherValue) { bool AgentListIterator::operator==(const AgentListIterator &otherValue) {
@ -531,10 +516,10 @@ AgentList::iterator AgentListIterator::operator++(int) {
} }
void AgentListIterator::skipDeadAndStopIncrement() { void AgentListIterator::skipDeadAndStopIncrement() {
while (*this != _agentList->end()) { while (_agentIndex != _agentList->_numAgents) {
++_agentIndex; ++_agentIndex;
if (*this == _agentList->end()) { if (_agentIndex == _agentList->_numAgents) {
break; break;
} else if ((*(*this)).isAlive()) { } else if ((*(*this)).isAlive()) {
// skip over the dead agents // skip over the dead agents