From a593a2116a069bc8625e8ad2ca57f9d629f56000 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Tue, 17 Jan 2017 13:40:19 -0800
Subject: [PATCH] Removing magic numbers

---
 assignment-client/src/assets/AssetServer.cpp | 9 +++++++--
 libraries/shared/src/SharedUtil.cpp          | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/assignment-client/src/assets/AssetServer.cpp b/assignment-client/src/assets/AssetServer.cpp
index 69f3d83583..2498af8010 100644
--- a/assignment-client/src/assets/AssetServer.cpp
+++ b/assignment-client/src/assets/AssetServer.cpp
@@ -31,6 +31,11 @@
 #include "SendAssetTask.h"
 #include "UploadAssetTask.h"
 
+static const uint8_t MIN_CORES_FOR_MULTICORE = 4;
+static const uint8_t CPU_AFFINITY_COUNT_HIGH = 2;
+static const uint8_t CPU_AFFINITY_COUNT_LOW = 1;
+static const int INTERFACE_RUNNING_CHECK_FREQUENCY_MS = 1000;
+
 const QString ASSET_SERVER_LOGGING_TARGET_NAME = "asset-server";
 
 bool interfaceRunning() {
@@ -57,7 +62,7 @@ void updateConsumedCores() {
     wasInterfaceRunning = isInterfaceRunning;
     auto coreCount = std::thread::hardware_concurrency();
     if (isInterfaceRunning) {
-        coreCount = coreCount > 4 ? 2 : 1;
+        coreCount = coreCount > MIN_CORES_FOR_MULTICORE ? CPU_AFFINITY_COUNT_HIGH : CPU_AFFINITY_COUNT_LOW;
     } 
     qDebug() << "Setting max consumed cores to " << coreCount;
     setMaxCores(coreCount);
@@ -89,7 +94,7 @@ AssetServer::AssetServer(ReceivedMessage& message) :
     connect(qApp, &QCoreApplication::aboutToQuit, [this, timerConnection] {
         disconnect(timerConnection);
     });
-    timer->setInterval(1000);
+    timer->setInterval(INTERFACE_RUNNING_CHECK_FREQUENCY_MS);
     timer->setTimerType(Qt::CoarseTimer);
     timer->start();
 #endif
diff --git a/libraries/shared/src/SharedUtil.cpp b/libraries/shared/src/SharedUtil.cpp
index 4b8699befd..a7e251f0e0 100644
--- a/libraries/shared/src/SharedUtil.cpp
+++ b/libraries/shared/src/SharedUtil.cpp
@@ -1040,7 +1040,7 @@ const std::vector<uint8_t>& getAvailableCores() {
         DWORD_PTR defaultProcessAffinity = 0, defaultSystemAffinity = 0;
         HANDLE process = GetCurrentProcess();
         GetProcessAffinityMask(process, &defaultProcessAffinity, &defaultSystemAffinity);
-        for (uint64_t i = 0; i < sizeof(DWORD_PTR) * 8; ++i) {
+        for (uint64_t i = 0; i < sizeof(DWORD_PTR) * BITS_IN_BYTE; ++i) {
             DWORD_PTR coreMask = 1;
             coreMask <<= i;
             if (0 != (defaultSystemAffinity & coreMask)) {