Urm Cleanup and delete unnecessary files (#207)

---
Signed-off-by: Kartik Nema <kartnema@qti.qualcomm.com>

Author: kartnema

TODO.txt

@@ -34,7 +34,7 @@ static std::string format_string(const char *fmt, ...) {
     return std::string(buffer);
 }
 
-bool FeatureExtractor::IsValidPidViaProc(pid_t pid) {
+int8_t FeatureExtractor::IsValidPidViaProc(pid_t pid) {
     std::string procPath = "/proc/" + std::to_string(pid);
     struct stat info;
     return (stat(procPath.c_str(), &info) == 0 && S_ISDIR(info.st_mode));
@@ -52,7 +52,7 @@ std::string join_vector(const std::vector<std::string> &vec) {
 }
 
 int FeatureExtractor::CollectAndStoreData( pid_t pid,
-    std::map<std::string, std::string> &output_data, bool dump_csv) {
+    std::map<std::string, std::string> &output_data, int8_t dump_csv) {
     if (!IsValidPidViaProc(pid)) {
         LOGE(SCANNER_TAG,
              format_string("PID %d does not exist in /proc.", pid));
@@ -482,7 +482,7 @@ FeatureExtractor::ParseFd(pid_t pid, const std::string &delimiters) {
                     FeaturePruner::removeDatesAndTimesFromToken(tok);
                 if (cleaned.empty())
                     continue;
-                bool isNumber =
+                int8_t isNumber =
                     std::all_of(cleaned.begin(), cleaned.end(), ::isdigit);
                 if (isNumber)
                     continue;

contextual-classifier/FeatureExtractor.cpp

@@ -100,11 +100,11 @@ std::string FeaturePruner::removePunctuation(const std::string &s) {
     return out;
 }
 
-bool FeaturePruner::isSingleCharToken(const std::string &s) {
+int8_t FeaturePruner::isSingleCharToken(const std::string &s) {
     return s.size() == 1;
 }
 
-bool FeaturePruner::isAllSpecialChars(const std::string &token) {
+int8_t FeaturePruner::isAllSpecialChars(const std::string &token) {
     if (token.empty())
         return false;
     for (size_t i = 0; i < token.size(); ++i) {
@@ -116,12 +116,12 @@ bool FeaturePruner::isAllSpecialChars(const std::string &token) {
     return true;
 }
 
-bool FeaturePruner::hasDigit(const std::string &str) {
+int8_t FeaturePruner::hasDigit(const std::string &str) {
     std::regex digitRegex("[0-9]");
     return std::regex_search(str, digitRegex);
 }
 
-bool FeaturePruner::isDigitsOnly(const std::string &str) {
+int8_t FeaturePruner::isDigitsOnly(const std::string &str) {
     return !str.empty() && std::all_of(str.begin(), str.end(), ::isdigit);
 }
 

contextual-classifier/FeaturePruner.cpp

@@ -54,7 +54,7 @@ class FeatureExtractor {
 	static std::vector<std::string>
 	ExtractProcessNameAndMessage(const std::vector<std::string> &journalLines);
 
-	static bool IsValidPidViaProc(pid_t pid);
+	static int8_t IsValidPidViaProc(pid_t pid);
 
 public:
 	FeatureExtractor() {
@@ -69,7 +69,7 @@ class FeatureExtractor {
 	static int CollectAndStoreData(
 		pid_t pid,
 		std::map<std::string, std::string> &output_data,
-		bool dump_csv);
+		int8_t dump_csv);
 };
 
 #endif // FEATURE_EXTRACTOR_H

contextual-classifier/Include/FeatureExtractor.h

@@ -30,17 +30,17 @@ class FeaturePruner {
 
 	static void normalize_numbers_inplace(std::vector<std::string> &tokens);
 
-	static bool isDigitsOnly(const std::string &str);
+	static int8_t isDigitsOnly(const std::string &str);
 
-	static bool hasDigit(const std::string &str);
+	static int8_t hasDigit(const std::string &str);
 
-	static bool isAllSpecialChars(const std::string &token);
+	static int8_t isAllSpecialChars(const std::string &token);
 
 	static std::string removeDatesAndTimesFromToken(const std::string &input);
 
 	static std::string removePunctuation(const std::string &s);
 
-	static bool isSingleCharToken(const std::string &s);
+	static int8_t isSingleCharToken(const std::string &s);
 
 	static std::unordered_map<std::string, std::unordered_set<std::string>>
 	loadIgnoreMap(const std::string &filename,

contextual-classifier/Include/FeaturePruner.h

@@ -201,7 +201,7 @@ CC_TYPE MLInference::Classify(pid_t processPid) {
         return contextType;
     }
 
-    bool has_sufficient_features = false;
+    int8_t has_sufficient_features = false;
     for (const auto &kv : rawData) {
         if (!kv.second.empty()) {
             has_sufficient_features = true;

contextual-classifier/MLInference.cpp

@@ -81,7 +81,7 @@ std::vector<TestAppConfig> loadAppConfigs(const std::string& configPath) {
 
     std::string line;
     TestAppConfig currentApp;
-    bool inApp = false;
+    int8_t inApp = false;
 
     // Parse line by line
     while (std::getline(file, line)) {
@@ -374,7 +374,7 @@ URM_TEST(TestApplicationClassification, {
             std::cout << LOG_BASE << "Category: " << categoryName << std::endl;
 
             // Compare predicted label with expected label
-            bool correct = (predictedLabel == app.expectedLabel);
+            int8_t correct = (predictedLabel == app.expectedLabel);
             std::cout << LOG_BASE << "Match: " << (correct ? "YES" : "NO") << std::endl;
 
             // Cleanup: terminate spawned process

tests/Component/ContextClassificationTest.cpp

@@ -11,5 +11,6 @@ URM_REGISTER_CONFIG(PROPERTIES_CONFIG, "/etc/urm/tests/configs/PropertiesConfig.
 URM_REGISTER_CONFIG(SIGNALS_CONFIG, "/etc/urm/tests/configs/SignalsConfig.yaml")
 URM_REGISTER_CONFIG(TARGET_CONFIG, "/etc/urm/tests/configs/TargetConfig.yaml")
 URM_REGISTER_CONFIG(INIT_CONFIG, "/etc/urm/tests/configs/InitConfig.yaml")
+URM_REGISTER_CONFIG(APP_CONFIG, "/etc/urm/tests/configs/PerApp.yaml")
 
 REGISTER_AND_TRIGGER_SUITE(TEST_CLASS)