From a12b8b4b628e979815c68459fc7c92befb032d58 Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Fri, 16 Dec 2016 09:21:41 -0800 Subject: [PATCH] Cleanup dead code --- libraries/entities/src/EntityTree.cpp | 1 - .../src/model-networking/ModelCache.cpp | 7 ------- .../src/model-networking/TextureCache.cpp | 1 - libraries/networking/src/AssetRequest.cpp | 16 ---------------- .../networking/src/AssetResourceRequest.cpp | 18 ------------------ libraries/networking/src/LimitedNodeList.cpp | 2 -- libraries/networking/src/udt/Connection.cpp | 5 ----- libraries/shared/src/StatTracker.h | 5 +---- 8 files changed, 1 insertion(+), 54 deletions(-) diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp index 05d508fe79..7f4cfa78d0 100644 --- a/libraries/entities/src/EntityTree.cpp +++ b/libraries/entities/src/EntityTree.cpp @@ -24,7 +24,6 @@ #include "EntitiesLogging.h" #include "RecurseOctreeToMapOperator.h" #include "LogHandler.h" -#include static const quint64 DELETED_ENTITIES_EXTRA_USECS_TO_CONSIDER = USECS_PER_MSEC * 50; const float EntityTree::DEFAULT_MAX_TMP_ENTITY_LIFETIME = 60 * 60; // 1 hour diff --git a/libraries/model-networking/src/model-networking/ModelCache.cpp b/libraries/model-networking/src/model-networking/ModelCache.cpp index 9e0b614292..427f307dc3 100644 --- a/libraries/model-networking/src/model-networking/ModelCache.cpp +++ b/libraries/model-networking/src/model-networking/ModelCache.cpp @@ -131,11 +131,6 @@ public: _resource(resource), _url(url), _mapping(mapping), _data(data) { DependencyManager::get()->incrementStat("PendingProcessing"); - //trace::FLOW_BEGIN("GeometryReader", trace::cResource, _url.toString(), { { "url", _url.toString() } }); - - } - virtual ~GeometryReader() { - //trace::FLOW_END("GeometryReader", trace::cResource, _url.toString(), { { "url", _url.toString() } }); } virtual void run() override; @@ -149,7 +144,6 @@ private: void GeometryReader::run() { DependencyManager::get()->decrementStat("PendingProcessing"); - //trace::ASYNC_BEGIN("GeometryReader::run", trace::cResource, _url.toString(), { { "url", _url.toString() } }); CounterStat counter("Processing"); PROFILE_RANGE_EX(modelnetworking, "GeometryReader::run", 0xFF00FF00, 0, { { "url", _url.toString() } }); auto originalPriority = QThread::currentThread()->priority(); @@ -208,7 +202,6 @@ void GeometryReader::run() { Q_ARG(bool, false)); } } - //trace::ASYNC_END("GeometryReader::run", trace::cResource, _url.toString()); } class GeometryDefinitionResource : public GeometryResource { diff --git a/libraries/model-networking/src/model-networking/TextureCache.cpp b/libraries/model-networking/src/model-networking/TextureCache.cpp index 76dc4e0dc6..20c1be77c5 100644 --- a/libraries/model-networking/src/model-networking/TextureCache.cpp +++ b/libraries/model-networking/src/model-networking/TextureCache.cpp @@ -349,7 +349,6 @@ void ImageReader::run() { CounterStat counter("Processing"); - //trace::DURATION_BEGIN("ImageReader::threadSetup", trace::cResource, { { "url", _url.toString() } }); PROFILE_RANGE_EX(modelnetworking, __FUNCTION__, 0xffff0000, 0, { { "url", _url.toString() } }); auto originalPriority = QThread::currentThread()->priority(); if (originalPriority == QThread::InheritPriority) { diff --git a/libraries/networking/src/AssetRequest.cpp b/libraries/networking/src/AssetRequest.cpp index e022eb7802..13caf87b8d 100644 --- a/libraries/networking/src/AssetRequest.cpp +++ b/libraries/networking/src/AssetRequest.cpp @@ -32,17 +32,11 @@ AssetRequest::AssetRequest(const QString& hash) : AssetRequest::~AssetRequest() { auto assetClient = DependencyManager::get(); if (_assetRequestID) { - //trace::ASYNC_END("assetRequest", trace::nameAssetData, _requestID); assetClient->cancelGetAssetRequest(_assetRequestID); } if (_assetInfoRequestID) { - //trace::ASYNC_END("assetRequest", trace::nameAssetInfo, _requestID); assetClient->cancelGetAssetInfoRequest(_assetInfoRequestID); } - if (_assetRequestID || _assetInfoRequestID) { - //trace::ASYNC_END(trace::nameAssetEndedEarly, "assetRequest", _requestID); - //trace::ASYNC_END(trace::nameAssetRequest, "assetRequest", _requestID); - } } void AssetRequest::start() { @@ -56,14 +50,11 @@ void AssetRequest::start() { return; } - //trace::ASYNC_BEGIN(trace::nameAssetRequest, "assetRequest", _requestID); - // in case we haven't parsed a valid hash, return an error now if (!isValidHash(_hash)) { _error = InvalidHash; _state = Finished; - //trace::ASYNC_END(trace::nameAssetRequest, "assetRequest", _requestID); emit finished(this); return; } @@ -76,21 +67,16 @@ void AssetRequest::start() { _error = NoError; _state = Finished; - //trace::ASYNC_END(trace::nameAssetRequest, "assetRequest", _requestID); emit finished(this); return; } _state = WaitingForInfo; - //trace::ASYNC_BEGIN(trace::nameAssetInfo, "assetRequest", _requestID); - auto assetClient = DependencyManager::get(); _assetInfoRequestID = assetClient->getAssetInfo(_hash, [this](bool responseReceived, AssetServerError serverError, AssetInfo info) { - //trace::ASYNC_END(trace::nameAssetInfo, "assetRequest", _requestID); - _assetInfoRequestID = AssetClient::INVALID_MESSAGE_ID; _info = info; @@ -111,7 +97,6 @@ void AssetRequest::start() { if (_error != NoError) { qCWarning(asset_client) << "Got error retrieving asset info for" << _hash; _state = Finished; - //trace::ASYNC_END(trace::nameAssetRequest, "assetRequest", _requestID); emit finished(this); return; @@ -172,7 +157,6 @@ void AssetRequest::start() { } _state = Finished; - //trace::ASYNC_END(trace::nameAssetRequest, "assetRequest", _requestID); emit finished(this); }, [this, that](qint64 totalReceived, qint64 total) { if (!that) { diff --git a/libraries/networking/src/AssetResourceRequest.cpp b/libraries/networking/src/AssetResourceRequest.cpp index ff41ffc2fb..9a89465e02 100644 --- a/libraries/networking/src/AssetResourceRequest.cpp +++ b/libraries/networking/src/AssetResourceRequest.cpp @@ -32,15 +32,11 @@ AssetResourceRequest::~AssetResourceRequest() { if (_assetRequest || _assetMappingRequest) { if (_assetMappingRequest) { _assetMappingRequest->deleteLater(); -// PROFILE_ASYNC_END("resource", "AssetResourceRequestMapping", _url.toString()); } if (_assetRequest) { _assetRequest->deleteLater(); - //PROFILE_ASYNC_END("resource", "AssetResourceRequestData", _url.toString()); } - - //trace::ASYNC_END("AssetResourceRequest", trace::cResource, _url.toString()); } } @@ -52,8 +48,6 @@ bool AssetResourceRequest::urlIsAssetHash() const { } void AssetResourceRequest::doSend() { - //trace::ASYNC_BEGIN("AssetResourceRequest", trace::cResource, _url.toString(), { { "url", _url.toString() } }); - // We'll either have a hash or an ATP path to a file (that maps to a hash) if (urlIsAssetHash()) { // We've detected that this is a hash - simply use AssetClient to request that asset @@ -71,8 +65,6 @@ void AssetResourceRequest::doSend() { } void AssetResourceRequest::requestMappingForPath(const AssetPath& path) { - //trace::ASYNC_BEGIN("AssetResourceRequestMapping", trace::cResource, _url.toString()); - auto assetClient = DependencyManager::get(); _assetMappingRequest = assetClient->createGetMappingRequest(path); @@ -81,8 +73,6 @@ void AssetResourceRequest::requestMappingForPath(const AssetPath& path) { Q_ASSERT(_state == InProgress); Q_ASSERT(request == _assetMappingRequest); - //trace::ASYNC_END("AssetResourceRequestMapping", trace::cResource, _url.toString()); - switch (request->getError()) { case MappingRequest::NoError: // we have no error, we should have a resulting hash - use that to send of a request for that asset @@ -110,8 +100,6 @@ void AssetResourceRequest::requestMappingForPath(const AssetPath& path) { _state = Finished; emit finished(); - //trace::ASYNC_END("AssetResourceRequest", trace::cResource, _url.toString()); - break; } } @@ -124,8 +112,6 @@ void AssetResourceRequest::requestMappingForPath(const AssetPath& path) { } void AssetResourceRequest::requestHash(const AssetHash& hash) { - //trace::ASYNC_BEGIN("AssetResourceRequestData", trace::cResource, _url.toString()); - // Make request to atp auto assetClient = DependencyManager::get(); _assetRequest = assetClient->createRequest(hash); @@ -136,8 +122,6 @@ void AssetResourceRequest::requestHash(const AssetHash& hash) { Q_ASSERT(req == _assetRequest); Q_ASSERT(req->getState() == AssetRequest::Finished); - //trace::ASYNC_END("AssetResourceRequestData", trace::cResource, _url.toString()); - switch (req->getError()) { case AssetRequest::Error::NoError: _data = req->getData(); @@ -162,8 +146,6 @@ void AssetResourceRequest::requestHash(const AssetHash& hash) { _assetRequest->deleteLater(); _assetRequest = nullptr; - - //trace::ASYNC_END("AssetResourceRequest", trace::cResource, _url.toString()); }); _assetRequest->start(); diff --git a/libraries/networking/src/LimitedNodeList.cpp b/libraries/networking/src/LimitedNodeList.cpp index 9a23964828..a5cf1d9527 100644 --- a/libraries/networking/src/LimitedNodeList.cpp +++ b/libraries/networking/src/LimitedNodeList.cpp @@ -585,7 +585,6 @@ SharedNodePointer LimitedNodeList::addOrUpdateNode(const QUuid& uuid, NodeType_t return matchingNode; } else { - //trace::ASYNC_BEGIN("Node:" + NodeType::getNodeTypeName(nodeType), "NodeConnection", NodeType::getNodeTypeName(nodeType), { { "type", NodeType::getNodeTypeName(nodeType) } }); // we didn't have this node, so add them Node* newNode = new Node(uuid, nodeType, publicSocket, localSocket, permissions, connectionSecret, this); @@ -630,7 +629,6 @@ SharedNodePointer LimitedNodeList::addOrUpdateNode(const QUuid& uuid, NodeType_t emit nodeActivated(newNodePointer); } else { connect(newNodePointer.data(), &NetworkPeer::socketActivated, this, [=] { - //trace::ASYNC_END("Add" + NodeType::getNodeTypeName(nodeType), "NodeConnection", NodeType::getNodeTypeName(nodeType), { { "type", NodeType::getNodeTypeName(nodeType) } }); emit nodeActivated(newNodePointer); disconnect(newNodePointer.data(), &NetworkPeer::socketActivated, this, 0); }); diff --git a/libraries/networking/src/udt/Connection.cpp b/libraries/networking/src/udt/Connection.cpp index 46d06ee220..f42049f107 100644 --- a/libraries/networking/src/udt/Connection.cpp +++ b/libraries/networking/src/udt/Connection.cpp @@ -33,9 +33,6 @@ Connection::Connection(Socket* parentSocket, HifiSockAddr destination, std::uniq _destination(destination), _congestionControl(move(congestionControl)) { - //trace::ASYNC_BEGIN("Connection", "Connection", _destination.toString()); - //trace::ASYNC_BEGIN("DownHandshake", "Connection", _destination.toString()); - Q_ASSERT_X(parentSocket, "Connection::Connection", "Must be called with a valid Socket*"); Q_ASSERT_X(_congestionControl, "Connection::Connection", "Must be called with a valid CongestionControl object"); @@ -72,7 +69,6 @@ Connection::~Connection() { for (auto& pendingMessage : _pendingReceivedMessages) { _parentSocket->messageFailed(this, pendingMessage.first); } - //trace::ASYNC_END("Connection", "Connection", _destination.toString()); } void Connection::stopSendQueue() { @@ -817,7 +813,6 @@ void Connection::processHandshake(ControlPacketPointer controlPacket) { _parentSocket->writeBasePacket(*_handshakeACK, _destination); // indicate that handshake has been received - //trace::ASYNC_END("DownHandshake", "Connection", _destination.toString()); _hasReceivedHandshake = true; if (_didRequestHandshake) { diff --git a/libraries/shared/src/StatTracker.h b/libraries/shared/src/StatTracker.h index 1cdfa8f507..b500d9a821 100644 --- a/libraries/shared/src/StatTracker.h +++ b/libraries/shared/src/StatTracker.h @@ -33,13 +33,10 @@ class CounterStat { public: CounterStat(QString name) : _name(name) { DependencyManager::get()->incrementStat(_name); - //trace::COUNTER("processing", "stats", { - //{ "active", DependencyManager::get()->getStat("ResourceProcessing").toInt() } - //}); } ~CounterStat() { DependencyManager::get()->decrementStat(_name); } private: QString _name; -}; \ No newline at end of file +};