From f1da6bf90b6a6978140c0702aa475a3a75c1ed54 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Thu, 2 Jan 2014 15:58:03 -0800 Subject: [PATCH 1/5] fix various compiler warnings on gcc --- interface/src/VoxelHideShowThread.cpp | 2 +- interface/src/starfield/Controller.cpp | 2 +- interface/src/starfield/Generator.cpp | 2 +- .../octree/src/OctreeEditPacketSender.cpp | 6 +- libraries/particles/src/Particle.cpp | 14 +-- libraries/shared/src/PacketSender.cpp | 85 ------------------- 6 files changed, 10 insertions(+), 101 deletions(-) diff --git a/interface/src/VoxelHideShowThread.cpp b/interface/src/VoxelHideShowThread.cpp index eba4e36a86..26a27bab52 100644 --- a/interface/src/VoxelHideShowThread.cpp +++ b/interface/src/VoxelHideShowThread.cpp @@ -33,7 +33,7 @@ bool VoxelHideShowThread::process() { bool showExtraDebugging = Application::getInstance()->getLogger()->extraDebugging(); if (showExtraDebugging && elapsed > USECS_PER_FRAME) { - printf("VoxelHideShowThread::process()... checkForCulling took %llu\n", elapsed); + qDebug() << "VoxelHideShowThread::process()... checkForCulling took " << elapsed << "\n"; } if (isStillRunning()) { diff --git a/interface/src/starfield/Controller.cpp b/interface/src/starfield/Controller.cpp index 2ce2a071cb..114df79697 100755 --- a/interface/src/starfield/Controller.cpp +++ b/interface/src/starfield/Controller.cpp @@ -19,7 +19,7 @@ bool Controller::computeStars(unsigned numStars, unsigned seed) { this->retile(numStars, _tileResolution); - qDebug("Total time to generate stars: %llu msec\n", (usecTimestampNow() - usecTimestamp(&startTime)) / 1000); + qDebug() << "Total time to generate stars: " << (usecTimestampNow() - usecTimestamp(&startTime)) / 1000) << " msec\n"; return true; } diff --git a/interface/src/starfield/Generator.cpp b/interface/src/starfield/Generator.cpp index d8d38a61a6..becddb1b00 100644 --- a/interface/src/starfield/Generator.cpp +++ b/interface/src/starfield/Generator.cpp @@ -62,7 +62,7 @@ void Generator::computeStarPositions(InputVertices& destination, unsigned limit, vertices->push_back(InputVertex(azimuth, altitude, computeStarColor(STAR_COLORIZATION))); } - qDebug("Took %llu msec to generate stars.\n", (usecTimestampNow() - usecTimestamp(&startTime)) / 1000); + qDebug() << "Total time to generate stars: " << (usecTimestampNow() - usecTimestamp(&startTime)) / 1000) << " msec\n"; } // computeStarColor diff --git a/libraries/octree/src/OctreeEditPacketSender.cpp b/libraries/octree/src/OctreeEditPacketSender.cpp index 4ae454ef0b..9f7978c342 100644 --- a/libraries/octree/src/OctreeEditPacketSender.cpp +++ b/libraries/octree/src/OctreeEditPacketSender.cpp @@ -100,8 +100,10 @@ void OctreeEditPacketSender::queuePacketToNode(const QUuid& nodeUUID, unsigned c uint64_t createdAt = (*((uint64_t*)(buffer + numBytesPacketHeader + sizeof(sequence)))); uint64_t queuedAt = usecTimestampNow(); uint64_t transitTime = queuedAt - createdAt; - printf("OctreeEditPacketSender::queuePacketToNode() queued %c - command to node bytes=%ld sequence=%d transitTimeSoFar=%llu usecs\n", - buffer[0], length, sequence, transitTime); + qDebug() << "OctreeEditPacketSender::queuePacketToNode() queued " << buffer[0] << + " - command to node bytes=" << length << + " sequence=" << sequence << + " transitTimeSoFar=" << transitTime << " usecs\n"; } } } diff --git a/libraries/particles/src/Particle.cpp b/libraries/particles/src/Particle.cpp index d07f5a7889..edca3a1fc0 100644 --- a/libraries/particles/src/Particle.cpp +++ b/libraries/particles/src/Particle.cpp @@ -458,9 +458,9 @@ void Particle::adjustEditPacketForClockSkew(unsigned char* codeColorBuffer, ssiz const bool wantDebug = false; if (wantDebug) { qDebug("Particle::adjustEditPacketForClockSkew()...\n"); - qDebug(" lastEditedInLocalTime: %llu\n", lastEditedInLocalTime); - qDebug(" clockSkew: %d\n", clockSkew); - qDebug(" lastEditedInServerTime: %llu\n", lastEditedInServerTime); + qDebug() << " lastEditedInLocalTime: " << lastEditedInLocalTime << "\n"; + qDebug() << " clockSkew: " << clockSkew << "\n"; + qDebug() << " lastEditedInServerTime: " << lastEditedInServerTime << "\n"; } } @@ -481,14 +481,6 @@ void Particle::update() { bool shouldDie = getShouldDie() || (!isInHand && !isStillMoving && isReallyOld); setShouldDie(shouldDie); - const bool wantDebug = false; - if (wantDebug) { - printf("Particle::update()... timeElapsed: %f lifeTime:%f editedAgo:%f " - "isInHand:%s isStillMoveing:%s isReallyOld:%s shouldDie:%s\n", - timeElapsed, getLifetime(), getEditedAgo(), debug::valueOf(isInHand), debug::valueOf(isStillMoving), - debug::valueOf(isReallyOld), debug::valueOf(shouldDie)); - } - runUpdateScript(); // allow the javascript to alter our state // If the ball is in hand, it doesn't move or have gravity effect it diff --git a/libraries/shared/src/PacketSender.cpp b/libraries/shared/src/PacketSender.cpp index 08049a9904..a17bc2cfc6 100644 --- a/libraries/shared/src/PacketSender.cpp +++ b/libraries/shared/src/PacketSender.cpp @@ -41,11 +41,9 @@ PacketSender::PacketSender(PacketSenderNotify* notify, int packetsPerSecond) : _totalPacketsQueued(0), _totalBytesQueued(0) { - //printf("PacketSender[%p] created... \n", this); } PacketSender::~PacketSender() { - //printf("PacketSender::~PacketSender[%p] destroyed... \n", this); } @@ -139,11 +137,6 @@ bool PacketSender::nonThreadedProcess() { const uint64_t USECS_PER_SECOND = 1000 * 1000; const float ZERO_RESET_CALLS_PER_SECOND = 1; // used in guard against divide by zero - bool wantDebugging = false; - if (wantDebugging) { - printf("\n\nPacketSender::nonThreadedProcess() _packets.size()=%ld\n",_packets.size()); - } - // keep track of our process call times, so we have a reliable account of how often our caller calls us uint64_t elapsedSinceLastCall = now - _lastProcessCallTime; _lastProcessCallTime = now; @@ -153,24 +146,10 @@ bool PacketSender::nonThreadedProcess() { const int TRUST_AVERAGE_AFTER = AVERAGE_CALL_TIME_SAMPLES * 2; if (_usecsPerProcessCallHint == 0 || _averageProcessCallTime.getSampleCount() > TRUST_AVERAGE_AFTER) { averageCallTime = _averageProcessCallTime.getAverage(); - - if (wantDebugging) { - printf("averageCallTime = _averageProcessCallTime.getAverage() =%f\n",averageCallTime); - } - } else { averageCallTime = _usecsPerProcessCallHint; - - if (wantDebugging) { - printf("averageCallTime = _usecsPerProcessCallHint =%f\n",averageCallTime); - } - } - if (wantDebugging) { - printf("elapsedSinceLastCall=%llu averageCallTime=%f\n",elapsedSinceLastCall, averageCallTime); - } - if (_packets.size() == 0) { // in non-threaded mode, if there's nothing to do, just return, keep running till they terminate us return isStillRunning(); @@ -202,25 +181,15 @@ bool PacketSender::nonThreadedProcess() { // packets per second send rate. float callsPerSecond = USECS_PER_SECOND / averageCallTime; - if (wantDebugging) { - printf("PacketSender::process() USECS_PER_SECOND=%llu averageCallTime=%f callsPerSecond=%f\n", - USECS_PER_SECOND, averageCallTime, callsPerSecond ); - } - // theoretically we could get called less than 1 time per second... but since we're using floats, it really shouldn't be // possible to get 0 calls per second, but we will guard agains that here, just in case. if (callsPerSecond == 0) { callsPerSecond = ZERO_RESET_CALLS_PER_SECOND; - qDebug("PacketSender::nonThreadedProcess() UNEXPECTED:callsPerSecond==0, assuming ZERO_RESET_CALLS_PER_SECOND\n"); } // This is the average number of packets per call... averagePacketsPerCall = _packetsPerSecond / callsPerSecond; packetsToSendThisCall = averagePacketsPerCall; - if (wantDebugging) { - printf("PacketSender::process() averageCallTime=%f averagePacketsPerCall=%f packetsToSendThisCall=%d\n", - averageCallTime, averagePacketsPerCall, packetsToSendThisCall); - } // if we get called more than 1 per second, we want to mostly divide the packets evenly across the calls... // but we want to track the remainder and make sure over the course of a second, we are sending the target PPS @@ -252,83 +221,33 @@ bool PacketSender::nonThreadedProcess() { // than 5 times per second) This gives us sufficient smoothing in our packet adjustments float callIntervalsPerReset = fmax(callsPerSecond, MIN_CALL_INTERVALS_PER_RESET); - if (wantDebugging) { - printf("about to check interval... callsPerSecond=%f elapsedSinceLastPPSCheck=%llu checkInterval=%f\n", - callsPerSecond, elapsedSinceLastCheck, (averageCallTime * CALL_INTERVALS_TO_CHECK)); - } - if (elapsedSinceLastCheck > (averageCallTime * CALL_INTERVALS_TO_CHECK)) { - - if (wantDebugging) { - printf(">>>>>>>>>>>>>>> check interval... _packetsOverCheckInterval=%d elapsedSinceLastPPSCheck=%llu\n", - _packetsOverCheckInterval, elapsedSinceLastCheck); - } - float ppsOverCheckInterval = (float)_packetsOverCheckInterval; float ppsExpectedForCheckInterval = (float)_packetsPerSecond * ((float)elapsedSinceLastCheck / (float)USECS_PER_SECOND); - if (wantDebugging) { - printf(">>>>>>>>>>>>>>> check interval... ppsOverCheckInterval=%f ppsExpectedForCheckInterval=%f\n", - ppsOverCheckInterval, ppsExpectedForCheckInterval); - } - if (ppsOverCheckInterval < ppsExpectedForCheckInterval) { int adjust = ppsExpectedForCheckInterval - ppsOverCheckInterval; packetsToSendThisCall += adjust; - if (wantDebugging) { - qDebug("Lower pps [%f] than expected [%f] over check interval [%llu], adjusting UP by %d.\n", - ppsOverCheckInterval, ppsExpectedForCheckInterval, elapsedSinceLastCheck, adjust); - } } else if (ppsOverCheckInterval > ppsExpectedForCheckInterval) { int adjust = ppsOverCheckInterval - ppsExpectedForCheckInterval; packetsToSendThisCall -= adjust; - if (wantDebugging) { - qDebug("Higher pps [%f] than expected [%f] over check interval [%llu], adjusting DOWN by %d.\n", - ppsOverCheckInterval, ppsExpectedForCheckInterval, elapsedSinceLastCheck, adjust); - } - } else { - if (wantDebugging) { - qDebug("pps [%f] is expected [%f] over check interval [%llu], NO ADJUSTMENT.\n", - ppsOverCheckInterval, ppsExpectedForCheckInterval, elapsedSinceLastCheck); - } } // now, do we want to reset the check interval? don't want to completely reset, because we would still have // a rounding error. instead, we check to see that we've passed the reset interval (which is much larger than // the check interval), and on those reset intervals we take the second half average and keep that for the next // interval window... - if (wantDebugging) { - printf(">>>>>>>>>>> RESET >>>>>>>>>>>>>>> Should we reset? callsPerSecond=%f elapsedSinceLastPPSCheck=%llu resetInterval=%f\n", - callsPerSecond, elapsedSinceLastCheck, (averageCallTime * callIntervalsPerReset)); - } - if (elapsedSinceLastCheck > (averageCallTime * callIntervalsPerReset)) { - - if (wantDebugging) { - printf(">>>>>>>>>>> RESET >>>>>>>>>>>>>>> elapsedSinceLastCheck/2=%llu _packetsOverCheckInterval/2=%d\n", - (elapsedSinceLastCheck / 2), (_packetsOverCheckInterval / 2)); - } - // Keep average packets and time for "second half" of check interval _lastPPSCheck += (elapsedSinceLastCheck / 2); _packetsOverCheckInterval = (_packetsOverCheckInterval / 2); elapsedSinceLastCheck = now - _lastPPSCheck; - - if (wantDebugging) { - printf(">>>>>>>>>>> RESET >>>>>>>>>>>>>>> NEW _lastPPSCheck=%llu elapsedSinceLastCheck=%llu _packetsOverCheckInterval=%d\n", - _lastPPSCheck, elapsedSinceLastCheck, _packetsOverCheckInterval); - } } } int packetsLeft = _packets.size(); - if (wantDebugging) { - printf("packetsSentThisCall=%d packetsToSendThisCall=%d packetsLeft=%d\n", - packetsSentThisCall, packetsToSendThisCall, packetsLeft); - } - // Now that we know how many packets to send this call to process, just send them. while ((packetsSentThisCall < packetsToSendThisCall) && (packetsLeft > 0)) { lock(); @@ -347,10 +266,6 @@ bool PacketSender::nonThreadedProcess() { _totalPacketsSent++; _totalBytesSent += temporary.getLength(); - if (wantDebugging) { - printf("nodeSocket->send()... packetsSentThisCall=%d _packetsOverCheckInterval=%d\n", - packetsSentThisCall, _packetsOverCheckInterval); - } if (_notify) { _notify->packetSentNotification(temporary.getLength()); } From 9e64528989b8d6a05c928e7c064026d62f82baa5 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Thu, 2 Jan 2014 16:10:05 -0800 Subject: [PATCH 2/5] removed more dead debug code --- animation-server/src/AnimationServer.cpp | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/animation-server/src/AnimationServer.cpp b/animation-server/src/AnimationServer.cpp index 9fcac22ae5..e4f2dbc530 100644 --- a/animation-server/src/AnimationServer.cpp +++ b/animation-server/src/AnimationServer.cpp @@ -675,27 +675,6 @@ void* animateVoxels(void* args) { ::voxelEditPacketSender->process(); } processesPerAnimate++; - - if (::shouldShowPacketsPerSecond) { - float lifetimeSeconds = ::voxelEditPacketSender->getLifetimeInSeconds(); - int targetPPS = ::voxelEditPacketSender->getPacketsPerSecond(); - float lifetimePPS = ::voxelEditPacketSender->getLifetimePPS(); - float lifetimeBPS = ::voxelEditPacketSender->getLifetimeBPS(); - uint64_t totalPacketsSent = ::voxelEditPacketSender->getLifetimePacketsSent(); - uint64_t totalBytesSent = ::voxelEditPacketSender->getLifetimeBytesSent(); - - float lifetimePPSQueued = ::voxelEditPacketSender->getLifetimePPSQueued(); - float lifetimeBPSQueued = ::voxelEditPacketSender->getLifetimeBPSQueued(); - uint64_t totalPacketsQueued = ::voxelEditPacketSender->getLifetimePacketsQueued(); - uint64_t totalBytesQueued = ::voxelEditPacketSender->getLifetimeBytesQueued(); - - uint64_t packetsPending = ::voxelEditPacketSender->packetsToSendCount(); - - printf("lifetime=%f secs packetsSent=%lld, bytesSent=%lld targetPPS=%d pps=%f bps=%f\n", - lifetimeSeconds, totalPacketsSent, totalBytesSent, targetPPS, lifetimePPS, lifetimeBPS); - printf("packetsPending=%lld packetsQueued=%lld, bytesQueued=%lld ppsQueued=%f bpsQueued=%f\n", - packetsPending, totalPacketsQueued, totalBytesQueued, lifetimePPSQueued, lifetimeBPSQueued); - } } // dynamically sleep until we need to fire off the next set of voxels uint64_t usecToSleep = PROCESSING_INTERVAL_USECS - (usecTimestampNow() - lastProcessTime); From 696afd78752c37d5d42d09c18dcd9d061dee7434 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Thu, 2 Jan 2014 16:18:49 -0800 Subject: [PATCH 3/5] more warnings fixes --- interface/src/starfield/Controller.cpp | 2 +- interface/src/starfield/Generator.cpp | 2 +- .../octree-server/src/OctreeSendThread.cpp | 47 +++++++++---------- 3 files changed, 25 insertions(+), 26 deletions(-) diff --git a/interface/src/starfield/Controller.cpp b/interface/src/starfield/Controller.cpp index 114df79697..5bae2854b6 100755 --- a/interface/src/starfield/Controller.cpp +++ b/interface/src/starfield/Controller.cpp @@ -19,7 +19,7 @@ bool Controller::computeStars(unsigned numStars, unsigned seed) { this->retile(numStars, _tileResolution); - qDebug() << "Total time to generate stars: " << (usecTimestampNow() - usecTimestamp(&startTime)) / 1000) << " msec\n"; + qDebug() << "Total time to generate stars: " << ((usecTimestampNow() - usecTimestamp(&startTime)) / 1000) << " msec\n"; return true; } diff --git a/interface/src/starfield/Generator.cpp b/interface/src/starfield/Generator.cpp index becddb1b00..e21dd8d649 100644 --- a/interface/src/starfield/Generator.cpp +++ b/interface/src/starfield/Generator.cpp @@ -62,7 +62,7 @@ void Generator::computeStarPositions(InputVertices& destination, unsigned limit, vertices->push_back(InputVertex(azimuth, altitude, computeStarColor(STAR_COLORIZATION))); } - qDebug() << "Total time to generate stars: " << (usecTimestampNow() - usecTimestamp(&startTime)) / 1000) << " msec\n"; + qDebug() << "Total time to generate stars: " << ((usecTimestampNow() - usecTimestamp(&startTime)) / 1000) << " msec\n"; } // computeStarColor diff --git a/libraries/octree-server/src/OctreeSendThread.cpp b/libraries/octree-server/src/OctreeSendThread.cpp index 4b770fbc43..598db13614 100644 --- a/libraries/octree-server/src/OctreeSendThread.cpp +++ b/libraries/octree-server/src/OctreeSendThread.cpp @@ -128,11 +128,9 @@ int OctreeSendThread::handlePacketSend(Node* node, OctreeQueryNode* nodeData, in _totalBytes += nodeData->getPacketLength(); _totalPackets++; if (debug) { - qDebug("Adding stats to packet at %llu [%llu]: sequence: %d size:%d [%llu] wasted bytes:%d [%llu]\n", - now, - _totalPackets, - sequence, nodeData->getPacketLength(), _totalBytes, - thisWastedBytes, _totalWastedBytes); + qDebug() << "Adding stats to packet at " << now << " [" << _totalPackets <<"]: sequence: " << sequence << + " size: " << nodeData->getPacketLength() << " [" << _totalBytes << + "] wasted bytes:" << thisWastedBytes << " [" << _totalWastedBytes << "]\n"; } // actually send it @@ -153,11 +151,9 @@ int OctreeSendThread::handlePacketSend(Node* node, OctreeQueryNode* nodeData, in _totalBytes += statsMessageLength; _totalPackets++; if (debug) { - qDebug("Sending separate stats packet at %llu [%llu]: size:%d [%llu] wasted bytes:%d [%llu]\n", - now, - _totalPackets, - statsMessageLength, _totalBytes, - thisWastedBytes, _totalWastedBytes); + qDebug() << "Sending separate stats packet at " << now << " [" << _totalPackets <<"]: sequence: " << sequence << + " size: " << statsMessageLength << " [" << _totalBytes << + "] wasted bytes:" << thisWastedBytes << " [" << _totalWastedBytes << "]\n"; } trueBytesSent += statsMessageLength; @@ -175,11 +171,9 @@ int OctreeSendThread::handlePacketSend(Node* node, OctreeQueryNode* nodeData, in _totalBytes += nodeData->getPacketLength(); _totalPackets++; if (debug) { - qDebug("Sending packet at %llu [%llu]: sequence: %d size:%d [%llu] wasted bytes:%d [%llu]\n", - now, - _totalPackets, - sequence, nodeData->getPacketLength(), _totalBytes, - thisWastedBytes, _totalWastedBytes); + qDebug() << "Sending packet at " << now << " [" << _totalPackets <<"]: sequence: " << sequence << + " size: " << nodeData->getPacketLength() << " [" << _totalBytes << + "] wasted bytes:" << thisWastedBytes << " [" << _totalWastedBytes << "]\n"; } } nodeData->stats.markAsSent(); @@ -197,11 +191,9 @@ int OctreeSendThread::handlePacketSend(Node* node, OctreeQueryNode* nodeData, in _totalBytes += nodeData->getPacketLength(); _totalPackets++; if (debug) { - qDebug("Sending packet at %llu [%llu]: sequence:%d size:%d [%llu] wasted bytes:%d [%llu]\n", - now, - _totalPackets, - sequence, nodeData->getPacketLength(), _totalBytes, - thisWastedBytes, _totalWastedBytes); + qDebug() << "Sending packet at " << now << " [" << _totalPackets <<"]: sequence: " << sequence << + " size: " << nodeData->getPacketLength() << " [" << _totalBytes << + "] wasted bytes:" << thisWastedBytes << " [" << _totalWastedBytes << "]\n"; } } } @@ -327,8 +319,13 @@ int OctreeSendThread::packetDistributor(Node* node, OctreeQueryNode* nodeData, b packetsSentThisInterval += handlePacketSend(node, nodeData, trueBytesSent, truePacketsSent); if (_myServer->wantsDebugSending()) { - qDebug("Scene completed at %llu encodeTime:%lu sleepTime:%lu elapsed:%lu Packets:%llu Bytes:%llu Wasted:%llu\n", - usecTimestampNow(), encodeTime, sleepTime, elapsedTime, _totalPackets, _totalBytes, _totalWastedBytes); + qDebug() << "Scene completed at " << usecTimestampNow() + << "encodeTime:" << encodeTime + << " sleepTime:" << sleepTime + << " elapsed:" << elapsedTime + << " Packets:" << _totalPackets + << " Bytes:" << _totalBytes + << " Wasted:" << _totalWastedBytes << "\n"; } // start tracking our stats @@ -341,8 +338,10 @@ int OctreeSendThread::packetDistributor(Node* node, OctreeQueryNode* nodeData, b } if (_myServer->wantsDebugSending()) { - qDebug("Scene started at %llu Packets:%llu Bytes:%llu Wasted:%llu\n", - usecTimestampNow(),_totalPackets,_totalBytes,_totalWastedBytes); + qDebug() << "Scene started at " << usecTimestampNow() + << " Packets:" << _totalPackets + << " Bytes:" << _totalBytes + << " Wasted:" << _totalWastedBytes << "\n"; } ::startSceneSleepTime = _usleepTime; From ce81b95eaa321a4531bcf56e0e7f9f5534b35eae Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Thu, 2 Jan 2014 16:21:58 -0800 Subject: [PATCH 4/5] more warnings fixes --- libraries/octree-server/src/OctreePersistThread.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/octree-server/src/OctreePersistThread.cpp b/libraries/octree-server/src/OctreePersistThread.cpp index 4361ae1044..07466f9c43 100644 --- a/libraries/octree-server/src/OctreePersistThread.cpp +++ b/libraries/octree-server/src/OctreePersistThread.cpp @@ -51,12 +51,12 @@ bool OctreePersistThread::process() { qDebug("Nodes after loading scene %lu nodes %lu internal %lu leaves\n", nodeCount, internalNodeCount, leafNodeCount); double usecPerGet = (double)OctreeElement::getGetChildAtIndexTime() / (double)OctreeElement::getGetChildAtIndexCalls(); - qDebug("getChildAtIndexCalls=%llu getChildAtIndexTime=%llu perGet=%lf \n", - OctreeElement::getGetChildAtIndexTime(), OctreeElement::getGetChildAtIndexCalls(), usecPerGet); + qDebug() << "getChildAtIndexCalls=" << OctreeElement::getGetChildAtIndexCalls() + << " getChildAtIndexTime=" << OctreeElement::getGetChildAtIndexTime() << " perGet=" << usecPerGet << " \n"; double usecPerSet = (double)OctreeElement::getSetChildAtIndexTime() / (double)OctreeElement::getSetChildAtIndexCalls(); - qDebug("setChildAtIndexCalls=%llu setChildAtIndexTime=%llu perSet=%lf\n", - OctreeElement::getSetChildAtIndexTime(), OctreeElement::getSetChildAtIndexCalls(), usecPerSet); + qDebug() << "setChildAtIndexCalls=" << OctreeElement::getSetChildAtIndexCalls() + << " setChildAtIndexTime=" << OctreeElement::getSetChildAtIndexTime() << " perset=" << usecPerSet << " \n"; _initialLoadComplete = true; _lastCheck = usecTimestampNow(); // we just loaded, no need to save again From 1a67d946d8fdade624b542d4df6ece247f5649e4 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Thu, 2 Jan 2014 16:33:58 -0800 Subject: [PATCH 5/5] more warnings fixes --- .../octree-server/src/OctreeInboundPacketProcessor.cpp | 6 +++--- libraries/octree-server/src/OctreeServer.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/octree-server/src/OctreeInboundPacketProcessor.cpp b/libraries/octree-server/src/OctreeInboundPacketProcessor.cpp index 6e194fc982..020c1b274b 100644 --- a/libraries/octree-server/src/OctreeInboundPacketProcessor.cpp +++ b/libraries/octree-server/src/OctreeInboundPacketProcessor.cpp @@ -68,9 +68,9 @@ void OctreeInboundPacketProcessor::processPacket(const HifiSockAddr& senderSockA uint64_t lockWaitTime = 0; if (_myServer->wantsDebugReceiving()) { - printf("PROCESSING THREAD: got '%c' packet - %d command from client " - "receivedBytes=%ld sequence=%d transitTime=%llu usecs\n", - packetType, _receivedPacketCount, packetLength, sequence, transitTime); + qDebug() << "PROCESSING THREAD: got '" << packetType << "' packet - " << _receivedPacketCount + << " command from client receivedBytes=" << packetLength + << " sequence=" << sequence << " transitTime=" << transitTime << " usecs\n"; } int atByte = numBytesPacketHeader + sizeof(sequence) + sizeof(sentAt); unsigned char* editData = (unsigned char*)&packetData[atByte]; diff --git a/libraries/octree-server/src/OctreeServer.cpp b/libraries/octree-server/src/OctreeServer.cpp index a8010cefaf..2ab1c3cfec 100644 --- a/libraries/octree-server/src/OctreeServer.cpp +++ b/libraries/octree-server/src/OctreeServer.cpp @@ -514,7 +514,7 @@ void OctreeServer::processDatagram(const QByteArray& dataByteArray, const HifiSo if (packetType == getMyQueryMessageType()) { bool debug = false; if (debug) { - qDebug("Got PACKET_TYPE_VOXEL_QUERY at %llu.\n", usecTimestampNow()); + qDebug() << "Got PACKET_TYPE_VOXEL_QUERY at " << usecTimestampNow() << "\n"; } int numBytesPacketHeader = numBytesForPacketHeader((unsigned char*) dataByteArray.data());