Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-16 00:36:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

re-apply agentlist changes to voxel server that somehow got smashed

Browse source
This commit is contained in:
ZappoMan 2013-04-26 12:36:25 -07:00
parent 88039e6dac
commit 3cb41a6fa6
1 changed files with 8 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
voxel-server/src/main.cpp
View file

@ -122,30 +122,22 @@ void eraseVoxelTreeAndCleanupAgentVisitData() {
::randomTree.eraseAllVoxels(); ::randomTree.eraseAllVoxels();
// enumerate the agents clean up their marker nodes // enumerate the agents clean up their marker nodes
for (int i = 0; i < AgentList::getInstance()->getAgents().size(); i++) {
for (AgentList::iterator agent = AgentList::getInstance()->begin(); agent != AgentList::getInstance()->end(); agent++) {
//printf("eraseVoxelTreeAndCleanupAgentVisitData() agent[%d]\n",i); //printf("eraseVoxelTreeAndCleanupAgentVisitData() agent[%d]\n",i);
Agent *thisAgent = (Agent *)&AgentList::getInstance()->getAgents()[i]; VoxelAgentData *agentData = (VoxelAgentData *)agent->getLinkedData();
VoxelAgentData *agentData = (VoxelAgentData *)(thisAgent->getLinkedData());
// lock this agent's delete mutex so that the delete thread doesn't
// kill the agent while we are working with it
pthread_mutex_lock(thisAgent->deleteMutex);
// clean up the agent visit data // clean up the agent visit data
delete agentData->rootMarkerNode; delete agentData->rootMarkerNode;
agentData->rootMarkerNode = new MarkerNode(); agentData->rootMarkerNode = new MarkerNode();
// unlock the delete mutex so the other thread can
// kill the agent if it has dissapeared
pthread_mutex_unlock(thisAgent->deleteMutex);
} }
} }
void *distributeVoxelsToListeners(void *args) { void* distributeVoxelsToListeners(void *args) {
AgentList *agentList = AgentList::getInstance(); AgentList* agentList = AgentList::getInstance();
timeval lastSendTime; timeval lastSendTime;
unsigned char *stopOctal; unsigned char *stopOctal;
@ -159,15 +151,8 @@ void *distributeVoxelsToListeners(void *args) {
gettimeofday(&lastSendTime, NULL); gettimeofday(&lastSendTime, NULL);
// enumerate the agents to send 3 packets to each // enumerate the agents to send 3 packets to each
for (int i = 0; i < agentList->getAgents().size(); i++) { for (AgentList::iterator agent = agentList->begin(); agent != agentList->end(); agent++) {
VoxelAgentData* agentData = (VoxelAgentData*)agent->getLinkedData();
Agent* thisAgent = (Agent *)&agentList->getAgents()[i];
// lock this agent's delete mutex so that the delete thread doesn't
// kill the agent while we are working with it
pthread_mutex_lock(thisAgent->deleteMutex);
VoxelAgentData* agentData = (VoxelAgentData *)(thisAgent->getLinkedData());
// If we don't have nodes already in our agent's node bag, then fill the node bag // If we don't have nodes already in our agent's node bag, then fill the node bag
if (agentData->nodeBag.isEmpty()) { if (agentData->nodeBag.isEmpty()) {
@ -292,10 +277,6 @@ void *distributeVoxelsToListeners(void *args) {
agentData->rootMarkerNode = new MarkerNode(); agentData->rootMarkerNode = new MarkerNode();
} }
***/ ***/
// unlock the delete mutex so the other thread can
// kill the agent if it has dissapeared
pthread_mutex_unlock(thisAgent->deleteMutex);
} }
// dynamically sleep until we need to fire off the next set of voxels // dynamically sleep until we need to fire off the next set of voxels
@ -320,7 +301,7 @@ void attachVoxelAgentDataToAgent(Agent *newAgent) {
int main(int argc, const char * argv[]) int main(int argc, const char * argv[])
{ {
AgentList *agentList = AgentList::createInstance(AGENT_TYPE_VOXEL, VOXEL_LISTEN_PORT); AgentList* agentList = AgentList::createInstance(AGENT_TYPE_VOXEL, VOXEL_LISTEN_PORT);
setvbuf(stdout, NULL, _IOLBF, 0); setvbuf(stdout, NULL, _IOLBF, 0);
// Handle Local Domain testing with the --local command line // Handle Local Domain testing with the --local command line