From 3ff329a5530de9702a62441a5dd6770f6ad3f8ca Mon Sep 17 00:00:00 2001 From: Hayodea Hakol Date: Fri, 29 Aug 2025 16:12:30 -0400 Subject: [PATCH] Rename: DeviceSpec=>DAP Spec --- .../deviceAttachmentPipeSpecParser.cpp | 26 +++++++++---------- smocore/include/deviceManager/deviceManager.h | 8 +++--- smocore/include/opts.h | 4 +-- smocore/marionette/salmanoff.cpp | 4 +-- smocore/opts.cpp | 14 +++++----- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/smocore/deviceManager/deviceAttachmentPipeSpecParser.cpp b/smocore/deviceManager/deviceAttachmentPipeSpecParser.cpp index 75980c8..627d238 100644 --- a/smocore/deviceManager/deviceAttachmentPipeSpecParser.cpp +++ b/smocore/deviceManager/deviceAttachmentPipeSpecParser.cpp @@ -13,13 +13,13 @@ namespace smo { namespace device { -std::string DeviceManager::readDeviceSpecFile(const std::string& filename) +std::string DeviceManager::readDapSpecFile(const std::string& filename) { std::ifstream file(filename); if (!file.is_open()) { throw std::runtime_error( - std::string(__func__) + ": Couldn't open deviceSpec file: " + std::string(__func__) + ": Couldn't open DAP spec file: " + filename); } @@ -30,39 +30,39 @@ std::string DeviceManager::readDeviceSpecFile(const std::string& filename) return content; } -void DeviceManager::collateAllDeviceSpecs(void) +void DeviceManager::collateAllDapSpecs(void) { OptionParser &options = OptionParser::getOptions(); - allDeviceSpecs = options.deviceSpecs; + allDapSpecs = options.dapSpecs; - for (const auto& file : options.deviceSpecFiles) + for (const auto& file : options.dapSpecFiles) { - std::string fileContent = readDeviceSpecFile(file); - if (!allDeviceSpecs.empty()) { - allDeviceSpecs += "||"; + std::string fileContent = readDapSpecFile(file); + if (!allDapSpecs.empty()) { + allDapSpecs += "||"; } - allDeviceSpecs += fileContent; + allDapSpecs += fileContent; } } -void DeviceManager::parseAllDeviceSpecs(void) +void DeviceManager::parseAllDapSpecs(void) { std::unique_ptr input( - fmemopen((void*)allDeviceSpecs.c_str(), allDeviceSpecs.size(), "r"), + fmemopen((void*)allDapSpecs.c_str(), allDapSpecs.size(), "r"), &fclose); if (!input) { throw std::runtime_error( std::string(__func__) + ": Failed to fmemopen() a FILE* for " - "parsing device specs"); + "parsing DAP specs"); } deviceAttachmentPipeSpeclin = input.get(); if (deviceAttachmentPipeSpecpparse()) { throw std::runtime_error( - std::string(__func__) + ": Failed to parse device specs. " + std::string(__func__) + ": Failed to parse DAP specs. " "Check specs for errors"); } } diff --git a/smocore/include/deviceManager/deviceManager.h b/smocore/include/deviceManager/deviceManager.h index 1c53bce..0c07313 100644 --- a/smocore/include/deviceManager/deviceManager.h +++ b/smocore/include/deviceManager/deviceManager.h @@ -21,9 +21,9 @@ public: return instance; } - std::string readDeviceSpecFile(const std::string& filename); - void collateAllDeviceSpecs(void); - void parseAllDeviceSpecs(void); + std::string readDapSpecFile(const std::string& filename); + void collateAllDapSpecs(void); + void parseAllDapSpecs(void); static const std::string stringifyDeviceSpecs(void); private: @@ -33,7 +33,7 @@ private: DeviceManager& operator=(const DeviceManager&) = delete; public: - std::string allDeviceSpecs; + std::string allDapSpecs; static std::vector> interoceptorDeviceSpecs; static std::vector> diff --git a/smocore/include/opts.h b/smocore/include/opts.h index b1988a8..4602678 100644 --- a/smocore/include/opts.h +++ b/smocore/include/opts.h @@ -36,8 +36,8 @@ public: std::string argv0; std::vector senseApiLibPath; std::vector senseApiLibs; - std::string deviceSpecs; - std::vector deviceSpecFiles; + std::string dapSpecs; + std::vector dapSpecFiles; bool verbose, printUsage; static struct option longOptions[]; diff --git a/smocore/marionette/salmanoff.cpp b/smocore/marionette/salmanoff.cpp index 1e951a2..fb45a7b 100644 --- a/smocore/marionette/salmanoff.cpp +++ b/smocore/marionette/salmanoff.cpp @@ -8,8 +8,8 @@ void initializeSalmanoff(void) { std::cout << __func__ << ": Entered." << std::endl; - device::DeviceManager::getInstance().collateAllDeviceSpecs(); - device::DeviceManager::getInstance().parseAllDeviceSpecs(); + device::DeviceManager::getInstance().collateAllDapSpecs(); + device::DeviceManager::getInstance().parseAllDapSpecs(); std::cout << device::DeviceManager::stringifyDeviceSpecs() << std::endl; sense_api::SenseApiManager::getInstance().loadAllSenseApiLibsFromOptions(); std::cout << sense_api::SenseApiManager::getInstance().stringifyLibs() diff --git a/smocore/opts.cpp b/smocore/opts.cpp index eefd500..17c9b4c 100644 --- a/smocore/opts.cpp +++ b/smocore/opts.cpp @@ -65,13 +65,13 @@ void OptionParser::parseArguments(int argc, char *argv[], char **envp) switch (opt) { case 's': - if (!deviceSpecs.empty()) { - deviceSpecs += "||"; + if (!dapSpecs.empty()) { + dapSpecs += "||"; } - deviceSpecs += std::string(optarg); + dapSpecs += std::string(optarg); break; case 'd': - deviceSpecFiles.push_back(optarg); + dapSpecFiles.push_back(optarg); break; case 'a': senseApiLibs.push_back(optarg); @@ -121,10 +121,10 @@ std::string OptionParser::stringifyOptions(void) const oss << "Verbose mode is on" << std::endl; } - oss << "Device Specs: " << deviceSpecs << std::endl; + oss << "DAP Specs: " << dapSpecs << std::endl; - oss << "Device Spec Files: "; - for (const auto& file : deviceSpecFiles) { + oss << "DAP Spec Files: "; + for (const auto& file : dapSpecFiles) { oss << file << " "; } oss << std::endl;