diff --git a/DRAMSys/library/src/common/DebugManager.h b/DRAMSys/library/src/common/DebugManager.h index c52c2536..c8d0b7da 100644 --- a/DRAMSys/library/src/common/DebugManager.h +++ b/DRAMSys/library/src/common/DebugManager.h @@ -65,8 +65,10 @@ public: private: DebugManager(); - DebugManager(const DebugManager &); - DebugManager & operator = (const DebugManager &); + +public: + DebugManager(const DebugManager&) = delete; + DebugManager& operator=(const DebugManager&) = delete; public: void setup(bool _debugEnabled, bool _writeToConsole, bool _writeToFile); diff --git a/DRAMSys/library/src/simulation/DRAMSys.cpp b/DRAMSys/library/src/simulation/DRAMSys.cpp index 9582b765..4037fda4 100644 --- a/DRAMSys/library/src/simulation/DRAMSys.cpp +++ b/DRAMSys/library/src/simulation/DRAMSys.cpp @@ -136,7 +136,7 @@ void DRAMSys::logo() #undef BOLDTXT } -void DRAMSys::setupDebugManager(NDEBUG_UNUSED(const std::string &traceName)) +void DRAMSys::setupDebugManager(NDEBUG_UNUSED(const std::string &traceName)) const { #ifndef NDEBUG auto& dbg = DebugManager::getInstance(); diff --git a/DRAMSys/library/src/simulation/DRAMSys.h b/DRAMSys/library/src/simulation/DRAMSys.h index 33cdba50..313d7273 100644 --- a/DRAMSys/library/src/simulation/DRAMSys.h +++ b/DRAMSys/library/src/simulation/DRAMSys.h @@ -105,7 +105,7 @@ private: void instantiateModules(const DRAMSysConfiguration::AddressMapping &addressMapping); - void setupDebugManager(const std::string &traceName); + void setupDebugManager(const std::string &traceName) const; }; #endif // DRAMSYS_H diff --git a/DRAMSys/library/src/simulation/DRAMSysRecordable.cpp b/DRAMSys/library/src/simulation/DRAMSysRecordable.cpp index 324f6e2c..5bf417c7 100644 --- a/DRAMSys/library/src/simulation/DRAMSysRecordable.cpp +++ b/DRAMSys/library/src/simulation/DRAMSysRecordable.cpp @@ -99,7 +99,7 @@ void DRAMSysRecordable::setupTlmRecorders(const std::string& traceName, const DR tlmRecorders.reserve(config.memSpec->numberOfChannels); for (std::size_t i = 0; i < config.memSpec->numberOfChannels; i++) { - std::string dbName = traceName + std::string("_ch") + std::to_string(i) + ".tdb"; + std::string dbName = std::string(name()) + "_" + traceName + "_ch" + std::to_string(i) + ".tdb"; std::string recorderName = "tlmRecorder" + std::to_string(i); tlmRecorders.emplace_back(recorderName, config, dbName); diff --git a/DRAMSys/library/src/simulation/DRAMSysRecordable.h b/DRAMSys/library/src/simulation/DRAMSysRecordable.h index 9340a8d3..9ce40629 100644 --- a/DRAMSys/library/src/simulation/DRAMSysRecordable.h +++ b/DRAMSys/library/src/simulation/DRAMSysRecordable.h @@ -57,7 +57,6 @@ private: void setupTlmRecorders(const std::string &traceName, const DRAMSysConfiguration::Configuration &configLib); void instantiateModules(const std::string &traceName, const DRAMSysConfiguration::Configuration &configLib); - }; #endif // DRAMSYSRECORDABLE_H diff --git a/DRAMSys/simulator/main.cpp b/DRAMSys/simulator/main.cpp index 189d8349..8c732297 100644 --- a/DRAMSys/simulator/main.cpp +++ b/DRAMSys/simulator/main.cpp @@ -51,7 +51,6 @@ #include "simulation/DRAMSys.h" #include "TraceSetup.h" #include "TrafficInitiator.h" -#include "LengthConverter.h" #ifdef RECORDING #include "simulation/DRAMSysRecordable.h"