derek/DRAMSys
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Test if the "NumberOfTracePlayers" is defined in the XML file.

Browse Source
This commit is contained in:
Éder Ferreira Zulian
2015-06-17 13:15:46 +02:00
parent e9ba47df88
commit 21ad5962aa
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dram/src/simulation/SimulationManager.cpp
View File

@@ -125,10 +125,9 @@ void SimulationManager::parseSimulationBatch(XMLElement* simulation)
}
}
addTraceSetup(batch, simulation);
addTraceSetups(batch, simulation);
simulationBatches.push_back(batch);
}
void SimulationManager::runSimulation(string traceName, DramSetup dramSetup, vector<Device> traceSetup)
@@ -154,14 +153,15 @@ void SimulationManager::startTraceAnalyzer()
system(run_tpr.c_str());
}
void SimulationManager::addTraceSetup(SimulationBatch &batch, tinyxml2::XMLElement *simulation)
void SimulationManager::addTraceSetups(SimulationBatch &batch, tinyxml2::XMLElement *simulation)
{
vector<Device> devices;
XMLElement *tracesetups = simulation->FirstChildElement("tracesetups");
XMLElement *simconfig = simulation->FirstChildElement("simconfig");
unsigned int numberOfTracePlayers = 1;
XMLElement *ntp = simconfig->FirstChildElement("NumberOfTracePlayers");
unsigned int numberOfTracePlayers;
ntp->QueryUnsignedAttribute("value", &numberOfTracePlayers);
if (ntp != NULL)
ntp->QueryUnsignedAttribute("value", &numberOfTracePlayers);
for (XMLElement *tracesetup = tracesetups->FirstChildElement("tracesetup"); tracesetup != NULL; tracesetup = tracesetup->NextSiblingElement("tracesetup")) {

3
dram/src/simulation/SimulationManager.h
View File

@@ -32,6 +32,7 @@
* Authors:
* Janik Schlemminger
* Matthias Jung
* Eder F. Zulian
*/
#ifndef SIMULATIONMANAGER_H_
@@ -72,7 +73,7 @@ private:
void runSimulation(std::string traceName, DramSetup dramSetup, std::vector<Device> traceSetup);
void parseSimulationBatch(tinyxml2::XMLElement* simulation);
void addTraceSetup(SimulationBatch& batch, tinyxml2::XMLElement* element);
void addTraceSetups(SimulationBatch &batch, tinyxml2::XMLElement *element);
void report(std::string message);
};