Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-22 22:13:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove debug

Browse source
This commit is contained in:
ZappoMan 2014-11-06 13:51:48 -08:00
parent 3c7b06f1d2
commit 90b079d5a8
6 changed files with 0 additions and 91 deletions

3
assignment-client/src/octree/OctreeInboundPacketProcessor.cpp
View file

@ -155,8 +155,6 @@ void OctreeInboundPacketProcessor::processPacket(const SharedNodePointer& sendin
quint64 startLock = usecTimestampNow();
_myServer->getOctree()->lockForWrite();
//qDebug() << "{" << QThread::currentThread() << "} " << "TREE LOCKED FOR EDIT now:" << usecTimestampNow();
quint64 startProcess = usecTimestampNow();
int editDataBytesRead = _myServer->getOctree()->processEditPacketData(packetType,
reinterpret_cast<const unsigned char*>(packet.data()),
@ -168,7 +166,6 @@ void OctreeInboundPacketProcessor::processPacket(const SharedNodePointer& sendin
<< "editDataBytesRead=" << editDataBytesRead;
}
//qDebug() << "{" << QThread::currentThread() << "} " << "TREE UNLOCKED AFTER EDIT now:" << usecTimestampNow();
_myServer->getOctree()->unlock();
quint64 endProcess = usecTimestampNow();

1
assignment-client/src/octree/OctreeQueryNode.cpp
View file

@ -316,7 +316,6 @@ void OctreeQueryNode::updateLastKnownViewFrustum() {
// save that we know the view has been sent.
quint64 now = usecTimestampNow();
setLastTimeBagEmpty(now); // is this what we want? poor names
//qDebug() << "{" << QThread::currentThread() << "} " << " nodeData->setLastTimeBagEmpty() now:" << now;
}

32
assignment-client/src/octree/OctreeSendThread.cpp
View file

@ -344,14 +344,6 @@ int OctreeSendThread::packetDistributor(OctreeQueryNode* nodeData, bool viewFrus
// only set our last sent time if we weren't resetting due to frustum change
quint64 now = usecTimestampNow();
nodeData->setLastTimeBagEmpty(now);
//qDebug() << "{" << QThread::currentThread() << "} " << " OctreeSendThread::packetDistributor().... bag is empty so we must have sent our view";
//qDebug() << "{" << QThread::currentThread() << "} " << " _nodeUUID:" << _nodeUUID;
if (_node->getActiveSocket()) {
//qDebug() << "{" << QThread::currentThread() << "} " << " _node active socket:" << *(_node->getActiveSocket());
} else {
//qDebug() << "{" << QThread::currentThread() << "} " << " _node active socket:" << "????";
}
//qDebug() << "{" << QThread::currentThread() << "} " << " nodeData->setLastTimeBagEmpty() now:" << now;
}
// track completed scenes and send out the stats packet accordingly
@ -458,20 +450,10 @@ int OctreeSendThread::packetDistributor(OctreeQueryNode* nodeData, bool viewFrus
quint64 lockWaitStart = usecTimestampNow();
_myServer->getOctree()->lockForRead();
//qDebug() << "{" << QThread::currentThread() << "} " << "TREE LOCKED FOR READ now:" << usecTimestampNow();
quint64 lockWaitEnd = usecTimestampNow();
lockWaitElapsedUsec = (float)(lockWaitEnd - lockWaitStart);
quint64 encodeStart = usecTimestampNow();
//qDebug() << "{" << QThread::currentThread() << "} " << " OctreeSendThread::packetDistributor()....";
//qDebug() << "{" << QThread::currentThread() << "} " << " _nodeUUID:" << _nodeUUID;
AACube subTreeCube = subTree->getAACube();
subTreeCube.scale((float)TREE_SCALE);
//qDebug() << "{" << QThread::currentThread() << "} " << " subTree:" << subTreeCube;
//qDebug() << "{" << QThread::currentThread() << "} " << " subTree->getLastChanged():" << subTree->getLastChanged();
bytesWritten = _myServer->getOctree()->encodeTreeBitstream(subTree, &_packetData, nodeData->elementBag, params);
quint64 encodeEnd = usecTimestampNow();
@ -482,18 +464,6 @@ int OctreeSendThread::packetDistributor(OctreeQueryNode* nodeData, bool viewFrus
// the packet and send it
completedScene = nodeData->elementBag.isEmpty();
//qDebug() << "{" << QThread::currentThread() << "} " << " OctreeSendThread::packetDistributor()....";
//qDebug() << "{" << QThread::currentThread() << "} " << " _nodeUUID:" << _nodeUUID;
if (_node->getActiveSocket()) {
//qDebug() << "{" << QThread::currentThread() << "} " << " _node active socket:" << *(_node->getActiveSocket());
} else {
//qDebug() << "{" << QThread::currentThread() << "} " << " _node active socket:" << "????";
}
//qDebug() << "{" << QThread::currentThread() << "} " << " params.lastViewFrustumSent:" << params.lastViewFrustumSent;
//qDebug() << "{" << QThread::currentThread() << "} " << " params.stopReason:" << params.getStopReason();
//qDebug() << "{" << QThread::currentThread() << "} " << " bytesWritten:" << bytesWritten;
//qDebug() << "{" << QThread::currentThread() << "} " << " completedScene:" << completedScene;
// if we're trying to fill a full size packet, then we use this logic to determine if we have a DIDNT_FIT case.
if (_packetData.getTargetSize() == MAX_OCTREE_PACKET_DATA_SIZE) {
if (_packetData.hasContent() && bytesWritten == 0 &&
@ -511,7 +481,6 @@ int OctreeSendThread::packetDistributor(OctreeQueryNode* nodeData, bool viewFrus
}
nodeData->stats.encodeStopped();
//qDebug() << "{" << QThread::currentThread() << "} " << "TREE UNLOCKED AFTER READ now:" << usecTimestampNow();
_myServer->getOctree()->unlock();
} else {
// If the bag was empty then we didn't even attempt to encode, and so we know the bytesWritten were 0
@ -628,7 +597,6 @@ int OctreeSendThread::packetDistributor(OctreeQueryNode* nodeData, bool viewFrus
// if after sending packets we've emptied our bag, then we want to remember that we've sent all
// the voxels from the current view frustum
if (nodeData->elementBag.isEmpty()) {
//qDebug() << "{" << QThread::currentThread() << "} " << " nodeData->updateLastKnownViewFrustum()";
nodeData->updateLastKnownViewFrustum();
nodeData->setViewSent(true);
nodeData->map.erase(); // It would be nice if we could save this, and only reset it when the view frustum changes

1
libraries/entities/src/EntityTree.cpp
View file

@ -555,7 +555,6 @@ void EntityTree::releaseSceneEncodeData(OctreeElementExtraEncodeData* extraEncod
EntityTreeElementExtraEncodeData* thisExtraEncodeData = static_cast<EntityTreeElementExtraEncodeData*>(extraData);
delete thisExtraEncodeData;
}
//qDebug() << "{" << QThread::currentThread() << "} " << "EntityTree::releaseSceneEncodeData()... now:" << usecTimestampNow();
extraEncodeData->clear();
}

40
libraries/entities/src/EntityTreeElement.cpp
View file

@ -94,7 +94,6 @@ void EntityTreeElement::initializeExtraEncodeData(EncodeBitstreamParams& params)
// TODO: some of these inserts might be redundant!!!
extraEncodeData->insert(this, entityTreeElementExtraEncodeData);
//qDebug() << "{" << QThread::currentThread() << "} " << " STORING extraEncodeData->insert(this...) --- STORING EXTRA DATA....";
}
}
@ -240,12 +239,6 @@ void EntityTreeElement::elementEncodeComplete(EncodeBitstreamParams& params, Oct
OctreeElement::AppendState EntityTreeElement::appendElementData(OctreePacketData* packetData,
EncodeBitstreamParams& params) const {
//qDebug() << "{" << QThread::currentThread() << "} " << " TOP OF appendElementData()";
AACube elementCube = getAACube();
elementCube.scale(TREE_SCALE);
//qDebug() << "{" << QThread::currentThread() << "} " << " elementCube:" << elementCube;
//qDebug() << "{" << QThread::currentThread() << "} " << " getLastChanged():" << getLastChanged();
OctreeElement::AppendState appendElementState = OctreeElement::COMPLETED; // assume the best...
// first, check the params.extraEncodeData to see if there's any partial re-encode data for this element
@ -255,9 +248,7 @@ OctreeElement::AppendState EntityTreeElement::appendElementData(OctreePacketData
if (extraEncodeData && extraEncodeData->contains(this)) {
entityTreeElementExtraEncodeData = static_cast<EntityTreeElementExtraEncodeData*>(extraEncodeData->value(this));
hadElementExtraData = true;
//qDebug() << "{" << QThread::currentThread() << "} " << " extraEncodeData->contains(this) --- USING PREVIOUS EXTRA DATA....";
} else {
//qDebug() << "{" << QThread::currentThread() << "} " << " NOT extraEncodeData->contains(this) --- CREATING NEW EXTRA DATA....";
// if there wasn't one already, then create one
entityTreeElementExtraEncodeData = new EntityTreeElementExtraEncodeData();
entityTreeElementExtraEncodeData->elementCompleted = (_entityItems->size() == 0);
@ -291,8 +282,6 @@ OctreeElement::AppendState EntityTreeElement::appendElementData(OctreePacketData
uint16_t actualNumberOfEntities = 0;
QVector<uint16_t> indexesOfEntitiesToInclude;
//qDebug() << "{" << QThread::currentThread() << "} " << " entityTreeElementExtraEncodeData->elementCompleted:" << entityTreeElementExtraEncodeData->elementCompleted;
// It's possible that our element has been previous completed. In this case we'll simply not include any of our
// entities for encoding. This is needed because we encode the element data at the "parent" level, and so we
// need to handle the case where our sibling elements need encoding but we don't.
@ -301,24 +290,7 @@ OctreeElement::AppendState EntityTreeElement::appendElementData(OctreePacketData
EntityItem* entity = (*_entityItems)[i];
bool includeThisEntity = true;
bool ignoreFromLastEdit = (entity->getLastEdited() < params.lastViewFrustumSent);
bool ignoreFromChangeOnServer = (entity->getLastChangedOnServer() < params.lastViewFrustumSent);
if (ignoreFromChangeOnServer != ignoreFromLastEdit) {
qDebug() << "{" << QThread::currentThread() << "} " << "IGNORE MISMATCH!!";
qDebug() << "{" << QThread::currentThread() << "} " << "IGNORE based on getLastEdited():" << ignoreFromLastEdit;
qDebug() << "{" << QThread::currentThread() << "} " << "IGNORE based on getLastChangedOnServer():" << ignoreFromChangeOnServer;
qDebug() << "{" << QThread::currentThread() << "} " << "getLastEdited():" << entity->getLastEdited();
qDebug() << "{" << QThread::currentThread() << "} " << "getLastChangedOnServer():" << entity->getLastChangedOnServer();
qDebug() << "{" << QThread::currentThread() << "} " << "params.lastViewFrustumSent:" << params.lastViewFrustumSent;
} else {
//qDebug() << "{" << QThread::currentThread() << "} " << "IGNORE MATCH!! - " << ignoreFromLastEdit;
}
if (!params.forceSendScene && entity->getLastChangedOnServer() < params.lastViewFrustumSent) {
//qDebug() << "{" << QThread::currentThread() << "} " << " ignore this entity cause it hasn't changed i:" << i;
//qDebug() << "{" << QThread::currentThread() << "} " << " entity->getLastEdited():" << entity->getLastEdited();
//qDebug() << "{" << QThread::currentThread() << "} " << " params.lastViewFrustumSent:" << params.lastViewFrustumSent;
includeThisEntity = false;
}
@ -343,7 +315,6 @@ OctreeElement::AppendState EntityTreeElement::appendElementData(OctreePacketData
if (includeThisEntity) {
indexesOfEntitiesToInclude << i;
numberOfEntities++;
//qDebug() << "{" << QThread::currentThread() << "} " << " indexesOfEntitiesToInclude << i:" << i;
}
}
}
@ -351,18 +322,12 @@ OctreeElement::AppendState EntityTreeElement::appendElementData(OctreePacketData
int numberOfEntitiesOffset = packetData->getUncompressedByteOffset();
bool successAppendEntityCount = packetData->appendValue(numberOfEntities);
//qDebug() << "{" << QThread::currentThread() << "} " << " numberOfEntities:" << numberOfEntities;
//qDebug() << "{" << QThread::currentThread() << "} " << " successAppendEntityCount:" << successAppendEntityCount;
if (successAppendEntityCount) {
foreach (uint16_t i, indexesOfEntitiesToInclude) {
EntityItem* entity = (*_entityItems)[i];
LevelDetails entityLevel = packetData->startLevel();
//qDebug() << "{" << QThread::currentThread() << "} " << "CALLING entity->appendEntityData()...";
//qDebug() << "{" << QThread::currentThread() << "} " << " entity->getEntityItemID():" << entity->getEntityItemID();
//qDebug() << "{" << QThread::currentThread() << "} " << " entity->getLastEdited():" << entity->getLastEdited();
OctreeElement::AppendState appendEntityState = entity->appendEntityData(packetData,
params, entityTreeElementExtraEncodeData);
@ -412,9 +377,6 @@ OctreeElement::AppendState EntityTreeElement::appendElementData(OctreePacketData
} else {
// TODO: some of these inserts might be redundant!!!
extraEncodeData->insert(this, entityTreeElementExtraEncodeData);
//qDebug() << "{" << QThread::currentThread() << "} " << " STORING extraEncodeData->insert(this...) --- STORING EXTRA DATA....";
}
} else {
@ -423,13 +385,11 @@ OctreeElement::AppendState EntityTreeElement::appendElementData(OctreePacketData
// If all of our items have been encoded, then we are complete as an element.
if (entityTreeElementExtraEncodeData->entities.size() == 0) {
entityTreeElementExtraEncodeData->elementCompleted = true;
//qDebug() << "{" << QThread::currentThread() << "} " << " MARKING ENTITY AS DONE .... entityTreeElementExtraEncodeData->elementCompleted = true.... now:" << usecTimestampNow();
}
}
// TODO: some of these inserts might be redundant!!!
extraEncodeData->insert(this, entityTreeElementExtraEncodeData);
//qDebug() << "{" << QThread::currentThread() << "} " << " STORING extraEncodeData->insert(this...) --- STORING EXTRA DATA....";
}
}

14
libraries/octree/src/Octree.cpp
View file

@ -1088,9 +1088,6 @@ int Octree::encodeTreeBitstream(OctreeElement* element,
if (suppressEmptySubtrees() && params.includeColor && childBytesWritten == 2) {
childBytesWritten = 0;
//params.stopReason = EncodeBitstreamParams::UNKNOWN; // possibly should be DIDNT_FIT...
//qDebug() << "{" << QThread::currentThread() << "} " << "EncodeBitstreamParams::UNKNOWN???? line:" << __LINE__;
}
// if we wrote child bytes, then return our result of all bytes written
@ -1100,7 +1097,6 @@ int Octree::encodeTreeBitstream(OctreeElement* element,
// otherwise... if we didn't write any child bytes, then pretend like we also didn't write our octal code
bytesWritten = 0;
//params.stopReason = EncodeBitstreamParams::DIDNT_FIT;
//qDebug() << "{" << QThread::currentThread() << "} " << "EncodeBitstreamParams::UNKNOWN???? line:" << __LINE__;
}
if (bytesWritten == 0) {
@ -1236,9 +1232,6 @@ int Octree::encodeTreeBitstreamRecursion(OctreeElement* element,
if (params.stats) {
params.stats->skippedNoChange(element);
}
//qDebug() << "{" << QThread::currentThread() << "} " << "params.stopReason = EncodeBitstreamParams::NO_CHANGE ... ";
//qDebug() << "{" << QThread::currentThread() << "} " << " params.lastViewFrustumSent:" << params.lastViewFrustumSent;
//qDebug() << "{" << QThread::currentThread() << "} " << " element->getLastChanged():" << element->getLastChanged();
params.stopReason = EncodeBitstreamParams::NO_CHANGE;
return bytesAtThisLevel;
}
@ -1529,12 +1522,6 @@ int Octree::encodeTreeBitstreamRecursion(OctreeElement* element,
// to be completed.
LevelDetails childDataLevelKey = packetData->startLevel();
//qDebug() << "{" << QThread::currentThread() << "} " << "appendElementData()";
AACube childElementCube = childElement->getAACube();
childElementCube.scale(TREE_SCALE);
//qDebug() << "{" << QThread::currentThread() << "} " << " childElementCube:" << childElementCube;
//qDebug() << "{" << QThread::currentThread() << "} " << " childElement->getLastChanged():" << childElement->getLastChanged();
OctreeElement::AppendState childAppendState = childElement->appendElementData(packetData, params);
// allow our tree subclass to do any additional bookkeeping it needs to do with encoded data state
@ -1886,7 +1873,6 @@ int Octree::encodeTreeBitstreamRecursion(OctreeElement* element,
element->elementEncodeComplete(params, &bag);
}
//qDebug() << "{" << QThread::currentThread() << "} " << "got to bottom... didn't set stopReason...";
return bytesAtThisLevel;
}