From 2e8cb63abb3e3632bc91f35a3b1d72187015bb80 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Fri, 8 Nov 2013 10:47:47 -0800 Subject: [PATCH] add more voxel edit transit time debugging --- .../voxel-server-library/src/VoxelServer.cpp | 28 +++++++++++++++++++ .../src/VoxelServerPacketProcessor.cpp | 19 ++++--------- 2 files changed, 33 insertions(+), 14 deletions(-) diff --git a/libraries/voxel-server-library/src/VoxelServer.cpp b/libraries/voxel-server-library/src/VoxelServer.cpp index 0bafa64a5b..1ce0bcd59d 100644 --- a/libraries/voxel-server-library/src/VoxelServer.cpp +++ b/libraries/voxel-server-library/src/VoxelServer.cpp @@ -608,6 +608,34 @@ void VoxelServer::run() { || packetData[0] == PACKET_TYPE_SET_VOXEL_DESTRUCTIVE || packetData[0] == PACKET_TYPE_ERASE_VOXEL || packetData[0] == PACKET_TYPE_Z_COMMAND)) { + + + const char* messageName; + switch (packetData[0]) { + case PACKET_TYPE_SET_VOXEL: + messageName = "PACKET_TYPE_SET_VOXEL"; + break; + case PACKET_TYPE_SET_VOXEL_DESTRUCTIVE: + messageName = "PACKET_TYPE_SET_VOXEL_DESTRUCTIVE"; + break; + case PACKET_TYPE_ERASE_VOXEL: + messageName = "PACKET_TYPE_ERASE_VOXEL"; + break; + } + int numBytesPacketHeader = numBytesForPacketHeader(packetData); + + if (packetData[0] != PACKET_TYPE_Z_COMMAND) { + unsigned short int sequence = (*((unsigned short int*)(packetData + numBytesPacketHeader))); + uint64_t sentAt = (*((uint64_t*)(packetData + numBytesPacketHeader + sizeof(sequence)))); + uint64_t arrivedAt = usecTimestampNow(); + uint64_t transitTime = arrivedAt - sentAt; + if (wantShowAnimationDebug() || wantsDebugVoxelReceiving()) { + printf("RECEIVE THREAD: got %s - command from client receivedBytes=%ld sequence=%d transitTime=%llu usecs\n", + messageName, + packetLength, sequence, transitTime); + } + } + _voxelServerPacketProcessor->queueReceivedPacket(senderAddress, packetData, packetLength); } else { // let processNodeData handle it. diff --git a/libraries/voxel-server-library/src/VoxelServerPacketProcessor.cpp b/libraries/voxel-server-library/src/VoxelServerPacketProcessor.cpp index a86dead1d0..eb96706f12 100644 --- a/libraries/voxel-server-library/src/VoxelServerPacketProcessor.cpp +++ b/libraries/voxel-server-library/src/VoxelServerPacketProcessor.cpp @@ -44,14 +44,9 @@ void VoxelServerPacketProcessor::processPacket(sockaddr& senderAddress, unsigned uint64_t sentAt = (*((uint64_t*)(packetData + numBytesPacketHeader + sizeof(sequence)))); uint64_t arrivedAt = usecTimestampNow(); uint64_t transitTime = arrivedAt - sentAt; - if (_myServer->wantShowAnimationDebug()) { - printf("got %s - command from client receivedBytes=%ld sequence=%d transitTime=%llu usecs\n", - destructive ? "PACKET_TYPE_SET_VOXEL_DESTRUCTIVE" : "PACKET_TYPE_SET_VOXEL", - packetLength, sequence, transitTime); - } - if (_myServer->wantsDebugVoxelReceiving()) { - printf("got %s - %d command from client receivedBytes=%ld sequence=%d transitTime=%llu usecs\n", + if (_myServer->wantShowAnimationDebug() || _myServer->wantsDebugVoxelReceiving()) { + printf("PROCESSING THREAD: got %s - %d command from client receivedBytes=%ld sequence=%d transitTime=%llu usecs\n", destructive ? "PACKET_TYPE_SET_VOXEL_DESTRUCTIVE" : "PACKET_TYPE_SET_VOXEL", _receivedPacketCount, packetLength, sequence, transitTime); } @@ -122,13 +117,9 @@ void VoxelServerPacketProcessor::processPacket(sockaddr& senderAddress, unsigned uint64_t sentAt = (*((uint64_t*)(packetData + numBytesPacketHeader + sizeof(sequence)))); uint64_t arrivedAt = usecTimestampNow(); uint64_t transitTime = arrivedAt - sentAt; - if (_myServer->wantShowAnimationDebug()) { - printf("got PACKET_TYPE_ERASE_VOXEL - command from client receivedBytes=%ld sequence=%d transitTime=%llu usecs\n", - packetLength, sequence, transitTime); - } - - if (_myServer->wantsDebugVoxelReceiving()) { - printf("got PACKET_TYPE_ERASE_VOXEL - %d command from client receivedBytes=%ld sequence=%d transitTime=%llu usecs\n", + + if (_myServer->wantShowAnimationDebug() || _myServer->wantsDebugVoxelReceiving()) { + printf("PROCESSING THREAD: got PACKET_TYPE_ERASE_VOXEL - %d command from client receivedBytes=%ld sequence=%d transitTime=%llu usecs\n", _receivedPacketCount, packetLength, sequence, transitTime); }