From af41fd3af595c3870559255140ca9cf69818489a Mon Sep 17 00:00:00 2001
From: niusiyuan <siyuan.niu@telecom-paristech.fr>
Date: Mon, 20 May 2019 09:44:06 +0200
Subject: [PATCH] html change
---
simulators/c++2/src_simulator/arch/FPGA.cpp | 65 -------------------
simulators/c++2/src_simulator/arch/FPGA.h | 3 -
.../src_simulator/arch/SchedulableDevice.cpp | 4 --
.../c++2/src_simulator/sim/Simulator.cpp | 2 +-
4 files changed, 1 insertion(+), 73 deletions(-)
diff --git a/simulators/c++2/src_simulator/arch/FPGA.cpp b/simulators/c++2/src_simulator/arch/FPGA.cpp
index 9de58f1aeb..c374185c70 100644
--- a/simulators/c++2/src_simulator/arch/FPGA.cpp
+++ b/simulators/c++2/src_simulator/arch/FPGA.cpp
@@ -402,72 +402,7 @@ void FPGA::latencies2XML(std::ostringstream& glob, unsigned int id1, unsigned in
return;
}
-double FPGA::averageLoad (TMLTask* currTask) const{
- double _averageLoad=0;
- TMLTime _maxEndTime=0;
- for( TransactionList::const_iterator i = _transactList.begin(); i != _transactList.end(); ++i ) {
- if( (*i)-> getCommand()->getTask() == currTask ){
- TMLTime _endTime= (*i)->getEndTime();
- _maxEndTime=max(_maxEndTime,_endTime);
- }
- }
- for( TransactionList::const_iterator i = _transactList.begin(); i != _transactList.end(); ++i ) {
- if( (*i)-> getCommand()->getTask() == currTask ){
- _averageLoad += (*i)->getEndTime() - (*i)->getStartTime();
- }
- }
- if(_maxEndTime == 0)
- return 0;
- else {
- _averageLoad = (double)_averageLoad/_maxEndTime;
- return _averageLoad;
- }
- /*if( _maxEndTime == 0 )
- myfile << "average load is 0" << "<br>";
- else
- myfile<<" average load is "<<(double)_averageLoad/_maxEndTime<<"<br>";*/
-
-}
-
-void FPGA::drawPieChart(std::ofstream& myfile) const {
- std::cout<<"fpga drawpie chart"<<std::endl;
- TMLTime _maxEndTime=0;
- for(TaskList::const_iterator j =_taskList.begin(); j != _taskList.end(); ++j){
- for( TransactionList::const_iterator i = _transactList.begin(); i != _transactList.end(); ++i ) {
- if( (*i)-> getCommand()->getTask() == (*j) ){
- TMLTime _endTime= (*i)->getEndTime();
- _maxEndTime=max(_maxEndTime,_endTime);
- }
- }
- std::cout<<"max end time is "<<_maxEndTime<<std::endl;
- std::map <TMLTask*, double > transPercentage;
- for( TransactionList::const_iterator i = _transactList.begin(); i!= _transactList.end(); ++i){
- if( (*i)-> getCommand()->getTask() == (*j) ){
- transPercentage[(*i)-> getCommand()->getTask()]+=(double)((*i)->getEndTime()-(*i)->getStartTime())/_maxEndTime;
- }
- }
- std::map <TMLTask*, double>::iterator iter = transPercentage.begin();
- myfile << " var chart" << _ID << "_" << (*j)->toShortString() << "= new CanvasJS.Chart(\"chartContainer" << _ID << "_" << (*j)->toShortString() <<"\"," << std::endl;
- myfile << SCHED_HTML_JS_CONTENT2 << "Average load is " << averageLoad(*j) << SCHED_HTML_JS_CONTENT3 << std::endl;
- double idle=1;
- while( iter != transPercentage.end()){
- myfile << " { y:" << (iter->second)*100 << ", indexLabel: \"" << iter->first->toString() << "\" }," << std::endl;
- idle-=iter->second;
- ++iter;
- }
- myfile << " { y:" << idle*100 << ", indexLabel: \"idle time\"" << " }" << std::endl;
- myfile << std::endl;
- myfile << SCHED_HTML_PIE_END;
- myfile << "chart" << _ID << "_" << (*j)->toShortString() << ".render();" << std::endl;
- }
-
-}
-
-void FPGA::showPieChart(std::ofstream& myfile) const{
- myfile << SCHED_HTML_JS_DIV_ID << _ID << "_" << _htmlCurrTask->toShortString() << SCHED_HTML_JS_DIV_END << "<br>";
-}
-
void FPGA::schedule2HTML(std::ofstream& myfile) const {
myfile << "<h2><span>Scheduling for device: "<< _name << "</span></h2>" << std::endl;
diff --git a/simulators/c++2/src_simulator/arch/FPGA.h b/simulators/c++2/src_simulator/arch/FPGA.h
index 26b652f550..d776d513ac 100644
--- a/simulators/c++2/src_simulator/arch/FPGA.h
+++ b/simulators/c++2/src_simulator/arch/FPGA.h
@@ -129,9 +129,6 @@ public:
}
inline void setTransNumber(unsigned int num) { _transNumber=num;}
inline unsigned int getTransNumber() { return _transNumber;}
- double averageLoad (TMLTask* currTask) const;
- void drawPieChart(std::ofstream& myfile) const;
- void showPieChart(std::ofstream& myfile) const;
void schedule2HTML(std::ofstream& myfile) const;
inline const TaskList& getTaskList() const{return _taskList;}
inline void setHtmlCurrTask(TMLTask *t) { _htmlCurrTask=t;}
diff --git a/simulators/c++2/src_simulator/arch/SchedulableDevice.cpp b/simulators/c++2/src_simulator/arch/SchedulableDevice.cpp
index 8522156a00..ff092d7af8 100644
--- a/simulators/c++2/src_simulator/arch/SchedulableDevice.cpp
+++ b/simulators/c++2/src_simulator/arch/SchedulableDevice.cpp
@@ -208,10 +208,6 @@ double SchedulableDevice::averageLoad() const{
_averageLoad = (double)_averageLoad/_maxEndTime;
return _averageLoad;
}
- /* if( _maxEndTime == 0 )
- myfile << "average load is 0" << "<br>";
- else
- myfile<<"average load is "<< (double)_averageLoad/_maxEndTime<<"<br>";*/
}
diff --git a/simulators/c++2/src_simulator/sim/Simulator.cpp b/simulators/c++2/src_simulator/sim/Simulator.cpp
index 058b7c0906..3d9ce1aaf6 100644
--- a/simulators/c++2/src_simulator/sim/Simulator.cpp
+++ b/simulators/c++2/src_simulator/sim/Simulator.cpp
@@ -456,8 +456,8 @@ std::cout<<"schedule2HTML--------------------------------------*****************
std::cout<<"begin fpga html "<<(*j)->toShortString()<<std::endl;
(*j)->schedule2HTML(myfile);
std::cout<<"end fpga html "<<(*j)->toShortString()<<std::endl;
- (*j)->showPieChart(myfile);
}
+ (*j)->showPieChart(myfile);
}
for(BusList::const_iterator j=_simComp->getBusList().begin(); j != _simComp->getBusList().end(); ++j){
--
GitLab