Make thread pool capacity configurable via YAML (#202)

Signed-off-by: Tarun Balaji Nidiganti <tnidigan@qti.qualcomm.com>

Author: tnidigan

configs/PropertiesConfig.yaml

@@ -8,6 +8,12 @@ PropertyConfigs:
   - Name: resource_tuner.maximum.resources.per.request
     Value: "20"
 
+  - Name: resource_tuner.thread_pool.desired_capacity
+    Value: "5"
+  
+  - Name: resource_tuner.thread_pool.max_scaling_capacity
+    Value: "10"
+
   - Name: resource_tuner.pulse.duration
     Value: "23000"
 

modula/Common/Include/Utils.h

@@ -112,6 +112,8 @@ typedef void (*MessageReceivedCallback)(int32_t, MsgForwardInfo*);
 // System Properties
 #define MAX_CONCURRENT_REQUESTS "resource_tuner.maximum.concurrent.requests"
 #define MAX_RESOURCES_PER_REQUEST "resource_tuner.maximum.resources.per.request"
+#define THREAD_POOL_DESIRED_CAPACITY "resource_tuner.thread_pool.desired_capacity"
+#define THREAD_POOL_MAX_SCALING_CAPACITY "resource_tuner.thread_pool.max_scaling_capacity"
 #define PULSE_MONITOR_DURATION "resource_tuner.pulse.duration"
 #define GARBAGE_COLLECTOR_DURATION "resource_tuner.garbage_collection.duration"
 #define GARBAGE_COLLECTOR_BATCH_SIZE "resource_tuner.garbage_collection.batch_size"

modula/CoreModules/Include/UrmSettings.h

@@ -16,6 +16,8 @@
 typedef struct {
     uint32_t mMaxConcurrentRequests;
     uint32_t mMaxResourcesPerRequest;
+    uint32_t mDesiredThreadCount;
+    uint32_t mMaxScalingCapacity;
     uint32_t mListeningPort;
     uint32_t mPulseDuration;
     uint32_t mClientGarbageCollectorDuration;
@@ -41,8 +43,6 @@ class UrmSettings {
     static int32_t serverOnlineStatus;
 
 public:
-    static const int32_t desiredThreadCount = 5;
-    static const int32_t maxScalingCapacity = 10;
 
     static const std::string mTargetConfDir;
 

resource-tuner/init/RestuneInit.cpp

@@ -147,6 +147,12 @@ static ErrCode fetchMetaConfigs() {
         submitPropGetRequest(MAX_RESOURCES_PER_REQUEST, resultBuffer, "5");
         UrmSettings::metaConfigs.mMaxResourcesPerRequest = (uint32_t)std::stol(resultBuffer);
 
+        submitPropGetRequest(THREAD_POOL_DESIRED_CAPACITY, resultBuffer, "5");
+        UrmSettings::metaConfigs.mDesiredThreadCount = (uint32_t)std::stol(resultBuffer);
+
+        submitPropGetRequest(THREAD_POOL_MAX_SCALING_CAPACITY, resultBuffer, "10");
+        UrmSettings::metaConfigs.mMaxScalingCapacity = (uint32_t)std::stol(resultBuffer);
+
         submitPropGetRequest(PULSE_MONITOR_DURATION, resultBuffer, "60000");
         UrmSettings::metaConfigs.mPulseDuration = (uint32_t)std::stol(resultBuffer);
 
@@ -165,6 +171,17 @@ static ErrCode fetchMetaConfigs() {
         submitPropGetRequest(RATE_LIMITER_REWARD_FACTOR, resultBuffer, "0.4");
         UrmSettings::metaConfigs.mRewardFactor = std::stod(resultBuffer);
 
+        submitPropGetRequest(URM_MAX_PLUGIN_COUNT, resultBuffer, "3");
+        UrmSettings::metaConfigs.mPluginCount = (uint32_t)std::stol(resultBuffer);
+
+        if(UrmSettings::metaConfigs.mDesiredThreadCount < 1) {
+            UrmSettings::metaConfigs.mDesiredThreadCount = 5; // Reset to default
+        }
+
+        if(UrmSettings::metaConfigs.mMaxScalingCapacity > 100) {
+            UrmSettings::metaConfigs.mMaxScalingCapacity = 100;
+        }
+
     } catch(const std::invalid_argument& e) {
         TYPELOGV(META_CONFIG_PARSE_FAILURE, e.what());
         return RC_PROP_PARSING_ERROR;
@@ -406,8 +423,8 @@ static ErrCode fetchPerAppConfigs() {
 
 // Initialize Request and Timer ThreadPools
 static ErrCode preAllocateWorkers() {
-    int32_t desiredThreadCapacity = UrmSettings::desiredThreadCount;
-    int32_t maxScalingCapacity = UrmSettings::maxScalingCapacity;
+    uint32_t desiredThreadCapacity = UrmSettings::metaConfigs.mDesiredThreadCount;
+    uint32_t maxScalingCapacity = UrmSettings::metaConfigs.mMaxScalingCapacity;
 
     try {
         RequestReceiver::mRequestsThreadPool = new ThreadPool(desiredThreadCapacity,