From 5af52df55823cf3332895bad6e62000098ce9b10 Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Mon, 27 Oct 2014 12:11:07 -0700 Subject: [PATCH] Put some debugging in to track down a streaming crash. --- assignment-client/src/metavoxels/MetavoxelServer.cpp | 5 +++++ libraries/metavoxels/src/MetavoxelClientManager.cpp | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/assignment-client/src/metavoxels/MetavoxelServer.cpp b/assignment-client/src/metavoxels/MetavoxelServer.cpp index 81e86dbf11..43fd5f5c16 100644 --- a/assignment-client/src/metavoxels/MetavoxelServer.cpp +++ b/assignment-client/src/metavoxels/MetavoxelServer.cpp @@ -223,7 +223,11 @@ void MetavoxelSession::update() { _sender->getData().writeDelta(sendRecord->getData(), sendRecord->getLOD(), out, _lod); out.flush(); int end = _sequencer.getOutputStream().getUnderlying().device()->pos(); + QDebug debug = qDebug() << "from" << sendRecord->getLOD().position.x << sendRecord->getLOD().position.y << sendRecord->getLOD().position.z << "to" << + _lod.position.x << _lod.position.y << _lod.position.z << _lodPacketNumber << (_sequencer.getOutgoingPacketNumber() + 1); if (end > _sequencer.getMaxPacketSize()) { + debug << "reliable" << (_reliableDeltaID + 1); + // we need to send the delta on the reliable channel _reliableDeltaChannel = _sequencer.getReliableOutputChannel(RELIABLE_DELTA_CHANNEL_INDEX); _reliableDeltaChannel->startMessage(); @@ -242,6 +246,7 @@ void MetavoxelSession::update() { _sequencer.endPacket(); } else { + debug << "unreliable"; _sequencer.endPacket(); } diff --git a/libraries/metavoxels/src/MetavoxelClientManager.cpp b/libraries/metavoxels/src/MetavoxelClientManager.cpp index cc5d7ef29d..af83fdc869 100644 --- a/libraries/metavoxels/src/MetavoxelClientManager.cpp +++ b/libraries/metavoxels/src/MetavoxelClientManager.cpp @@ -297,7 +297,10 @@ void MetavoxelClient::writeUpdateMessage(Bitstream& out) { void MetavoxelClient::handleMessage(const QVariant& message, Bitstream& in) { int userType = message.userType(); if (userType == MetavoxelDeltaMessage::Type) { - if (_reliableDeltaChannel) { + if (_reliableDeltaChannel) { + qDebug() << "from" << _remoteDataLOD.position.x << _remoteDataLOD.position.y << _remoteDataLOD.position.z << + "to" << _reliableDeltaLOD.position.x << _reliableDeltaLOD.position.y << _reliableDeltaLOD.position.z << + _sequencer.getIncomingPacketNumber() << "reliable" << _reliableDeltaID; MetavoxelData reference = _remoteData; MetavoxelLOD referenceLOD = _remoteDataLOD; _remoteData.readDelta(reference, referenceLOD, in, _remoteDataLOD = _reliableDeltaLOD); @@ -307,6 +310,9 @@ void MetavoxelClient::handleMessage(const QVariant& message, Bitstream& in) { } else { PacketRecord* receiveRecord = getLastAcknowledgedReceiveRecord(); + qDebug() << "from" << receiveRecord->getLOD().position.x << receiveRecord->getLOD().position.y << receiveRecord->getLOD().position.z << + "to" << getLastAcknowledgedSendRecord()->getLOD().position.x << getLastAcknowledgedSendRecord()->getLOD().position.y << getLastAcknowledgedSendRecord()->getLOD().position.z << + _sequencer.getIncomingPacketNumber() << "unreliable"; _remoteData.readDelta(receiveRecord->getData(), receiveRecord->getLOD(), in, _remoteDataLOD = getLastAcknowledgedSendRecord()->getLOD()); in.reset();