Showing the changes to interface/src/Application.cpp (1 of 3 files). Show all
Unified · Split
| @@ -1324,7 +1324,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 1323 unmodified lines | |||
| 1324 | properties["asset_ping"] = assetServerNode ? assetServerNode->getPingMs() : -1; | 1324 | properties["asset_ping"] = assetServerNode ? assetServerNode->getPingMs() : -1; |
| 1325 | properties["messages_ping"] = messagesMixerNode ? messagesMixerNode->getPingMs() : -1; | 1325 | properties["messages_ping"] = messagesMixerNode ? messagesMixerNode->getPingMs() : -1; |
| 1326 | 1326 | ||
| 1327 | |||
| 1328 | auto loadingRequests = ResourceCache::getLoadingRequests(); | 1327 | auto loadingRequests = ResourceCache::getLoadingRequests(); |
| 1329 | properties["active_downloads"] = loadingRequests.size(); | 1328 | properties["active_downloads"] = loadingRequests.size(); |
| 1330 | properties["pending_downloads"] = ResourceCache::getPendingRequestCount(); | 1329 | properties["pending_downloads"] = ResourceCache::getPendingRequestCount(); |
| @@ -1334,31 +1333,41 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 3 unmodified lines | |||
| 1334 | properties["processing_resources"] = statTracker->getStat("Processing").toInt(); | 1333 | properties["processing_resources"] = statTracker->getStat("Processing").toInt(); |
| 1335 | properties["pending_processing_resources"] = statTracker->getStat("PendingProcessing").toInt(); | 1334 | properties["pending_processing_resources"] = statTracker->getStat("PendingProcessing").toInt(); |
| 1336 | 1335 | ||
| 1337 | properties["started_atp_requests"] = statTracker->getStat(STAT_ATP_REQUEST_STARTED).toInt(); | 1336 | QJsonObject startedRequests; |
| 1338 | properties["started_http_requests"] = statTracker->getStat(STAT_HTTP_REQUEST_STARTED).toInt(); | 1337 | startedRequests["atp"] = statTracker->getStat(STAT_ATP_REQUEST_STARTED).toInt(); |
| 1339 | properties["started_file_requests"] = statTracker->getStat(STAT_FILE_REQUEST_STARTED).toInt(); | 1338 | startedRequests["http"] = statTracker->getStat(STAT_HTTP_REQUEST_STARTED).toInt(); |
| 1340 | auto totalRequestsStarted = properties["started_atp_requests"].toInt() | 1339 | startedRequests["file"] = statTracker->getStat(STAT_FILE_REQUEST_STARTED).toInt(); |
| 1341 | + properties["started_http_requests"].toInt() + properties["started_file_requests"].toInt(); | 1340 | startedRequests["total"] = startedRequests["atp"].toInt() + startedRequests["http"].toInt() |
| 1342 | properties["started_requests"] = totalRequestsStarted; | 1341 | + startedRequests["file"].toInt(); |
| 1343 | 1342 | properties["started_requests"] = startedRequests; | |
| 1344 | properties["successful_atp_requests"] = statTracker->getStat(STAT_ATP_REQUEST_SUCCESS).toInt(); | 1343 | |
| 1345 | properties["successful_http_requests"] = statTracker->getStat(STAT_HTTP_REQUEST_SUCCESS).toInt(); | 1344 | QJsonObject successfulRequests; |
| 1346 | properties["successful_file_requests"] = statTracker->getStat(STAT_FILE_REQUEST_SUCCESS).toInt(); | 1345 | successfulRequests["atp"] = statTracker->getStat(STAT_ATP_REQUEST_SUCCESS).toInt(); |
| 1347 | auto totalRequestsSuccessful = properties["successful_atp_requests"].toInt() | 1346 | successfulRequests["http"] = statTracker->getStat(STAT_HTTP_REQUEST_SUCCESS).toInt(); |
| 1348 | + properties["successful_http_requests"].toInt() + properties["successful_file_requests"].toInt(); | 1347 | successfulRequests["file"] = statTracker->getStat(STAT_FILE_REQUEST_SUCCESS).toInt(); |
| 1349 | properties["successful_requests"] = totalRequestsSuccessful; | 1348 | successfulRequests["total"] = successfulRequests["atp"].toInt() + successfulRequests["http"].toInt() |
| 1350 | 1349 | + successfulRequests["file"].toInt(); | |
| 1351 | properties["failed_atp_requests"] = statTracker->getStat(STAT_ATP_REQUEST_FAILED).toInt(); | 1350 | properties["successful_requests"] = successfulRequests; |
| 1352 | properties["failed_http_requests"] = statTracker->getStat(STAT_HTTP_REQUEST_FAILED).toInt(); | 1351 | |
| 1353 | properties["failed_file_requests"] = statTracker->getStat(STAT_FILE_REQUEST_FAILED).toInt(); | 1352 | QJsonObject failedRequests; |
| 1354 | auto totalRequestsFailed = properties["failed_atp_requests"].toInt() | 1353 | failedRequests["atp"] = statTracker->getStat(STAT_ATP_REQUEST_FAILED).toInt(); |
| 1355 | + properties["failed_http_requests"].toInt() + properties["failed_file_requests"].toInt(); | 1354 | failedRequests["http"] = statTracker->getStat(STAT_HTTP_REQUEST_FAILED).toInt(); |
| 1356 | properties["failed_requests"] = totalRequestsFailed; | 1355 | failedRequests["file"] = statTracker->getStat(STAT_FILE_REQUEST_FAILED).toInt(); |
| 1357 | 1356 | failedRequests["total"] = failedRequests["atp"].toInt() + failedRequests["http"].toInt() | |
| 1358 | properties["cache_atp_requests"] = statTracker->getStat(STAT_ATP_REQUEST_CACHE).toInt(); | 1357 | + failedRequests["file"].toInt(); |
| 1359 | properties["cache_http_requests"] = statTracker->getStat(STAT_HTTP_REQUEST_FAILED).toInt(); | 1358 | properties["failed_requests"] = failedRequests; |
| 1360 | auto totalRequestsCache = properties["cache_atp_requests"].toInt() + properties["cache_http_requests"].toInt(); | 1359 | |
| 1361 | properties["cache_requests"] = totalRequestsCache; | 1360 | QJsonObject cacheRequests; |
| 1361 | cacheRequests["atp"] = statTracker->getStat(STAT_ATP_REQUEST_CACHE).toInt(); | ||
| 1362 | cacheRequests["http"] = statTracker->getStat(STAT_HTTP_REQUEST_FAILED).toInt(); | ||
| 1363 | cacheRequests["total"] = cacheRequests["atp"].toInt() + cacheRequests["http"].toInt(); | ||
| 1364 | properties["cache_requests"] = cacheRequests; | ||
| 1365 | |||
| 1366 | QJsonObject atpMappingRequests; | ||
| 1367 | atpMappingRequests["started"] = statTracker->getStat(STAT_ATP_MAPPING_REQUEST_STARTED).toInt(); | ||
| 1368 | atpMappingRequests["failed"] = statTracker->getStat(STAT_ATP_MAPPING_REQUEST_FAILED).toInt(); | ||
| 1369 | atpMappingRequests["successful"] = statTracker->getStat(STAT_ATP_MAPPING_REQUEST_SUCCESS).toInt(); | ||
| 1370 | properties["atp_mapping_requests"] = atpMappingRequests; | ||
| 1362 | 1371 | ||
| 1363 | properties["throttled"] = _displayPlugin ? _displayPlugin->isThrottled() : false; | 1372 | properties["throttled"] = _displayPlugin ? _displayPlugin->isThrottled() : false; |
| 1364 | 1373 | ||