diff --git a/simulators/c++2/src_simulator/arch/FPGA.cpp b/simulators/c++2/src_simulator/arch/FPGA.cpp index ae8cdcece0b0056f2a9c51e6e9445272873f8b22..b2a4965cc6a367270e1e9e026805509266774ad5 100644 --- a/simulators/c++2/src_simulator/arch/FPGA.cpp +++ b/simulators/c++2/src_simulator/arch/FPGA.cpp @@ -1272,7 +1272,7 @@ void FPGA::schedule2HTML(std::ofstream &myfile) unsigned int aLength = aCurrTrans->getOperationLength(); // Issue #4 - TMLTask *task = aCurrTrans->getCommand()->getTask(); + // TMLTask *task = aCurrTrans->getCommand()->getTask(); // std::cout<<"what is this task?"<<task->toString()<<std::endl; const std::string cellClass = determineHTMLCellClass(nextCellClassIndex); if (!(!(aCurrTrans->getCommand()->getActiveDelay()) && aCurrTrans->getCommand()->isDelayTransaction())) diff --git a/simulators/c++2/src_simulator/arch/OrderScheduler.cpp b/simulators/c++2/src_simulator/arch/OrderScheduler.cpp index c2e3a67f8993f01305b59ec190dac48032f320d2..e5148f1d4e9dd98e0b7109e4351c22d6dd5ac6df 100644 --- a/simulators/c++2/src_simulator/arch/OrderScheduler.cpp +++ b/simulators/c++2/src_simulator/arch/OrderScheduler.cpp @@ -51,7 +51,7 @@ TMLTime OrderScheduler::schedule(TMLTime iEndSchedule){ TaskList::iterator i; //std::cout << _name << ": Schedule called \n"; - TMLTransaction *anOldTransaction = _nextTransaction, *aTempTrans; + TMLTransaction *aTempTrans; TMLTime aLowestRunnableTimeFuture=-1, aRunnableTime, aLowestRunnableTimePast=-1; WorkloadSource *aSourcePast=0, *aSourceFuture=0; //std::cout << _name << ": Second if\n"; diff --git a/simulators/c++2/src_simulator/arch/ReconfigScheduler.cpp b/simulators/c++2/src_simulator/arch/ReconfigScheduler.cpp index bb9f7216887bdf9e5c4a164e787f527a6da9d3d3..85ffe77eeb8d458265594257133dd9584f1d9dbb 100644 --- a/simulators/c++2/src_simulator/arch/ReconfigScheduler.cpp +++ b/simulators/c++2/src_simulator/arch/ReconfigScheduler.cpp @@ -49,9 +49,9 @@ ReconfigScheduler::ReconfigScheduler(const std::string& iName, Priority iPrio, W TMLTime ReconfigScheduler::schedule(TMLTime iEndSchedule){ std::cout<<"reconfig scheduler"<<std::endl; TaskList::iterator i; - TMLTransaction *aMarkerPast=0, *aMarkerFuture=0,*aTempTrans; + TMLTransaction *aMarkerPast=0, *aTempTrans; TMLTask* aTempTask; - TMLTime aTransTimeFuture=-1,aRunnableTime,aLowestRunnableTimePast=-1;; + TMLTime aRunnableTime,aLowestRunnableTimePast=-1;; WorkloadSource *aSourcePast=0, *aSourceFuture=0; //NEW std::vector<std::string> getTaskOrder; std::string _tempTaskOrder, taskOrderCopy; diff --git a/simulators/c++2/src_simulator/sim/ServerHelp.cpp b/simulators/c++2/src_simulator/sim/ServerHelp.cpp index bc95e02cd81672d9af2346bc2c399a9cda3a05ef..62edc88c32f86cd58cfb0be4e1e32879af788203 100644 --- a/simulators/c++2/src_simulator/sim/ServerHelp.cpp +++ b/simulators/c++2/src_simulator/sim/ServerHelp.cpp @@ -95,12 +95,10 @@ void ServerHelp::parseHtml(std::string filePath) { std::string searchEnd = "</tr>"; std::string delimiter = "</td>"; // std::string breakLine = "<br />"; - unsigned int curLine = 0; std::istringstream data(filePath.c_str()); while(std::getline(data, line)) { - curLine++; if (line.find(searchStart1, 0) != std::string::npos || line.find(searchStart2, 0) != std::string::npos) { check = true; continue;