diff --git a/simulators/c++2/Makefile b/simulators/c++2/Makefile
index fc7167d878fda000afa7572dd0f95efe87c82019..6522b5e00a6b1c7e454dd2ed92538ec2ff4c4080 100755
--- a/simulators/c++2/Makefile
+++ b/simulators/c++2/Makefile
@@ -3,19 +3,19 @@ TARGET_ARCH = linux
CC = g++
#CC = test2.sh
#CC = /packages/gcc_3.2.2/bin/g++32
-OPT = -O1 -pthread
+OPT = -O3 -pthread
# Solaris
#LOPT = -O1 -pthread -ldl -lnsl -lsocket
#Linux
-LOPT = -O1 -pthread -ldl
+LOPT = -O3 -pthread -ldl
DEBUG = -g
PROFILE = -pg
OTHER = -Wall
TRY = -Wno-deprecated
#make = $(OPT) $(OTHER) $(TRY)
-LFLAGS = $(LOPT) $(OTHER) $(TRY) $(PROFILE)
-CFLAGS = $(PROFILE) $(OTHER)
+LFLAGS = $(LOPT) $(OTHER) $(TRY)
+CFLAGS = $(OTHER)
OBJDIR = lib
MODULE = run
diff --git a/simulators/c++2/src_simulator/TMLTransaction.cpp b/simulators/c++2/src_simulator/TMLTransaction.cpp
index 0e248132cf1038f95f996d05f9de9c43c51b9b4e..1ac7be808adb899e19efe05cefe02828f82b8543 100755
--- a/simulators/c++2/src_simulator/TMLTransaction.cpp
+++ b/simulators/c++2/src_simulator/TMLTransaction.cpp
@@ -43,7 +43,7 @@ Ludovic Apvrille, Renaud Pacalet
#include <CPU.h>
#include <TMLCommand.h>
-MemPool<TMLTransaction> TMLTransaction::memPool(BLOCK_SIZE_TRANS);
+MemPoolNoDel<TMLTransaction> TMLTransaction::memPool(BLOCK_SIZE_TRANS);
TMLTransaction::TMLTransaction():_runnableTime(0), _startTime(0), _length(0), _virtualLength(0), _command(0),
@@ -58,114 +58,103 @@ TMLTransaction::TMLTransaction(TMLCommand* iCommand, TMLLength iVirtualLength, T
_idlePenalty(0), _taskSwitchingPenalty(0), //, _branchingPenalty(0),
#endif
_channel(iChannel),_stateID(0) {
- //if (_virtualLength!=0) std::cout << "Trans runnable: " << toString() << "\n";
}
-TMLTime TMLTransaction::getRunnableTime() const{
- return _runnableTime;
-}
+//TMLTime TMLTransaction::getRunnableTime() const{
+// return _runnableTime;
+//}
-void TMLTransaction::setRunnableTime(TMLTime iRunnableTime){
- _runnableTime = max(_runnableTime,iRunnableTime);
- /*if (_runnableTimeSet){
- std::cout << "ERROR: runnable time set twice\n";
- }else{
- _runnableTimeSet=true;
- }*/
-}
+//void TMLTransaction::setRunnableTime(TMLTime iRunnableTime){
+// _runnableTime = max(_runnableTime,iRunnableTime);
+//}
-TMLTime TMLTransaction::getStartTime() const{
- return _startTime;
-}
+//TMLTime TMLTransaction::getStartTime() const{
+// return _startTime;
+//}
-TMLTime TMLTransaction::getStartTimeOperation() const{
+/*TMLTime TMLTransaction::getStartTimeOperation() const{
#ifdef PENALTIES_ENABLED
- //return _startTime + _idlePenalty + _taskSwitchingPenalty + _branchingPenalty;
return _startTime + _idlePenalty + _taskSwitchingPenalty;
#else
return _startTime;
#endif
-}
+}*/
-void TMLTransaction::setStartTime(TMLTime iStartTime){
- _startTime=iStartTime;
-}
+//void TMLTransaction::setStartTime(TMLTime iStartTime){
+// _startTime=iStartTime;
+//}
-TMLTime TMLTransaction::getOperationLength() const{
- return _length;
-}
+//TMLTime TMLTransaction::getOperationLength() const{
+// return _length;
+//}
-void TMLTransaction::setLength(TMLTime iLength){
- _length=iLength;
-}
+//void TMLTransaction::setLength(TMLTime iLength){
+// _length=iLength;
+//}
-TMLTime TMLTransaction::getOverallLength() const{
+/*TMLTime TMLTransaction::getOverallLength() const{
#ifdef PENALTIES_ENABLED
- //return _length + _idlePenalty + _taskSwitchingPenalty + _branchingPenalty;
return _length + _idlePenalty + _taskSwitchingPenalty;
#else
return _length;
#endif
-}
+}*/
-TMLTime TMLTransaction::getPenalties() const{
+/*TMLTime TMLTransaction::getPenalties() const{
#ifdef PENALTIES_ENABLED
- //return _idlePenalty + _taskSwitchingPenalty + _branchingPenalty;
return _idlePenalty + _taskSwitchingPenalty;
#else
return 0;
#endif
-}
+}*/
-TMLLength TMLTransaction::getVirtualLength() const{
- return _virtualLength;
-}
+//TMLLength TMLTransaction::getVirtualLength() const{
+// return _virtualLength;
+//}
-void TMLTransaction::setVirtualLength(TMLLength iLength){
- //if (iLength!=0 && _virtualLength==0) std::cout << "Trans runnable: " << toString() << "\n";
- _virtualLength=iLength;
-}
+//void TMLTransaction::setVirtualLength(TMLLength iLength){
+// _virtualLength=iLength;
+//}
-TMLCommand* TMLTransaction::getCommand() const{
- return _command;
-}
+//TMLCommand* TMLTransaction::getCommand() const{
+// return _command;
+//}
-TMLTime TMLTransaction::getEndTime() const{
+/*TMLTime TMLTransaction::getEndTime() const{
#ifdef PENALTIES_ENABLED
- //return _startTime + _length + _idlePenalty + _taskSwitchingPenalty + _branchingPenalty;
return _startTime + _length + _idlePenalty + _taskSwitchingPenalty;
#else
return _startTime + _length;
#endif
-}
+}*/
-TMLTime TMLTransaction::getIdlePenalty() const{
+/*TMLTime TMLTransaction::getIdlePenalty() const{
#ifdef PENALTIES_ENABLED
return _idlePenalty;
#else
return 0;
#endif
-}
+}*/
-void TMLTransaction::setIdlePenalty(TMLTime iIdlePenalty){
+/*void TMLTransaction::setIdlePenalty(TMLTime iIdlePenalty){
#ifdef PENALTIES_ENABLED
_idlePenalty=iIdlePenalty;
#endif
-}
+}*/
-TMLTime TMLTransaction::getTaskSwitchingPenalty() const{
+/*TMLTime TMLTransaction::getTaskSwitchingPenalty() const{
#ifdef PENALTIES_ENABLED
return _taskSwitchingPenalty;
#else
return 0;
#endif
-}
+}*/
-void TMLTransaction::setTaskSwitchingPenalty(TMLTime iTaskSwitchingPenalty){
+/*void TMLTransaction::setTaskSwitchingPenalty(TMLTime iTaskSwitchingPenalty){
#ifdef PENALTIES_ENABLED
_taskSwitchingPenalty=iTaskSwitchingPenalty;
#endif
-}
+}*/
/*TMLTime TMLTransaction::getBranchingPenalty() const{
#ifdef PENALTIES_ENABLED
@@ -199,42 +188,42 @@ std::string TMLTransaction::toShortString() const{
return outp.str();
}
-void TMLTransaction::setChannel(TMLChannel* iChannel){
- _channel=iChannel;
-}
+//void TMLTransaction::setChannel(TMLChannel* iChannel){
+// _channel=iChannel;
+//}
-TMLChannel* TMLTransaction::getChannel() const{
- return _channel;
-}
+//TMLChannel* TMLTransaction::getChannel() const{
+// return _channel;
+//}
-void * TMLTransaction::operator new(size_t size){
- return memPool.pmalloc(size);
-}
+//void * TMLTransaction::operator new(size_t size){
+// return memPool.pmalloc(size);
+//}
-void TMLTransaction::operator delete(void *p, size_t size){
- memPool.pfree(p, size);
-}
+//void TMLTransaction::operator delete(void *p, size_t size){
+// memPool.pfree(p, size);
+//}
-void TMLTransaction::reset(){
- memPool.reset();
-}
+//void TMLTransaction::reset(){
+// memPool.reset();
+//}
-void TMLTransaction::incID(){
- _ID++;
-}
+//void TMLTransaction::incID(){
+// _ID++;
+//}
-ID TMLTransaction::getID(){
- return _ID;
-}
+//ID TMLTransaction::getID(){
+// return _ID;
+//}
-void TMLTransaction::resetID(){
- _ID=1;
-}
+//void TMLTransaction::resetID(){
+// _ID=1;
+//}
-void TMLTransaction::setStateID(ID iID){
- _stateID=iID;
-}
+//void TMLTransaction::setStateID(ID iID){
+// _stateID=iID;
+//}
-ID TMLTransaction::getStateID(){
- return _stateID;
-}
+//ID TMLTransaction::getStateID(){
+// return _stateID;
+//}
diff --git a/simulators/c++2/src_simulator/TMLTransaction.h b/simulators/c++2/src_simulator/TMLTransaction.h
index f94e911c8f6ce455a14b9aea32117d014624aa94..d8613cc716f13a8b0275d0ecc93d246022ddcfce 100644
--- a/simulators/c++2/src_simulator/TMLTransaction.h
+++ b/simulators/c++2/src_simulator/TMLTransaction.h
@@ -42,7 +42,7 @@ Ludovic Apvrille, Renaud Pacalet
#define TMLTransactionH
#include <definitions.h>
-#include <MemPool.h>
+#include <MemPoolNoDel.h>
class TMLCommand;
class TMLChannel;
@@ -63,87 +63,131 @@ public:
/**
\return Runnable time
*/
- TMLTime getRunnableTime() const;
+ inline TMLTime getRunnableTime() const {return _runnableTime;}
///Sets the time when the transaction became runnable
/**
\param iRunnableTime Runnable time
*/
- void setRunnableTime(TMLTime iRunnableTime);
+ inline void setRunnableTime(TMLTime iRunnableTime) {_runnableTime = max(_runnableTime,iRunnableTime);}
///Returns the start time of the transaction
/**
\return Start time
*/
- TMLTime getStartTime() const;
+ inline TMLTime getStartTime() const {return _startTime;}
///Returns the start time of the operational part of the transaction
/**
\return Start time of the operational part
*/
- TMLTime getStartTimeOperation() const;
+ inline TMLTime getStartTimeOperation() const {
+#ifdef PENALTIES_ENABLED
+ return _startTime + _idlePenalty + _taskSwitchingPenalty;
+#else
+ return _startTime;
+#endif
+ }
///Sets the start time of the transaction
/**
\param iStartTime Start time
*/
- void setStartTime(TMLTime iStartTime);
+ inline void setStartTime(TMLTime iStartTime) {_startTime=iStartTime;}
///Returns the length of the operational part of the transaction
/**
\return Length of the operational part
*/
- TMLTime getOperationLength() const;
+ inline TMLTime getOperationLength() const {return _length;}
///Returns the length of the operation and penalties
/**
\return Overall transaction length
*/
- TMLTime getOverallLength() const;
+ inline TMLTime getOverallLength() const{
+#ifdef PENALTIES_ENABLED
+ return _length + _idlePenalty + _taskSwitchingPenalty;
+#else
+ return _length;
+#endif
+ }
///Sets the length of the transaction
/**
\param iLength Length of the transaction
*/
- void setLength(TMLTime iLength);
+ inline void setLength(TMLTime iLength) {_length=iLength;}
///Returns the length of all penalties
/**
\return Length of penalties
*/
- TMLTime getPenalties() const;
+ inline TMLTime getPenalties() const{
+#ifdef PENALTIES_ENABLED
+ return _idlePenalty + _taskSwitchingPenalty;
+#else
+ return 0;
+#endif
+ }
///Returns the virtual length of the transaction (number of execution units already carried out by previous transactions)
/**
\return Virtual length
*/
- TMLLength getVirtualLength() const;
+ inline TMLLength getVirtualLength() const {return _virtualLength;}
///Sets the virtual length of the transaction (number of execution units already carried out by previous transactions)
/**
\param iLength Virtual length of the transaction
*/
- void setVirtualLength(TMLLength iLength);
+ inline void setVirtualLength(TMLLength iLength) {_virtualLength=iLength;}
///Returns a pointer to the command the transaction belongs to
/**
\return Pointer to command
*/
- TMLCommand* getCommand() const;
+ inline TMLCommand* getCommand() const {return _command;}
///Returns the end time of the transaction
/**
\return End time
*/
- TMLTime getEndTime() const;
+ inline TMLTime getEndTime() const{
+#ifdef PENALTIES_ENABLED
+ return _startTime + _length + _idlePenalty + _taskSwitchingPenalty;
+#else
+ return _startTime + _length;
+#endif
+ }
///Returns the idle panalty of the transaction
/**
\return Idle panalty
*/
- TMLTime getIdlePenalty() const;
+ inline TMLTime getIdlePenalty() const{
+#ifdef PENALTIES_ENABLED
+ return _idlePenalty;
+#else
+ return 0;
+#endif
+ }
///Sets the idle panalty of the transaction
/**
\param iIdlePenalty Idle penalty
*/
- void setIdlePenalty(TMLTime iIdlePenalty);
+ inline void setIdlePenalty(TMLTime iIdlePenalty){
+#ifdef PENALTIES_ENABLED
+ _idlePenalty=iIdlePenalty;
+#endif
+ }
///Returns the task switching panalty of the transaction
/**
\return Task switching penalty
*/
- TMLTime getTaskSwitchingPenalty() const;
+ inline TMLTime getTaskSwitchingPenalty() const{
+#ifdef PENALTIES_ENABLED
+ return _taskSwitchingPenalty;
+#else
+ return 0;
+#endif
+ }
///Sets the task switching panalty of the transaction
/**
\param iTaskSwitchingPenalty Task switching penalty
*/
- void setTaskSwitchingPenalty(TMLTime iTaskSwitchingPenalty);
+ inline void setTaskSwitchingPenalty(TMLTime iTaskSwitchingPenalty){
+#ifdef PENALTIES_ENABLED
+ _taskSwitchingPenalty=iTaskSwitchingPenalty;
+#endif
+ }
/////Returns the branching panalty of the transaction
////**
//\return Branching penalty
@@ -168,20 +212,20 @@ public:
/**
\param iChannel Pointer to a channel
*/
- void setChannel(TMLChannel* iChannel);
+ inline void setChannel(TMLChannel* iChannel) {_channel=iChannel;}
///Get channel on which data was conveyed
/**
\return Pointer to channel
*/
- TMLChannel* getChannel() const;
- static void * operator new(size_t size);
- static void operator delete(void *p, size_t size);
- static void reset();
- static void incID();
- static ID getID();
- static void resetID();
- void setStateID(ID iID);
- ID getStateID();
+ inline TMLChannel* getChannel() const {return _channel;}
+ inline static void * operator new(size_t size) {return memPool.pmalloc(size);}
+ inline static void operator delete(void *p, size_t size) {memPool.pfree(p, size);}
+ inline static void reset() {memPool.reset();}
+ inline static void incID() {_ID++;}
+ inline static ID getID() {return _ID;}
+ inline static void resetID() {_ID=1;}
+ inline void setStateID(ID iID) {_stateID=iID;}
+ inline ID getStateID() {return _stateID;}
protected:
///Time when the transaction became runnable
TMLTime _runnableTime;
@@ -205,7 +249,7 @@ protected:
TMLChannel* _channel;
ID _stateID;
///Memory pool for transactions
- static MemPool<TMLTransaction> memPool;
+ static MemPoolNoDel<TMLTransaction> memPool;
///Current Transaction ID
static ID _ID;
};
diff --git a/simulators/c++2/src_simulator/app/Parameter.h b/simulators/c++2/src_simulator/app/Parameter.h
index fc914dfb342c1a59219deee149f473e849b35737..d6f99a625a74e3ec206dcc23699fb52118b2501c 100644
--- a/simulators/c++2/src_simulator/app/Parameter.h
+++ b/simulators/c++2/src_simulator/app/Parameter.h
@@ -102,14 +102,14 @@ public:
///Print function for testing purposes
void print() const{
- std::cerr << "print " << size << " elements in mempool " << &memPool << " :\n";
+ //std::cerr << "print " << size << " elements in mempool " << &memPool << " :\n";
//#if size>0
for (unsigned int i=0;i<size;i++){
- std::cerr << " p[" << (i+1) << "]:" << _p[i];
+ std::cout << " p[" << (i+1) << "]:" << _p[i];
}
//#endif
- std::cerr << std::endl;
- std::cerr << "end print:\n";
+ //std::cerr << std::endl;
+ //std::cerr << "end print:\n";
}
std::ostream& writeObject(std::ostream& s){
diff --git a/simulators/c++2/src_simulator/app/TMLActionCommand.cpp b/simulators/c++2/src_simulator/app/TMLActionCommand.cpp
index ea0d65de43ae209a4ac0365efbf2e311dbea667c..27f9d4477c01b598d22f31e9392354fa938ac46c 100755
--- a/simulators/c++2/src_simulator/app/TMLActionCommand.cpp
+++ b/simulators/c++2/src_simulator/app/TMLActionCommand.cpp
@@ -47,8 +47,8 @@ TMLActionCommand::TMLActionCommand(ID iID, TMLTask* iTask, ActionFuncPointer iAc
_type=ACT;
}
-void TMLActionCommand::execute(){
-}
+//void TMLActionCommand::execute(){
+//}
TMLCommand* TMLActionCommand::prepareNextTransaction(){
if (_simComp->getStopFlag()){
@@ -84,10 +84,10 @@ std::string TMLActionCommand::toString() const{
return outp.str();
}
-std::string TMLActionCommand::toShortString() const{
- return "Action";
-}
+//std::string TMLActionCommand::toShortString() const{
+// return "Action";
+//}
-std::string TMLActionCommand::getCommandStr() const{
- return "act";
-}
+//std::string TMLActionCommand::getCommandStr() const{
+// return "act";
+//}
diff --git a/simulators/c++2/src_simulator/app/TMLActionCommand.h b/simulators/c++2/src_simulator/app/TMLActionCommand.h
index 7a41be709adc8630f825403a775e73b618239258..83b124359ca4381d641759d520549ac620023014 100755
--- a/simulators/c++2/src_simulator/app/TMLActionCommand.h
+++ b/simulators/c++2/src_simulator/app/TMLActionCommand.h
@@ -56,11 +56,11 @@ public:
\param iActionFunc Member function pointer to the action function
*/
TMLActionCommand(ID iID, TMLTask* iTask, ActionFuncPointer iActionFunc, const char* iLiveVarList, bool iCheckpoint);
- void execute();
+ inline void execute() {}
//TMLTask* getDependentTask() const;
std::string toString() const;
- std::string toShortString() const;
- std::string getCommandStr() const;
+ inline std::string toShortString() const {return "Action";}
+ inline std::string getCommandStr() const {return "act";}
protected:
///Member function pointer to the action function
ActionFuncPointer _actionFunc;
diff --git a/simulators/c++2/src_simulator/app/TMLChannel.cpp b/simulators/c++2/src_simulator/app/TMLChannel.cpp
index 3017e1a9b2da038b1b44ba2fe7df3f1b582b102e..a0ff4683b472b3ea3f81b1183aae3b6b83447b2e 100755
--- a/simulators/c++2/src_simulator/app/TMLChannel.cpp
+++ b/simulators/c++2/src_simulator/app/TMLChannel.cpp
@@ -51,13 +51,13 @@ TMLChannel::~TMLChannel(){
if (_slaves!=0) delete[] _slaves;
}
-void TMLChannel::setBlockedReadTask(TMLTask* iReadTask){
- _readTask=iReadTask;
-}
+//void TMLChannel::setBlockedReadTask(TMLTask* iReadTask){
+// _readTask=iReadTask;
+//}
-void TMLChannel::setBlockedWriteTask(TMLTask* iWriteTask){
- _writeTask=iWriteTask;
-}
+//void TMLChannel::setBlockedWriteTask(TMLTask* iWriteTask){
+// _writeTask=iWriteTask;
+//}
BusMaster* TMLChannel::getNextMaster(TMLTransaction* iTrans){
//if (iTrans->getCommand()->getTask()==_writeTask){
@@ -102,14 +102,10 @@ Slave* TMLChannel::getNextSlave(TMLTransaction* iTrans) const{
}
}
-//unsigned int TMLChannel::getNumberOfHops() const{
-// return _numberOfHops;
+//std::string TMLChannel::toShortString() const{
+// return _name;
//}
-std::string TMLChannel::toShortString() const{
- return _name;
-}
-
std::ostream& TMLChannel::writeObject(std::ostream& s){
//WRITE_STREAM(s,_writeTransCurrHop);
//WRITE_STREAM(s,_readTransCurrHop);
@@ -139,37 +135,36 @@ void TMLChannel::reset(){
//std::cout << "Channel reset end" << std::endl;
}
-ID TMLChannel::getID() const {
- return _ID;
-}
+//ID TMLChannel::getID() const {
+// return _ID;
+//}
-TMLLength TMLChannel::insertSamples(TMLLength iNbOfSamples, Parameter* iParam){
- return iNbOfSamples;
-}
+//TMLLength TMLChannel::insertSamples(TMLLength iNbOfSamples, Parameter* iParam){
+// return iNbOfSamples;
+//}
-void TMLChannel::streamStateXML(std::ostream& s) const{
- //s << "Basic version TMLChannel";
-}
+//void TMLChannel::streamStateXML(std::ostream& s) const{
+//}
-TMLLength TMLChannel::getContent() const{
- return 0;
-}
+//TMLLength TMLChannel::getContent() const{
+// return 0;
+//}
-bool TMLChannel::getOverflow() const{
- return false;
-}
+//bool TMLChannel::getOverflow() const{
+// return false;
+//}
-bool TMLChannel::getUnderflow() const{
- return false;
-}
+//bool TMLChannel::getUnderflow() const{
+// return false;
+//}
-Priority TMLChannel::getPriority(){
- return _priority;
-}
+//Priority TMLChannel::getPriority(){
+// return _priority;
+//}
-unsigned int TMLChannel::getWidth(){
- return _width;
-}
+//unsigned int TMLChannel::getWidth(){
+// return _width;
+//}
void TMLChannel::setSignificance(TMLTask* iTask, bool iSignificance){
//unsigned int aInput = (iTask==_writeTask)?1:2;
@@ -180,12 +175,10 @@ void TMLChannel::setSignificance(TMLTask* iTask, bool iSignificance){
_significance &= (~aInput);
}
-bool TMLChannel::getSignificance(){
- //std::cout << "get\n";
- //if (_ID==53 && _significance==0) std::cout << "failure\n";
- return (_significance != 0);
-}
+//bool TMLChannel::getSignificance(){
+// return (_significance != 0);
+//}
-bool TMLChannel::mappedOnBus(){
- return _numberOfHops!=0;
-}
+//bool TMLChannel::mappedOnBus(){
+// return _numberOfHops!=0;
+//}
diff --git a/simulators/c++2/src_simulator/app/TMLChannel.h b/simulators/c++2/src_simulator/app/TMLChannel.h
index 57acc9f1cb5d21011b14a0ce2e7ca17c33118440..f4b90ff727334679fe50e33aa9e6bd106859a3b9 100755
--- a/simulators/c++2/src_simulator/app/TMLChannel.h
+++ b/simulators/c++2/src_simulator/app/TMLChannel.h
@@ -91,7 +91,7 @@ public:
/**
\param iReadTask Pointer to the task
*/
- void setBlockedReadTask(TMLTask* iReadTask);
+ inline void setBlockedReadTask(TMLTask* iReadTask) {_readTask=iReadTask;}
///Returns a pointer to the tasks which performs read operation on the channel
/**
\return Pointer to the task
@@ -101,7 +101,7 @@ public:
/**
\param iWriteTask Pointer to the task
*/
- void setBlockedWriteTask(TMLTask* iWriteTask);
+ inline void setBlockedWriteTask(TMLTask* iWriteTask) {_writeTask=iWriteTask;}
///Returns a pointer to the tasks which performs write operation on the channel
/**
\return Pointer to the task
@@ -137,7 +137,7 @@ public:
/**
\return Short string representation
*/
- std::string toShortString() const;
+ inline std::string toShortString() const {return _name;}
virtual std::ostream& writeObject(std::ostream& s);
virtual std::istream& readObject(std::istream& s);
virtual void reset();
@@ -145,34 +145,34 @@ public:
/**
\return Unique ID
*/
- ID getID() const;
+ inline ID getID() const {return _ID;}
///Inserts samples into the channel
/**
\param iNbOfSamples Number of samples to insert
\param iParam Parameter to insert
\return Returns true if successful
*/
- virtual TMLLength insertSamples(TMLLength iNbOfSamples, Parameter* iParam);
+ inline virtual TMLLength insertSamples(TMLLength iNbOfSamples, Parameter* iParam) {return iNbOfSamples;}
///Writes XML information about the component to a stream
/**
\param s Reference to an output stream
*/
- virtual void streamStateXML(std::ostream& s) const;
+ inline virtual void streamStateXML(std::ostream& s) const {}
///Returns the number of samples stored in the channel
/**
\return Content of the channel
*/
- virtual TMLLength getContent() const;
+ inline virtual TMLLength getContent() const {return 0;}
///Returns a flag indicating if a channel overflow has been encoutered
/**
\return Channel overflow flag
*/
- virtual bool getOverflow() const;
+ inline virtual bool getOverflow() const {return false;}
///Returns a flag indicating if a channel underflow has been encoutered
/**
\return Channel underflow flag
*/
- virtual bool getUnderflow() const;
+ inline virtual bool getUnderflow() const {return false;}
///Returns the hash value for the current task state
/**
\param iHash Hash algorithm object
@@ -182,20 +182,20 @@ public:
/**
\return Hash Value
*/
- Priority getPriority();
+ inline Priority getPriority() {return _priority;}
///Returns the width of the channel
/**
\return Channel width
*/
- unsigned int getWidth();
+ inline unsigned int getWidth() {return _width;}
///Returns the width of the channel
/**
\param iTask Reference to reading or writing task
\param iSignificance Flag indicating if operations performed by this task are still reachable
*/
void setSignificance(TMLTask* iTask, bool iSignificance);
- bool getSignificance();
- bool mappedOnBus();
+ inline bool getSignificance() {return (_significance != 0);}
+ inline bool mappedOnBus() {return _numberOfHops!=0;}
protected:
///ID of channel
ID _ID;
diff --git a/simulators/c++2/src_simulator/app/TMLChoiceCommand.cpp b/simulators/c++2/src_simulator/app/TMLChoiceCommand.cpp
index 27abd9a0c6886e7884d400160073a6bb7593d3b3..8633ca549e7948e827e7ff8e919a162e847ae10e 100755
--- a/simulators/c++2/src_simulator/app/TMLChoiceCommand.cpp
+++ b/simulators/c++2/src_simulator/app/TMLChoiceCommand.cpp
@@ -48,8 +48,8 @@ TMLChoiceCommand::TMLChoiceCommand(ID iID, TMLTask* iTask, RangeFuncPointer iRan
_type=CHO;
}
-void TMLChoiceCommand::execute(){
-}
+//void TMLChoiceCommand::execute(){
+//}
TMLCommand* TMLChoiceCommand::getNextCommand() const{
ParamType aMin, aMax;
@@ -82,10 +82,10 @@ std::string TMLChoiceCommand::toString() const{
return outp.str();
}
-std::string TMLChoiceCommand::toShortString() const{
- return "Choice";
-}
+//std::string TMLChoiceCommand::toShortString() const{
+// return "Choice";
+//}
-std::string TMLChoiceCommand::getCommandStr() const{
- return "cho";
-}
+//std::string TMLChoiceCommand::getCommandStr() const{
+// return "cho";
+//}
diff --git a/simulators/c++2/src_simulator/app/TMLChoiceCommand.h b/simulators/c++2/src_simulator/app/TMLChoiceCommand.h
index 975489db96c85292a39947d305396b7345dd4bc5..5e9c0415f4c1221964f54d95c231992f5ce863ce 100755
--- a/simulators/c++2/src_simulator/app/TMLChoiceCommand.h
+++ b/simulators/c++2/src_simulator/app/TMLChoiceCommand.h
@@ -57,10 +57,10 @@ public:
\param iNbOfBranches Number of branches of the choice
*/
TMLChoiceCommand(ID iID, TMLTask* iTask, RangeFuncPointer iRangeFunc, unsigned int iNbOfBranches, const char* iLiveVarList, bool iCheckpoint);
- void execute();
+ inline void execute() {}
std::string toString() const;
- std::string toShortString() const;
- std::string getCommandStr() const;
+ inline std::string toShortString() const {return "Choice";}
+ inline std::string getCommandStr() const {return "cho";}
protected:
///Member function pointer to the condition function returning the index of the next command
RangeFuncPointer _rangeFunc;
diff --git a/simulators/c++2/src_simulator/app/TMLCommand.cpp b/simulators/c++2/src_simulator/app/TMLCommand.cpp
index 82933f058e9753454bb15f78e0c6600652ce2666..c63deee1b01e21f7b184eebdfe5dc52ddd79585e 100755
--- a/simulators/c++2/src_simulator/app/TMLCommand.cpp
+++ b/simulators/c++2/src_simulator/app/TMLCommand.cpp
@@ -51,6 +51,7 @@ Ludovic Apvrille, Renaud Pacalet
#include <TMLWaitCommand.h>
#include <SimComponents.h>
#include <TMLStopCommand.h>
+#include <TMLRandomCommand.h>
std::list<TMLCommand*> TMLCommand::_instanceList;
SimComponents* TMLCommand::_simComp=0;
@@ -131,6 +132,11 @@ TMLCommand* TMLCommand::prepare(bool iInit){
if (_progress==0){
#ifdef LISTENERS_ENABLED
NOTIFY_CMD_ENTERED(this);
+#else
+#ifdef EXPLO_ENABLED
+ if (dynamic_cast<IndeterminismSource*>(this)!=0) NOTIFY_CMD_ENTERED(this);
+ //if (dynamic_cast<TMLRandomCommand*>(this)!=0) NOTIFY_CMD_ENTERED(this);
+#endif
#endif
_justStarted=true;
}else{
@@ -160,18 +166,18 @@ TMLCommand* TMLCommand::prepare(bool iInit){
return 0;
}
-TMLTask* TMLCommand::getTask() const{
- return _task;
-}
+//TMLTask* TMLCommand::getTask() const{
+// return _task;
+//}
-void TMLCommand::setNextCommand(TMLCommand** iNextCommand){
- _nextCommand=iNextCommand;
-}
+//void TMLCommand::setNextCommand(TMLCommand** iNextCommand){
+// _nextCommand=iNextCommand;
+//}
-TMLCommand* TMLCommand::getNextCommand() const{
+//TMLCommand* TMLCommand::getNextCommand() const{
//std::cerr << "getNext Cmd of TMLCommand\n";
- return (_nextCommand==0)?0:_nextCommand[0];
-}
+ //return (_nextCommand==0)?0:_nextCommand[0];
+//}
TMLCommand** TMLCommand::getNextCommands(unsigned int& oNbOfCmd) const{
//returned number is not correct for composite choice/choice commands and composite action/choice commands !!!!
@@ -179,9 +185,9 @@ TMLCommand** TMLCommand::getNextCommands(unsigned int& oNbOfCmd) const{
return _nextCommand;
}
-TMLTransaction* TMLCommand::getCurrTransaction() const{
- return _currTransaction;
-}
+//TMLTransaction* TMLCommand::getCurrTransaction() const{
+// return _currTransaction;
+//}
std::string TMLCommand::toString() const{
std::ostringstream outp;
@@ -189,27 +195,27 @@ std::string TMLCommand::toString() const{
return outp.str();
}
-TMLChannel* TMLCommand::getChannel(unsigned int iIndex) const{
- return 0;
-}
+//TMLChannel* TMLCommand::getChannel(unsigned int iIndex) const{
+// return 0;
+//}
-unsigned int TMLCommand::getNbOfChannels() const{
- return 0;
-}
+//unsigned int TMLCommand::getNbOfChannels() const{
+// return 0;
+//}
-TMLTask* TMLCommand::getDependentTask(unsigned int iIndex)const{
- return 0;
-}
+//TMLTask* TMLCommand::getDependentTask(unsigned int iIndex)const{
+// return 0;
+//}
-Parameter* TMLCommand::setParams(Parameter* ioParam){
- return 0;
-}
+//Parameter* TMLCommand::setParams(Parameter* ioParam){
+// return 0;
+//}
-#ifdef ADD_COMMENTS
-std::string TMLCommand::getCommentString(Comment* iCom) const{
- return "no comment available";
-}
-#endif
+//#ifdef ADD_COMMENTS
+//std::string TMLCommand::getCommentString(Comment* iCom) const{
+// return "no comment available";
+//}
+//#endif
void TMLCommand::setBreakpoint(GeneralListener* iBreakp){
//void TMLCommand::setBreakpoint(CommandListener* iBreakp){
@@ -282,33 +288,33 @@ void TMLCommand::removeGlobalListener(GeneralListener* iListener){
}
}
-ID TMLCommand::getID() const{
- return _ID;
-}
+//ID TMLCommand::getID() const{
+// return _ID;
+//}
-TMLLength TMLCommand::getProgress() const{
- return _progress;
-}
+//TMLLength TMLCommand::getProgress() const{
+// return _progress;
+//}
-unsigned int TMLCommand::getProgressInPercent() const{
- return (_length==0)? 0:_progress*100/_length;
-}
+//unsigned int TMLCommand::getProgressInPercent() const{
+// return (_length==0)? 0:_progress*100/_length;
+//}
-void TMLCommand::setSimComponents(SimComponents* iSimComp){
- _simComp=iSimComp;
-}
+//void TMLCommand::setSimComponents(SimComponents* iSimComp){
+// _simComp=iSimComp;
+//}
-unsigned long TMLCommand::getStateHash() const{
- return _ID + _progress;
-}
+//unsigned long TMLCommand::getStateHash() const{
+// return _ID + _progress;
+//}
-TMLTime TMLCommand::getCommandStartTime() const{
- return (_commandStartTime==((TMLTime)-1))? 0: _commandStartTime;
-}
+//TMLTime TMLCommand::getCommandStartTime() const{
+// return (_commandStartTime==((TMLTime)-1))? 0: _commandStartTime;
+//}
-TMLLength TMLCommand::getLength() const{
- return _length;
-}
+//TMLLength TMLCommand::getLength() const{
+// return _length;
+//}
void TMLCommand::streamStateXML(std::ostream& s){
for(std::list<TMLCommand*>::iterator i=_instanceList.begin(); i != _instanceList.end(); ++i){
@@ -323,9 +329,9 @@ TMLCommand* TMLCommand::getCommandByID(ID iID){
return 0;
}
-unsigned int TMLCommand::getType(){
- return _type;
-}
+//unsigned int TMLCommand::getType(){
+// return _type;
+//}
template void TMLCommand::registerGlobalListenerForType<IndeterminismSource>(GeneralListener* iListener, TMLTask* aTask);
template void TMLCommand::registerGlobalListenerForType<TMLChoiceCommand>(GeneralListener* iListener, TMLTask* aTask);
diff --git a/simulators/c++2/src_simulator/app/TMLCommand.h b/simulators/c++2/src_simulator/app/TMLCommand.h
index 90747ef8bcb0d9283d96de8a840e4f1a871061d0..2adafdf7ccb02372bccab7a56e92877462902f51 100755
--- a/simulators/c++2/src_simulator/app/TMLCommand.h
+++ b/simulators/c++2/src_simulator/app/TMLCommand.h
@@ -82,39 +82,39 @@ public:
/**
\param iNextCommand Pointer to an array of pointers to the next commands
*/
- void setNextCommand(TMLCommand** iNextCommand);
+ inline void setNextCommand(TMLCommand** iNextCommand) {_nextCommand=iNextCommand;}
///Returns a pointer to the task the command belongs to
/**
\return Pointer to the task
*/
- TMLTask* getTask() const;
+ inline TMLTask* getTask() const {return _task;}
///Returns a pointer to the current transaction
/**
\return Pointer to the current transaction
*/
- TMLTransaction* getCurrTransaction() const;
+ inline TMLTransaction* getCurrTransaction() const {return _currTransaction;}
///Returns a pointer to the task which could be unblocked by the command
/**
\param iIndex Index of the task
\return Pointer to the dependent task
*/
- virtual TMLTask* getDependentTask(unsigned int iIndex)const;
+ inline virtual TMLTask* getDependentTask(unsigned int iIndex) const {return 0;}
///Returns a pointer to the channel on which the command performs operations
/**
\param iIndex Index of the channel
\return Pointer to the channel
*/
- virtual TMLChannel* getChannel(unsigned int iIndex) const;
+ inline virtual TMLChannel* getChannel(unsigned int iIndex) const {return 0;}
///Returns the number of channels impacted by the command
/**
\return Number of channels
*/
- virtual unsigned int getNbOfChannels() const;
+ inline virtual unsigned int getNbOfChannels() const {return 0;}
///Initializes a parameter structure to the values specified by the command
/**
\param ioParam Parameter data structure
*/
- virtual Parameter* setParams(Parameter* ioParam);
+ inline virtual Parameter* setParams(Parameter* ioParam) {return 0;}
///Returns a string representation of the command
/**
\return Detailed string representation
@@ -136,7 +136,7 @@ public:
\param iCom Pointer to comment
\return Sring representation of the comment
*/
- virtual std::string getCommentString(Comment* iCom) const;
+ inline virtual std::string getCommentString(Comment* iCom) const {return "no comment available";}
#endif
virtual std::ostream& writeObject(std::ostream& s);
virtual std::istream& readObject(std::istream& s);
@@ -164,7 +164,7 @@ public:
/**
\return Unique ID
*/
- ID getID() const;
+ inline ID getID() const {return _ID;}
///Sets a new breakpoint
/**
\param iBreakp Pointer to breakpoint
@@ -177,17 +177,17 @@ public:
/**
\return Progress of the command
*/
- TMLLength getProgress() const;
+ inline TMLLength getProgress() const {return _progress;}
///Returns the progress of the command in percent
/**
\return Progress of the command in percent
*/
- unsigned int getProgressInPercent() const;
+ inline unsigned int getProgressInPercent() const {return (_length==0)? 0:_progress*100/_length;}
///Sets the internal pointer to the simulation components
/**
\param iSimComp Pointer to simulation components
*/
- static void setSimComponents(SimComponents* iSimComp);
+ inline static void setSimComponents(SimComponents* iSimComp) {_simComp=iSimComp;}
///Returns a pointer to the next command array and the number of successors of this command
/**
\param oNbOfCmd Number of successors of this command
@@ -198,17 +198,17 @@ public:
/**
\return Hash Value
*/
- unsigned long getStateHash() const;
+ inline unsigned long getStateHash() const {return _ID + _progress;}
///Returns the simulation time when the command is prepared for its first transaction
/**
\return Command start time
*/
- TMLTime getCommandStartTime() const;
+ inline TMLTime getCommandStartTime() const {return (_commandStartTime==((TMLTime)-1))? 0: _commandStartTime;}
///Returns the virtual length of the command
/**
\return Command length
*/
- TMLLength getLength() const;
+ inline TMLLength getLength() const {return _length;}
///Returns whether the command is considered as Checkpoint for system state comparisons
/**
\return true if command is a checkpoint
@@ -216,7 +216,7 @@ public:
bool isCheckpoint();
static void streamStateXML(std::ostream& s);
static TMLCommand* getCommandByID(ID iID);
- unsigned int getType();
+ inline unsigned int getType() {return _type;}
protected:
///ID of the command
ID _ID;
@@ -242,7 +242,7 @@ protected:
/**
\return Pointer to the next command
*/
- virtual TMLCommand* getNextCommand() const;
+ inline virtual TMLCommand* getNextCommand() const {return (_nextCommand==0)?0:_nextCommand[0];}
///Special actions taken by subclasses of TMLCommand to prepare the next transaction
/**
\return True if there was a transaction to prepare
diff --git a/simulators/c++2/src_simulator/app/TMLEventBChannel.h b/simulators/c++2/src_simulator/app/TMLEventBChannel.h
index d3bfb7e52a1ded250376e499aca7afa3aadd1673..8fd917d7927564c70037014b8110b2c28c8d04d3 100644
--- a/simulators/c++2/src_simulator/app/TMLEventBChannel.h
+++ b/simulators/c++2/src_simulator/app/TMLEventBChannel.h
@@ -52,6 +52,8 @@ class Bus;
template <typename T, int paramNo>
class TMLEventBChannel : public TMLEventSizedChannel<T,paramNo>{
public:
+ //typedef TMLEventSizedChannel<T,paramNo> SC;
+
///Constructor
/**
\param iID ID of channel
@@ -90,12 +92,13 @@ public:
void write(TMLTransaction* iTrans){
this->_content++;
//#if paramNo>0
- if (paramNo!=0){
+ if (paramNo!=0){
//this->_paramQueue.push_back(_tmpParam);
//std::cerr << "write!\n";
- this->_paramQueue.push_back(iTrans->getCommand()->setParams(0));
+ this->_tmpParam = iTrans->getCommand()->setParams(0);
+ this->_paramQueue.push_back(this->_tmpParam);
#ifdef STATE_HASH_ENABLED
- _tmpParam->getStateHash(&_stateHash); //new in if
+ this->_tmpParam->getStateHash(& this->_stateHash); //new in if
#endif
}
//#endif
@@ -132,7 +135,7 @@ public:
#ifdef STATE_HASH_ENABLED
//_stateHash-=this->_paramQueue.front().getStateHash();
//this->_paramQueue.front().removeStateHash(&_stateHash);
- _hashValid = false;
+ this->_hashValid = false;
#endif
#ifdef LISTENERS_ENABLED
@@ -187,7 +190,7 @@ public:
READ_STREAM(s,aPos);
_eventFile->seekg(aPos);
#ifdef DEBUG_SERIALIZE
- std::cout << "Read: TMLEventBChannel " << _name << " posInFile: " << aPos << std::endl;
+ std::cout << "Read: TMLEventBChannel " << this->_name << " posInFile: " << aPos << std::endl;
#endif
}
diff --git a/simulators/c++2/src_simulator/app/TMLEventChannel.h b/simulators/c++2/src_simulator/app/TMLEventChannel.h
index 7d66e3ef9a604e74b1d85263a114ca0727ee3ce6..580299b61e7c2fa1deb3553440b77da0423ba2c3 100644
--- a/simulators/c++2/src_simulator/app/TMLEventChannel.h
+++ b/simulators/c++2/src_simulator/app/TMLEventChannel.h
@@ -67,5 +67,6 @@ public:
virtual void print() const=0;
virtual Parameter* buildParameter()=0;
//virtual Parameter* buildParameter(Parameter* iCloneParam)=0;
+protected:
};
#endif
diff --git a/simulators/c++2/src_simulator/app/TMLEventFBChannel.h b/simulators/c++2/src_simulator/app/TMLEventFBChannel.h
index 27b63b311e2cd004c7377a4ceb43e41c579329af..4cd26c0e2312547940364279c9132ff6348ba48f 100644
--- a/simulators/c++2/src_simulator/app/TMLEventFBChannel.h
+++ b/simulators/c++2/src_simulator/app/TMLEventFBChannel.h
@@ -51,6 +51,8 @@ class Bus;
template <typename T, int paramNo>
class TMLEventFBChannel:public TMLEventSizedChannel<T,paramNo>{
public:
+ //typedef TMLEventSizedChannel<T,paramNo> SC;
+
///Constructor
/**
\param iID of channel
@@ -87,7 +89,7 @@ public:
if (paramNo!=0){
this->_paramQueue.push_back(this->_tmpParam); //NEW
#ifdef STATE_HASH_ENABLED
- this->_tmpParam->getStateHash(&_stateHash); //NEW in if
+ this->_tmpParam->getStateHash(& this->_stateHash); //NEW in if
#endif
}
//#endif
@@ -120,7 +122,7 @@ public:
#ifdef STATE_HASH_ENABLED
//_stateHash-=this->_paramQueue.front().getStateHash();
//this->_paramQueue.front().removeStateHash(&_stateHash);
- _hashValid = false;
+ this->_hashValid = false;
#endif
if (this->_writeTrans!=0 && this->_writeTrans->getVirtualLength()==0){
diff --git a/simulators/c++2/src_simulator/app/TMLEventFChannel.h b/simulators/c++2/src_simulator/app/TMLEventFChannel.h
index af418f0ed4572dd1850ec6830c7df75a9c36d575..06a8d9ad44e0e958f7475080080743d18fd2f390 100644
--- a/simulators/c++2/src_simulator/app/TMLEventFChannel.h
+++ b/simulators/c++2/src_simulator/app/TMLEventFChannel.h
@@ -51,6 +51,8 @@ class Bus;
template <typename T, int paramNo>
class TMLEventFChannel:public TMLEventSizedChannel<T,paramNo>{
public:
+ //typedef TMLEventSizedChannel<T,paramNo> SC;
+
///Constructor
/**
\param iID ID of channel
@@ -88,7 +90,7 @@ public:
if (paramNo!=0){
this->_paramQueue.push_back(this->_tmpParam); //NEW
#ifdef STATE_HASH_ENABLED
- this->_tmpParam->getStateHash(&_stateHash); //new in if
+ this->_tmpParam->getStateHash(& this->_stateHash); //new in if
#endif
}
//#endif
@@ -121,7 +123,7 @@ public:
#ifdef STATE_HASH_ENABLED
//_stateHash-=this->_paramQueue.front().getStateHash();
//this->_paramQueue.front().removeStateHash(&_stateHash);
- _hashValid = false;
+ this->_hashValid = false;
#endif
#ifdef LISTENERS_ENABLED
NOTIFY_READ_TRANS_EXECUTED(this->_readTrans);
diff --git a/simulators/c++2/src_simulator/app/TMLEventSizedChannel.h b/simulators/c++2/src_simulator/app/TMLEventSizedChannel.h
index 73ce8657eed87c5ae53dfb127c4eb6e56c649f98..f638c747344a0ef313d1c3c685403589c9309f9b 100644
--- a/simulators/c++2/src_simulator/app/TMLEventSizedChannel.h
+++ b/simulators/c++2/src_simulator/app/TMLEventSizedChannel.h
@@ -61,7 +61,7 @@ public:
\param iSlaves Pointers to the slaves on which the channel is mapped
\param iContent Initial content of the channel
*/
- TMLEventSizedChannel (ID iID, std::string iName, unsigned int iNumberOfHops, BusMaster** iMasters, Slave** iSlaves, TMLLength iContent): TMLEventChannel(iID, iName, 1, iNumberOfHops, iMasters, iSlaves, iContent, 0),_tmpParam(0), _stateHash((HashValueType)_ID, 30), _hashValid(true){
+ TMLEventSizedChannel (ID iID, std::string iName, unsigned int iNumberOfHops, BusMaster** iMasters, Slave** iSlaves, TMLLength iContent): TMLEventChannel(iID, iName, 1, iNumberOfHops, iMasters, iSlaves, iContent, 0), _tmpParam(0), _stateHash((HashValueType)_ID, 30), _hashValid(true){
}
virtual ~TMLEventSizedChannel(){
@@ -166,8 +166,6 @@ public:
return new SizedParameter<T, paramNo>();
}
-
-
protected:
///Queue for parameters
ParamQueue _paramQueue;
diff --git a/simulators/c++2/src_simulator/app/TMLExeciCommand.cpp b/simulators/c++2/src_simulator/app/TMLExeciCommand.cpp
index dc09901665be6e0d2b9c7045bc565675df7b37d3..1f789023d6ac1c3247ab872246097f975758bf68 100755
--- a/simulators/c++2/src_simulator/app/TMLExeciCommand.cpp
+++ b/simulators/c++2/src_simulator/app/TMLExeciCommand.cpp
@@ -86,6 +86,6 @@ std::string TMLExeciCommand::toShortString() const{
return outp.str();
}
-std::string TMLExeciCommand::getCommandStr() const{
- return "exe";
-}
+//std::string TMLExeciCommand::getCommandStr() const{
+// return "exe";
+//}
diff --git a/simulators/c++2/src_simulator/app/TMLExeciCommand.h b/simulators/c++2/src_simulator/app/TMLExeciCommand.h
index 16eff27b613af37f96a0d702b6a5f38ed81a247f..0b748822e8035298b4fcb2036976f59acafd8258 100755
--- a/simulators/c++2/src_simulator/app/TMLExeciCommand.h
+++ b/simulators/c++2/src_simulator/app/TMLExeciCommand.h
@@ -63,7 +63,7 @@ public:
//TMLTask* getDependentTask() const;
std::string toString() const;
std::string toShortString() const;
- std::string getCommandStr() const;
+ inline std::string getCommandStr() const {return "exe";}
protected:
TMLCommand* prepareNextTransaction();
///Pointer to the function returning the length of the command
diff --git a/simulators/c++2/src_simulator/app/TMLExeciRangeCommand.cpp b/simulators/c++2/src_simulator/app/TMLExeciRangeCommand.cpp
index 389d06903e8afda95392f50b1cd38cc52db01bb2..df76ddfd8b7f5608b040a7ff82357e8b5681701d 100644
--- a/simulators/c++2/src_simulator/app/TMLExeciRangeCommand.cpp
+++ b/simulators/c++2/src_simulator/app/TMLExeciRangeCommand.cpp
@@ -83,9 +83,9 @@ std::string TMLExeciRangeCommand::toShortString() const{
return outp.str();
}
-std::string TMLExeciRangeCommand::getCommandStr() const{
- return "exe";
-}
+//std::string TMLExeciRangeCommand::getCommandStr() const{
+// return "exe";
+//}
unsigned int TMLExeciRangeCommand::getRandomRange(){
ParamType aMax, aMin;
diff --git a/simulators/c++2/src_simulator/app/TMLExeciRangeCommand.h b/simulators/c++2/src_simulator/app/TMLExeciRangeCommand.h
index 9c8578a798a900d318122f88452edd231fc9e7bc..f1be47a4d8f867c0fb3a813adafc19a320086e97 100644
--- a/simulators/c++2/src_simulator/app/TMLExeciRangeCommand.h
+++ b/simulators/c++2/src_simulator/app/TMLExeciRangeCommand.h
@@ -62,7 +62,7 @@ public:
//TMLTask* getDependentTask() const;
std::string toString() const;
std::string toShortString() const;
- std::string getCommandStr() const;
+ inline std::string getCommandStr() const {return "exe";}
unsigned int getRandomRange();
void setRandomValue(unsigned int iValue);
protected:
diff --git a/simulators/c++2/src_simulator/app/TMLNotifiedCommand.cpp b/simulators/c++2/src_simulator/app/TMLNotifiedCommand.cpp
index 2da8c78e305cb0cb4647d12e715b5a50b36de4ed..babe8cac2ff93b9f6d124ad5979ef1645f6a8de5 100644
--- a/simulators/c++2/src_simulator/app/TMLNotifiedCommand.cpp
+++ b/simulators/c++2/src_simulator/app/TMLNotifiedCommand.cpp
@@ -39,7 +39,7 @@ Ludovic Apvrille, Renaud Pacalet
*/
#include <TMLNotifiedCommand.h>
-#include <TMLEventChannel.h>
+//#include <TMLEventChannel.h>
#include <TMLTask.h>
#include <TMLTransaction.h>
#include <Bus.h>
@@ -71,9 +71,9 @@ TMLCommand* TMLNotifiedCommand::prepareNextTransaction(){
return 0;
}*/
-TMLChannel* TMLNotifiedCommand::getChannel() const{
- return _channel;
-}
+//TMLChannel* TMLNotifiedCommand::getChannel() const{
+// return _channel;
+//}
std::string TMLNotifiedCommand::toString() const{
std::ostringstream outp;
@@ -87,9 +87,9 @@ std::string TMLNotifiedCommand::toShortString() const{
return outp.str();
}
-std::string TMLNotifiedCommand::getCommandStr() const{
- return "notified";
-}
+//std::string TMLNotifiedCommand::getCommandStr() const{
+// return "notified";
+//}
#ifdef ADD_COMMENTS
std::string TMLNotifiedCommand::getCommentString(Comment* iCom) const{
diff --git a/simulators/c++2/src_simulator/app/TMLNotifiedCommand.h b/simulators/c++2/src_simulator/app/TMLNotifiedCommand.h
index b9182917af93aed1b4dbab88f2534e654d4d7d32..8b69c3081db25e70fc793a40bee4a209664cceff 100644
--- a/simulators/c++2/src_simulator/app/TMLNotifiedCommand.h
+++ b/simulators/c++2/src_simulator/app/TMLNotifiedCommand.h
@@ -43,8 +43,7 @@ Ludovic Apvrille, Renaud Pacalet
#include <definitions.h>
#include <TMLCommand.h>
-
-class TMLEventChannel;
+#include <TMLEventChannel.h>
///This class models a TML command which determines the number of events queued in a channel
class TMLNotifiedCommand:public TMLCommand{
@@ -62,10 +61,10 @@ public:
TMLNotifiedCommand(ID iID, TMLTask* iTask,TMLEventChannel* iChannel,ParamType* iResultVar,const std::string& iResultVarDescr, const char* iLiveVarList, bool iCheckpoint);
void execute();
//TMLTask* getDependentTask() const;
- TMLChannel* getChannel() const;
+ inline TMLChannel* getChannel() const {return dynamic_cast<TMLChannel*>(_channel);}
std::string toString() const;
std::string toShortString() const;
- std::string getCommandStr() const;
+ inline std::string getCommandStr() const {return "notified";}
#ifdef ADD_COMMENTS
std::string getCommentString(Comment* iCom) const;
#endif
diff --git a/simulators/c++2/src_simulator/app/TMLRandomChoiceCommand.cpp b/simulators/c++2/src_simulator/app/TMLRandomChoiceCommand.cpp
index 9b4b7d195b763316b2615fa11f42eb43cd8b9585..1f45f67745a665beac049f7507b1dbc191d4b0ca 100644
--- a/simulators/c++2/src_simulator/app/TMLRandomChoiceCommand.cpp
+++ b/simulators/c++2/src_simulator/app/TMLRandomChoiceCommand.cpp
@@ -82,11 +82,11 @@ TMLCommand* TMLRandomChoiceCommand::prepareNextTransaction(){
return 0;
}
-unsigned int TMLRandomChoiceCommand::getRandomRange(){
- return _dynamicRange;
-}
+//unsigned int TMLRandomChoiceCommand::getRandomRange(){
+// return _dynamicRange;
+//}
-TMLCommand* TMLRandomChoiceCommand::getNextCommand() const{
+//TMLCommand* TMLRandomChoiceCommand::getNextCommand() const{
//std::cout << "Here we go " << _randomValue << " .................\n";
- return _nextCommand[_randomValue];
-}
+// return _nextCommand[_randomValue];
+//}
diff --git a/simulators/c++2/src_simulator/app/TMLRandomChoiceCommand.h b/simulators/c++2/src_simulator/app/TMLRandomChoiceCommand.h
index 6930bf6d1b05d7379e24d5a178f631e3c3612fd7..7ad376dc95f0db71c702f0ff5f85957c4529fc8a 100644
--- a/simulators/c++2/src_simulator/app/TMLRandomChoiceCommand.h
+++ b/simulators/c++2/src_simulator/app/TMLRandomChoiceCommand.h
@@ -48,10 +48,10 @@ class TMLRandomChoiceCommand: public TMLChoiceCommand, public IndeterminismSourc
public:
TMLRandomChoiceCommand(ID iID, TMLTask* iTask, RangeFuncPointer iRangeFunc, unsigned int iNbOfBranches, const char* iLiveVarList, bool iCheckpoint);
TMLCommand* prepareNextTransaction();
- unsigned int getRandomRange();
+ inline unsigned int getRandomRange() {return _dynamicRange;}
protected:
unsigned int _dynamicRange;
- TMLCommand* getNextCommand() const;
+ inline TMLCommand* getNextCommand() const {return _nextCommand[_randomValue];}
};
#endif
diff --git a/simulators/c++2/src_simulator/app/TMLRandomCommand.cpp b/simulators/c++2/src_simulator/app/TMLRandomCommand.cpp
index 2d5a1ecd2944f582cb24201cfcda844227c84307..ce676fc59be5855cb39a776475a9178ddd182201 100644
--- a/simulators/c++2/src_simulator/app/TMLRandomCommand.cpp
+++ b/simulators/c++2/src_simulator/app/TMLRandomCommand.cpp
@@ -46,8 +46,8 @@ TMLRandomCommand::TMLRandomCommand(ID iID, TMLTask* iTask, RangeFuncPointer iRan
_type=RND;
}
-void TMLRandomCommand::execute(){
-}
+//void TMLRandomCommand::execute(){
+//}
unsigned int TMLRandomCommand::getRandomRange(){
ParamType aMax;
@@ -93,10 +93,10 @@ std::string TMLRandomCommand::TMLRandomCommand::toString() const{
return outp.str();
}
-std::string TMLRandomCommand::toShortString() const{
- return "Random";
-}
+//std::string TMLRandomCommand::toShortString() const{
+// return "Random";
+//}
-std::string TMLRandomCommand::getCommandStr() const{
- return "rnd";
-}
+//std::string TMLRandomCommand::getCommandStr() const{
+// return "rnd";
+//}
diff --git a/simulators/c++2/src_simulator/app/TMLRandomCommand.h b/simulators/c++2/src_simulator/app/TMLRandomCommand.h
index 183d8bbfc3a03296cfd0f102ff0ff80e2d44c59d..a68bd525474a00eb00db3f374efc6979cc7d6b83 100644
--- a/simulators/c++2/src_simulator/app/TMLRandomCommand.h
+++ b/simulators/c++2/src_simulator/app/TMLRandomCommand.h
@@ -48,12 +48,12 @@ class TMLRandomCommand: public TMLCommand, public IndeterminismSource{
public:
TMLRandomCommand(ID iID, TMLTask* iTask, RangeFuncPointer iRangeFunc, ParamType* iResultVar, const char* iLiveVarList, bool iCheckpoint);
- void execute();
+ void execute() {}
unsigned int getRandomRange();
TMLCommand* prepareNextTransaction();
std::string toString() const;
- std::string toShortString() const;
- std::string getCommandStr() const;
+ inline std::string toShortString() const {return "Random";}
+ inline std::string getCommandStr() const {return "rnd";}
protected:
RangeFuncPointer _rangeFunc;
ParamType* _resultVar;
diff --git a/simulators/c++2/src_simulator/app/TMLReadCommand.cpp b/simulators/c++2/src_simulator/app/TMLReadCommand.cpp
index c818384faf1896f701a962881b2b8cf468613b2d..20b979758296a731974f5e427edd1f6690e11e25 100755
--- a/simulators/c++2/src_simulator/app/TMLReadCommand.cpp
+++ b/simulators/c++2/src_simulator/app/TMLReadCommand.cpp
@@ -39,7 +39,7 @@ Ludovic Apvrille, Renaud Pacalet
*/
#include <TMLReadCommand.h>
-#include <TMLChannel.h>
+//#include <TMLChannel.h>
#include <TMLTask.h>
#include <TMLTransaction.h>
#include <Bus.h>
@@ -85,17 +85,17 @@ TMLCommand* TMLReadCommand::prepareNextTransaction(){
return this;
}
-TMLChannel* TMLReadCommand::getChannel(unsigned int iIndex) const{
- return _channel;
-}
+//TMLChannel* TMLReadCommand::getChannel(unsigned int iIndex) const{
+// return _channel;
+//}
-unsigned int TMLReadCommand::getNbOfChannels() const{
- return 1;
-}
+//unsigned int TMLReadCommand::getNbOfChannels() const{
+// return 1;
+//}
-TMLTask* TMLReadCommand::getDependentTask(unsigned int iIndex)const{
- return _channel->getBlockedWriteTask();
-}
+//TMLTask* TMLReadCommand::getDependentTask(unsigned int iIndex)const{
+// return _channel->getBlockedWriteTask();
+//}
std::string TMLReadCommand::toString() const{
std::ostringstream outp;
@@ -109,6 +109,6 @@ std::string TMLReadCommand::toShortString() const{
return outp.str();
}
-std::string TMLReadCommand::getCommandStr() const{
- return "rd";
-}
+//std::string TMLReadCommand::getCommandStr() const{
+// return "rd";
+//}
diff --git a/simulators/c++2/src_simulator/app/TMLReadCommand.h b/simulators/c++2/src_simulator/app/TMLReadCommand.h
index 1e6c6f3894a361472e6e5c8c9686738c04e1a6a9..9fb6ad490b3e0ab8da5af183da99a3b2eadeaa84 100755
--- a/simulators/c++2/src_simulator/app/TMLReadCommand.h
+++ b/simulators/c++2/src_simulator/app/TMLReadCommand.h
@@ -43,8 +43,7 @@ Ludovic Apvrille, Renaud Pacalet
#include <definitions.h>
#include <TMLCommand.h>
-
-class TMLChannel;
+#include <TMLChannel.h>
///This class models read operations on TML channels.
class TMLReadCommand:public TMLCommand{
@@ -61,12 +60,12 @@ public:
*/
TMLReadCommand(ID iID, TMLTask* iTask, LengthFuncPointer iLengthFunc, TMLChannel* iChannel, const char* iLiveVarList, bool iCheckpoint, TMLLength iStatLength=1);
void execute();
- TMLChannel* getChannel(unsigned int iIndex) const;
- unsigned int getNbOfChannels() const;
- TMLTask* getDependentTask(unsigned int iIndex)const;
+ inline TMLChannel* getChannel(unsigned int iIndex) const {return _channel;}
+ inline unsigned int getNbOfChannels() const {return 1;}
+ inline TMLTask* getDependentTask(unsigned int iIndex)const {return _channel->getBlockedWriteTask();}
std::string toString() const;
std::string toShortString() const;
- std::string getCommandStr() const;
+ inline std::string getCommandStr() const {return "rd";}
protected:
///Pointer to the function returning the length of the command
LengthFuncPointer _lengthFunc;
diff --git a/simulators/c++2/src_simulator/app/TMLRequestCommand.cpp b/simulators/c++2/src_simulator/app/TMLRequestCommand.cpp
index 2fce78bf00b27ff13741ef68a91b6119a165fd38..0e77b1f40d56538c5d3ab2c6bd8e7195906fb2bf 100644
--- a/simulators/c++2/src_simulator/app/TMLRequestCommand.cpp
+++ b/simulators/c++2/src_simulator/app/TMLRequestCommand.cpp
@@ -39,7 +39,7 @@ Ludovic Apvrille, Renaud Pacalet
*/
#include <TMLRequestCommand.h>
-#include <TMLEventChannel.h>
+//#include <TMLEventChannel.h>
#include <TMLTask.h>
#include <TMLTransaction.h>
#include <Bus.h>
@@ -68,17 +68,17 @@ TMLCommand* TMLRequestCommand::prepareNextTransaction(){
return this;
}
-TMLChannel* TMLRequestCommand::getChannel(unsigned int iIndex) const{
- return dynamic_cast<TMLChannel*>(_channel);
-}
+//TMLChannel* TMLRequestCommand::getChannel(unsigned int iIndex) const{
+// return dynamic_cast<TMLChannel*>(_channel);
+//}
-unsigned int TMLRequestCommand::getNbOfChannels() const{
- return 1;
-}
+//unsigned int TMLRequestCommand::getNbOfChannels() const{
+// return 1;
+//}
-TMLTask* TMLRequestCommand::getDependentTask(unsigned int iIndex)const{
- return _channel->getBlockedReadTask();
-}
+//TMLTask* TMLRequestCommand::getDependentTask(unsigned int iIndex)const{
+// return _channel->getBlockedReadTask();
+//}
std::string TMLRequestCommand::toString() const{
std::ostringstream outp;
@@ -92,9 +92,9 @@ std::string TMLRequestCommand::toShortString() const{
return outp.str();
}
-std::string TMLRequestCommand::getCommandStr() const{
- return "sendReq";
-}
+//std::string TMLRequestCommand::getCommandStr() const{
+// return "sendReq";
+//}
/*ParamFuncPointer TMLRequestCommand::getParamFuncPointer() const{
return _paramFunc;
@@ -111,7 +111,6 @@ std::string TMLRequestCommand::getCommandStr() const{
//std::cout << "\n";
}*/
-Parameter* TMLRequestCommand::setParams(Parameter* ioParam){
- //return (_paramFunc==0)? 0:(_task->*_paramFunc)(ioParam);
- return (_task->*_paramFunc)(ioParam);
-}
+//Parameter* TMLRequestCommand::setParams(Parameter* ioParam){
+ //return (_task->*_paramFunc)(ioParam);
+//}
diff --git a/simulators/c++2/src_simulator/app/TMLRequestCommand.h b/simulators/c++2/src_simulator/app/TMLRequestCommand.h
index 9d30cb65e8ab9f96da252b54ca606699b2ab0544..d7309a6e0d7b82017de08cb690ec292e9274f668 100644
--- a/simulators/c++2/src_simulator/app/TMLRequestCommand.h
+++ b/simulators/c++2/src_simulator/app/TMLRequestCommand.h
@@ -44,8 +44,7 @@ Ludovic Apvrille, Renaud Pacalet
#include <definitions.h>
#include <TMLCommand.h>
#include <Parameter.h>
-
-class TMLEventChannel;
+#include <TMLEventChannel.h>
///This class models a send request operation within a TML task.
class TMLRequestCommand:public TMLCommand{
@@ -62,17 +61,17 @@ public:
*/
TMLRequestCommand(ID iID, TMLTask* iTask, TMLEventChannel* iChannel, ParamFuncPointer iParamFunc, const char* iLiveVarList, bool iCheckpoint/*, Parameter* iStatParam = 0*/);
void execute();
- TMLChannel* getChannel(unsigned int iIndex) const;
- unsigned int getNbOfChannels() const;
- TMLTask* getDependentTask(unsigned int iIndex)const;
+ inline TMLChannel* getChannel(unsigned int iIndex) const {return dynamic_cast<TMLChannel*>(_channel);}
+ inline unsigned int getNbOfChannels() const {return 1;}
+ inline TMLTask* getDependentTask(unsigned int iIndex)const {return _channel->getBlockedReadTask();}
std::string toString() const;
std::string toShortString() const;
- std::string getCommandStr() const;
+ inline std::string getCommandStr() const {return "sendReq";}
///Sets a parameter data structure according to the parameters of the command
/**
\param ioParam Parameter data structure
*/
- Parameter* setParams(Parameter* ioParam);
+ inline Parameter* setParams(Parameter* ioParam) {return (_task->*_paramFunc)(ioParam);}
protected:
///Channel on which the event is conveyed
TMLEventChannel* _channel;
diff --git a/simulators/c++2/src_simulator/app/TMLSelectCommand.cpp b/simulators/c++2/src_simulator/app/TMLSelectCommand.cpp
index 405dd98d4153a7ec143e158d423a848983cc20ff..2aae249034701d6a44cfb25544ed6502e6d2c6c9 100644
--- a/simulators/c++2/src_simulator/app/TMLSelectCommand.cpp
+++ b/simulators/c++2/src_simulator/app/TMLSelectCommand.cpp
@@ -39,7 +39,7 @@ Ludovic Apvrille, Renaud Pacalet
*/
#include <TMLSelectCommand.h>
-#include <TMLEventChannel.h>
+//#include <TMLEventChannel.h>
#include <TMLTask.h>
#include <TMLTransaction.h>
#include <Bus.h>
@@ -141,34 +141,24 @@ TMLChannel* TMLSelectCommand::getChannel(unsigned int iIndex) const{
return _channel[_indexNextCommand];
else
return _currTransaction->getChannel();
-
- //return _channel[_indexNextCommand]; TO INCLUDE
- //return _currTransaction->getChannel();
}
-unsigned int TMLSelectCommand::getNbOfChannels() const{
- //return 1;
- return _nbOfNextCmds;
-}
+//unsigned int TMLSelectCommand::getNbOfChannels() const{
+// return _nbOfNextCmds;
+//}
-TMLTask* TMLSelectCommand::getDependentTask(unsigned int iIndex)const{
- return _channel[iIndex]->getBlockedWriteTask();
- /*if (_currTransaction==0){
- std::cout << "This is baaaad\n";
- return _channel[_indexNextCommand]->getBlockedWriteTask();
- }else
- return _currTransaction->getChannel()->getBlockedWriteTask();*/
-
-}
+//TMLTask* TMLSelectCommand::getDependentTask(unsigned int iIndex)const{
+// return _channel[iIndex]->getBlockedWriteTask();
+//}
-TMLCommand* TMLSelectCommand::getNextCommand() const{
- return _nextCommand[_indexNextCommand];
-}
+//TMLCommand* TMLSelectCommand::getNextCommand() const{
+// return _nextCommand[_indexNextCommand];
+//}
-ParamFuncPointer TMLSelectCommand::getParamFuncPointer() const{
- return (_paramFuncs==0)?0:_paramFuncs[_indexNextCommand];
-}
+//ParamFuncPointer TMLSelectCommand::getParamFuncPointer() const{
+// return (_paramFuncs==0)?0:_paramFuncs[_indexNextCommand];
+//}
std::string TMLSelectCommand::toString() const{
std::ostringstream outp;
@@ -182,22 +172,19 @@ std::string TMLSelectCommand::toShortString() const{
return outp.str();
}
-std::string TMLSelectCommand::getCommandStr() const{
- return "sel";
-}
+//std::string TMLSelectCommand::getCommandStr() const{
+// return "sel";
+//}
-#ifdef ADD_COMMENTS
-std::string TMLSelectCommand::getCommentString(Comment* iCom) const{
- return "SelectEvent result: " + _channel[iCom->_actionCode]->toShortString();
-}
-#endif
+//#ifdef ADD_COMMENTS
+//std::string TMLSelectCommand::getCommentString(Comment* iCom) const{
+// return "SelectEvent result: " + _channel[iCom->_actionCode]->toShortString();
+//}
+//#endif
-Parameter* TMLSelectCommand::setParams(Parameter* ioParam){
- /*Parameter* aResult = 0;
- if (_paramFuncs[_indexNextCommand]!=0) aResult = (_task->*_paramFuncs[_indexNextCommand])(ioParam);
- return aResult;*/
- return (_task->*_paramFuncs[_indexNextCommand])(ioParam);
-}
+//Parameter* TMLSelectCommand::setParams(Parameter* ioParam){
+// return (_task->*_paramFuncs[_indexNextCommand])(ioParam);
+//}
//unsigned int TMLSelectCommand::getRandomRange(){
// return _nbOfPossSync ;
diff --git a/simulators/c++2/src_simulator/app/TMLSelectCommand.h b/simulators/c++2/src_simulator/app/TMLSelectCommand.h
index 6c7040c4140ad7c8eaec4c6f390e6546a4c8a30a..3b822ce6f5fcfb6ee282709fa2781acd15483495 100644
--- a/simulators/c++2/src_simulator/app/TMLSelectCommand.h
+++ b/simulators/c++2/src_simulator/app/TMLSelectCommand.h
@@ -43,8 +43,7 @@ Ludovic Apvrille, Renaud Pacalet
#include <definitions.h>
#include <TMLCommand.h>
-
-class TMLEventChannel;
+#include <TMLEventChannel.h>
///This class models the waiting operation for one amongst multiple events.
class TMLSelectCommand:public TMLCommand{
@@ -64,19 +63,19 @@ public:
~TMLSelectCommand();
void execute();
TMLChannel* getChannel(unsigned int iIndex) const;
- unsigned int getNbOfChannels() const;
- TMLTask* getDependentTask(unsigned int iIndex)const;
- ParamFuncPointer getParamFuncPointer() const;
+ inline unsigned int getNbOfChannels() const {return _nbOfNextCmds;}
+ inline TMLTask* getDependentTask(unsigned int iIndex)const {return _channel[iIndex]->getBlockedWriteTask();}
+ inline ParamFuncPointer getParamFuncPointer() const {return (_paramFuncs==0)?0:_paramFuncs[_indexNextCommand];}
std::string toString() const;
std::string toShortString() const;
- std::string getCommandStr() const;
- Parameter* setParams(Parameter* ioParam);
+ inline std::string getCommandStr() const {return "sel";}
+ inline Parameter* setParams(Parameter* ioParam) {return (_task->*_paramFuncs[_indexNextCommand])(ioParam);}
#ifdef ADD_COMMENTS
- std::string getCommentString(Comment* iCom) const;
+ inline std::string getCommentString(Comment* iCom) const {return "SelectEvent result: " + _channel[iCom->_actionCode]->toShortString();}
#endif
protected:
TMLCommand* prepareNextTransaction();
- TMLCommand* getNextCommand() const;
+ inline TMLCommand* getNextCommand() const {return _nextCommand[_indexNextCommand];}
///Pointer to an array of pointers to channels conveying the desired signals
TMLEventChannel** _channel;
///Pointer to an array of parameter function pointers
diff --git a/simulators/c++2/src_simulator/app/TMLSendCommand.cpp b/simulators/c++2/src_simulator/app/TMLSendCommand.cpp
index 51d4a4d8afd5a1d8cba578dff8dbe7e0d3872fe1..f166896caef4e40a8efe2ad22cc5481c3e64b917 100644
--- a/simulators/c++2/src_simulator/app/TMLSendCommand.cpp
+++ b/simulators/c++2/src_simulator/app/TMLSendCommand.cpp
@@ -39,7 +39,7 @@ Ludovic Apvrille, Renaud Pacalet
*/
#include <TMLSendCommand.h>
-#include <TMLEventChannel.h>
+//#include <TMLEventChannel.h>
#include <TMLTask.h>
#include <TMLTransaction.h>
#include <Bus.h>
@@ -70,18 +70,17 @@ TMLCommand* TMLSendCommand::prepareNextTransaction(){
return this;
}
-TMLChannel* TMLSendCommand::getChannel(unsigned int iIndex) const{
- return _channel;
-}
+//TMLChannel* TMLSendCommand::getChannel(unsigned int iIndex) const{
+// return _channel;
+//}
-unsigned int TMLSendCommand::getNbOfChannels() const{
- //return (_channel->getBlockedReadTask()==0)?0:1;
- return 1;
-}
+//unsigned int TMLSendCommand::getNbOfChannels() const{
+// return 1;
+//}
-TMLTask* TMLSendCommand::getDependentTask(unsigned int iIndex)const{
- return _channel->getBlockedReadTask();
-}
+//TMLTask* TMLSendCommand::getDependentTask(unsigned int iIndex)const{
+// return _channel->getBlockedReadTask();
+//}
std::string TMLSendCommand::toString() const{
std::ostringstream outp;
@@ -95,17 +94,11 @@ std::string TMLSendCommand::toShortString() const{
return outp.str();
}
-std::string TMLSendCommand::getCommandStr() const{
- return "snd";
-}
-
-/*ParamFuncPointer TMLSendCommand::getParamFuncPointer() const{
- return _paramFunc;
-}*/
+//std::string TMLSendCommand::getCommandStr() const{
+// return "snd";
+//}
-//void TMLSendCommand::setParams(Parameter<ParamType>& ioParam){
-Parameter* TMLSendCommand::setParams(Parameter* ioParam){
- //return (_paramFunc==0)? 0:(_task->*_paramFunc)(ioParam);
- return (_task->*_paramFunc)(ioParam);
-}
+//Parameter* TMLSendCommand::setParams(Parameter* ioParam){
+// return (_task->*_paramFunc)(ioParam);
+//}
diff --git a/simulators/c++2/src_simulator/app/TMLSendCommand.h b/simulators/c++2/src_simulator/app/TMLSendCommand.h
index 9c385ebc7e4af6b2370d44aac77b85f668c8cc25..8e498d9cd95c170a7772a792289fb3dde3f32711 100644
--- a/simulators/c++2/src_simulator/app/TMLSendCommand.h
+++ b/simulators/c++2/src_simulator/app/TMLSendCommand.h
@@ -44,8 +44,7 @@ Ludovic Apvrille, Renaud Pacalet
#include <definitions.h>
#include <TMLCommand.h>
#include <Parameter.h>
-
-class TMLEventChannel;
+#include <TMLEventChannel.h>
///This class models a send event operation within a TML task.
class TMLSendCommand:public TMLCommand{
@@ -62,12 +61,12 @@ public:
*/
TMLSendCommand(ID iID, TMLTask* iTask, TMLEventChannel* iChannel, ParamFuncPointer iParamFunc, const char* iLiveVarList, bool iCheckpoint/*, Parameter* iStatParam=0*/);
void execute();
- TMLChannel* getChannel(unsigned int iIndex) const;
- unsigned int getNbOfChannels() const;
- TMLTask* getDependentTask(unsigned int iIndex)const;
+ inline TMLChannel* getChannel(unsigned int iIndex) const {return dynamic_cast<TMLChannel*>(_channel);}
+ inline unsigned int getNbOfChannels() const {return 1;}
+ inline TMLTask* getDependentTask(unsigned int iIndex)const {return _channel->getBlockedReadTask();}
std::string toString() const;
std::string toShortString() const;
- std::string getCommandStr() const;
+ inline std::string getCommandStr() const {return "snd";}
/////Returns a pointer to the parameter data structure
////**
//\return Pointer to parameter data structure
@@ -77,7 +76,7 @@ public:
/**
\param ioParam Parameter data structure
*/
- Parameter* setParams(Parameter* ioParam);
+ inline Parameter* setParams(Parameter* ioParam) {return (_task->*_paramFunc)(ioParam);}
protected:
///Channel on which the event is conveyed
TMLEventChannel* _channel;
diff --git a/simulators/c++2/src_simulator/app/TMLStateChannel.cpp b/simulators/c++2/src_simulator/app/TMLStateChannel.cpp
index d44b47d9ba8a318919ab0a981948d0735f7d39b4..cf53df79f1f5d8ef0f3ef79f35edafc2a173f800 100644
--- a/simulators/c++2/src_simulator/app/TMLStateChannel.cpp
+++ b/simulators/c++2/src_simulator/app/TMLStateChannel.cpp
@@ -79,17 +79,17 @@ void TMLStateChannel::streamStateXML(std::ostream& s) const{
s << TAG_CHANNELc << std::endl;
}
-TMLLength TMLStateChannel::getContent() const{
- return _content;
-}
+//TMLLength TMLStateChannel::getContent() const{
+// return _content;
+//}
-bool TMLStateChannel::getOverflow() const{
- return _overflow;
-}
+//bool TMLStateChannel::getOverflow() const{
+// return _overflow;
+//}
-bool TMLStateChannel::getUnderflow() const{
- return _underflow;
-}
+//bool TMLStateChannel::getUnderflow() const{
+// return _underflow;
+//}
void TMLStateChannel::getStateHash(HashAlgo* iHash) const{
if (_significance!=0){
diff --git a/simulators/c++2/src_simulator/app/TMLStateChannel.h b/simulators/c++2/src_simulator/app/TMLStateChannel.h
index 8ff267ca09f779c0399c507e8615568bb304fd6d..fd0e2698d841d06310d76c19a83195b08270ff18 100644
--- a/simulators/c++2/src_simulator/app/TMLStateChannel.h
+++ b/simulators/c++2/src_simulator/app/TMLStateChannel.h
@@ -68,9 +68,9 @@ public:
virtual std::istream& readObject(std::istream& s);
virtual void reset();
virtual void streamStateXML(std::ostream& s) const;
- virtual TMLLength getContent() const;
- bool getOverflow() const;
- bool getUnderflow() const;
+ inline virtual TMLLength getContent() const {return _content;}
+ inline bool getOverflow() const {return _overflow;}
+ inline bool getUnderflow() const {return _underflow;}
virtual void getStateHash(HashAlgo* iHash) const;
protected:
///Content of the channel
diff --git a/simulators/c++2/src_simulator/app/TMLStopCommand.cpp b/simulators/c++2/src_simulator/app/TMLStopCommand.cpp
index 5434e4c76bbd26ffc0d8121ea5cf6cc927338ca5..53eeb82f3cf7298b87431917ccaef85e9b51d4e1 100644
--- a/simulators/c++2/src_simulator/app/TMLStopCommand.cpp
+++ b/simulators/c++2/src_simulator/app/TMLStopCommand.cpp
@@ -39,19 +39,19 @@ Ludovic Apvrille, Renaud Pacalet
*/
#include <TMLStopCommand.h>
-#include <TMLTask.h>
+//#include <TMLTask.h>
TMLStopCommand::TMLStopCommand(ID iID, TMLTask* iTask): TMLCommand(iID, iTask, 1, 0, 0, false){
_type=STP;
}
-void TMLStopCommand::execute(){
-}
+//void TMLStopCommand::execute(){
+//}
-TMLCommand* TMLStopCommand::prepareNextTransaction(){
- _task->finished();
- return 0;
-}
+//TMLCommand* TMLStopCommand::prepareNextTransaction(){
+// _task->finished();
+// return 0;
+//}
/*TMLTask* TMLStopCommand::getDependentTask() const{
return 0;
@@ -63,10 +63,10 @@ std::string TMLStopCommand::toString() const{
return outp.str();
}
-std::string TMLStopCommand::toShortString() const{
- return "stp";
-}
+//std::string TMLStopCommand::toShortString() const{
+// return "stp";
+//}
-std::string TMLStopCommand::getCommandStr() const{
- return "stp";
-}
+//std::string TMLStopCommand::getCommandStr() const{
+// return "stp";
+//}
diff --git a/simulators/c++2/src_simulator/app/TMLStopCommand.h b/simulators/c++2/src_simulator/app/TMLStopCommand.h
index 106fd83211c98de48816708e9dee71403a04aaeb..646436cd59c5b63308093fb3e62208f52a4fba92 100644
--- a/simulators/c++2/src_simulator/app/TMLStopCommand.h
+++ b/simulators/c++2/src_simulator/app/TMLStopCommand.h
@@ -43,6 +43,7 @@ Ludovic Apvrille, Renaud Pacalet
#include <definitions.h>
#include <TMLCommand.h>
+#include <TMLTask.h>
///This class represents a TML Stop command (denotes the end of a task)
@@ -54,13 +55,13 @@ public:
\param iTask Pointer to the task the command belongs to
*/
TMLStopCommand(ID iID, TMLTask* iTask);
- void execute();
+ inline void execute() {}
//TMLTask* getDependentTask() const;
std::string toString() const;
- std::string toShortString() const;
- std::string getCommandStr() const;
+ inline std::string toShortString() const {return "stp";}
+ inline std::string getCommandStr() const {return "stp";}
protected:
- TMLCommand* prepareNextTransaction();
+ inline TMLCommand* prepareNextTransaction() {_task->finished(); return 0;}
};
#endif
diff --git a/simulators/c++2/src_simulator/app/TMLTask.cpp b/simulators/c++2/src_simulator/app/TMLTask.cpp
index b94d65c44eee9928de1a1155a0c45aa9c69dfae2..507d8feabfa540f275f551d2164e324f3b5d0dc3 100755
--- a/simulators/c++2/src_simulator/app/TMLTask.cpp
+++ b/simulators/c++2/src_simulator/app/TMLTask.cpp
@@ -67,30 +67,29 @@ TMLTask::~TMLTask(){
if (_comment!=0) delete [] _comment;
}
-Priority TMLTask::getPriority() const{
- return _priority;
-}
+//Priority TMLTask::getPriority() const{
+// return _priority;
+//}
-TMLTime TMLTask::getEndLastTransaction() const{
- return _endLastTransaction;
-}
+//TMLTime TMLTask::getEndLastTransaction() const{
+// return _endLastTransaction;
+//}
-TMLCommand* TMLTask::getCurrCommand() const{
- return _currCommand;
-}
+//TMLCommand* TMLTask::getCurrCommand() const{
+// return _currCommand;
+//}
-void TMLTask::setCurrCommand(TMLCommand* iCurrCommand){
- //std::cout << _name << "currentcommand: " << iCurrCommand->toString() << std::endl;
- _currCommand=iCurrCommand;
-}
+//void TMLTask::setCurrCommand(TMLCommand* iCurrCommand){
+// _currCommand=iCurrCommand;
+//}
-CPU* TMLTask::getCPU() const{
- return _currentCPU;
-}
+//CPU* TMLTask::getCPU() const{
+// return _currentCPU;
+//}
-std::string TMLTask::toString() const{
- return _name;
-}
+//std::string TMLTask::toString() const{
+// return _name;
+//}
std::string TMLTask::toShortString() const{
std::ostringstream outp;
@@ -98,14 +97,14 @@ std::string TMLTask::toShortString() const{
return outp.str();
}
-ID TMLTask::getID() const{
- return _ID;
-}
+//ID TMLTask::getID() const{
+// return _ID;
+//}
#ifdef ADD_COMMENTS
-void TMLTask::addComment(Comment* iComment){
- _commentList.push_back(iComment);
-}
+//void TMLTask::addComment(Comment* iComment){
+// _commentList.push_back(iComment);
+//}
std::string TMLTask::getNextComment(bool iInit, Comment*& oComment){
if (iInit) _posCommentList=_commentList.begin();
@@ -141,69 +140,68 @@ void TMLTask::addTransaction(TMLTransaction* iTrans){
}
}
-TMLTime TMLTask::getNextSignalChange(bool iInit, std::string& oSigChange, bool& oNoMoreTrans){
- std::ostringstream outp;
+//TMLTime TMLTask::getNextSignalChange(bool iInit, std::string& oSigChange, bool& oNoMoreTrans){
+void TMLTask::getNextSignalChange(bool iInit, SignalChangeData* oSigData){
+ //std::ostringstream outp;
if (iInit){
- //std::cout << "Init" << std::endl;
_posTrasactListVCD=_transactList.begin();
- //std::cout << "Init2" << std::endl;
_previousTransEndTime=0;
_vcdOutputState=END_TRANS;
}
if (_posTrasactListVCD == _transactList.end()){
- //if (iInit || _transactList.back()->getTerminatedFlag()){
- //outp << VCD_PREFIX << vcdValConvert(TERMINATED) << " ta" << _ID;
- //}else{
- //outp << VCD_PREFIX << vcdValConvert(SUSPENDED) << " ta" << _ID;
- //}
- //if (iInit || (! _transactList.back()->getTerminatedFlag())){
if (iInit || dynamic_cast<TMLStopCommand*>(_currCommand)==0){
- outp << VCD_PREFIX << vcdValConvert(SUSPENDED) << " ta" << _ID;
+ //outp << VCD_PREFIX << vcdValConvert(SUSPENDED) << "ta" << _ID;
+ new (oSigData) SignalChangeData(SUSPENDED, _previousTransEndTime, this);
}else{
- outp << VCD_PREFIX << vcdValConvert(TERMINATED) << " ta" << _ID;
+ //outp << VCD_PREFIX << vcdValConvert(TERMINATED) << "ta" << _ID;
+ new (oSigData) SignalChangeData(TERMINATED, _previousTransEndTime, this);
}
- oSigChange=outp.str();
- oNoMoreTrans=true;
- return _previousTransEndTime;
+ //oSigChange=outp.str();
+ //oNoMoreTrans=true;
+ //return _previousTransEndTime;
}else{
- //std::cout << "VCD out trans: " << (*_posTrasactListVCD)->toShortString() << std::endl;
TMLTransaction* aCurrTrans=*_posTrasactListVCD;
- oNoMoreTrans=false;
+ //oNoMoreTrans=false;
switch (_vcdOutputState){
case END_TRANS:
if (aCurrTrans->getRunnableTime()==_previousTransEndTime){
- outp << VCD_PREFIX << vcdValConvert(RUNNABLE) << " ta" << _ID;
+ //outp << VCD_PREFIX << vcdValConvert(RUNNABLE) << "ta" << _ID;
_vcdOutputState=START_TRANS;
+ new (oSigData) SignalChangeData(RUNNABLE, _previousTransEndTime, this);
}else{
- outp << VCD_PREFIX << vcdValConvert(SUSPENDED) << " ta" << _ID;
+ //outp << VCD_PREFIX << vcdValConvert(SUSPENDED) << "ta" << _ID;
+ new (oSigData) SignalChangeData(SUSPENDED, _previousTransEndTime, this);
if (aCurrTrans->getRunnableTime()==aCurrTrans->getStartTimeOperation()){
_vcdOutputState=START_TRANS;
+
}else{
_vcdOutputState=BETWEEN_TRANS;
}
}
- oSigChange=outp.str();
- return _previousTransEndTime;
+ //oSigChange=outp.str();
+ //return _previousTransEndTime;
break;
case BETWEEN_TRANS:
- outp << VCD_PREFIX << vcdValConvert(RUNNABLE) << " ta" << _ID;
- oSigChange=outp.str();
+ //outp << VCD_PREFIX << vcdValConvert(RUNNABLE) << "ta" << _ID;
+ //oSigChange=outp.str();
_vcdOutputState=START_TRANS;
- return aCurrTrans->getRunnableTime();
+ //return aCurrTrans->getRunnableTime();
+ new (oSigData) SignalChangeData(RUNNABLE, aCurrTrans->getRunnableTime(), this);
break;
case START_TRANS:
- outp << VCD_PREFIX << vcdValConvert(RUNNING) << " ta" << _ID;
- oSigChange=outp.str();
+ //outp << VCD_PREFIX << vcdValConvert(RUNNING) << "ta" << _ID;
+ //oSigChange=outp.str();
do{
_previousTransEndTime=(*_posTrasactListVCD)->getEndTime();
_posTrasactListVCD++;
}while (_posTrasactListVCD != _transactList.end() && (*_posTrasactListVCD)->getStartTimeOperation()==_previousTransEndTime);
_vcdOutputState=END_TRANS;
- return aCurrTrans->getStartTimeOperation();
+ //return aCurrTrans->getStartTimeOperation();
+ new (oSigData) SignalChangeData(RUNNING, aCurrTrans->getStartTimeOperation(), this);
break;
}
}
- return 0;
+ //return 0;
}
std::ostream& TMLTask::writeObject(std::ostream& s){
@@ -336,29 +334,29 @@ ParamType* TMLTask::getVariableByName(const std::string& iVarName ,bool& oIsId){
return _varLookUpName[iVarName.c_str()];
}
-ParamType* TMLTask::getVariableByID(ID iVarID){
- return _varLookUpID[iVarID];
-}
+//ParamType* TMLTask::getVariableByID(ID iVarID){
+// return _varLookUpID[iVarID];
+//}
-void TMLTask::addCommand(ID iID, TMLCommand* iCmd){
- _commandHash[iID]=iCmd;
-}
+//void TMLTask::addCommand(ID iID, TMLCommand* iCmd){
+// _commandHash[iID]=iCmd;
+//}
-TMLCommand* TMLTask::getCommandByID(ID iID){
- return _commandHash[iID];
-}
+//TMLCommand* TMLTask::getCommandByID(ID iID){
+// return _commandHash[iID];
+//}
-void TMLTask::streamStateXML(std::ostream& s) const{
- streamBenchmarks(s);
-}
+//void TMLTask::streamStateXML(std::ostream& s) const{
+// streamBenchmarks(s);
+//}
-VariableLookUpTableID::const_iterator TMLTask::getVariableIteratorID(bool iEnd) const{
+/*VariableLookUpTableID::const_iterator TMLTask::getVariableIteratorID(bool iEnd) const{
return (iEnd)?_varLookUpID.end():_varLookUpID.begin();
}
VariableLookUpTableName::const_iterator TMLTask::getVariableIteratorName(bool iEnd) const{
return (iEnd)?_varLookUpName.end():_varLookUpName.begin();
-}
+}*/
void TMLTask::finished(){
_justStarted=true;
@@ -393,9 +391,9 @@ TMLTransaction* TMLTask::getNextTransaction(TMLTime iEndSchedule) const{
//return (_currCommand==0 || _isScheduled)?0:_currCommand->getCurrTransaction();
}
-unsigned int TMLTask::getInstanceNo(){
- return _myInstance;
-}
+//unsigned int TMLTask::getInstanceNo(){
+// return _myInstance;
+//}
//void TMLTask::transWasScheduled(SchedulableDevice* iCPU){
//_isScheduled=true;
diff --git a/simulators/c++2/src_simulator/app/TMLTask.h b/simulators/c++2/src_simulator/app/TMLTask.h
index a581345176b07bf5b8f6c9134cd1328e9cfb504b..f09d82818079e411b6b35bf57cba9f034a9326a4 100755
--- a/simulators/c++2/src_simulator/app/TMLTask.h
+++ b/simulators/c++2/src_simulator/app/TMLTask.h
@@ -81,32 +81,32 @@ public:
/**
\return Priority
*/
- Priority getPriority() const;
+ inline Priority getPriority() const {return _priority;}
///Returns the end of the last scheduled transaction of the task
/**
\return End of transaction
*/
- TMLTime getEndLastTransaction() const;
+ inline TMLTime getEndLastTransaction() const {return _endLastTransaction;}
///Returns a pointer to the current command of the task
/**
\return Pointer to the current command
*/
- TMLCommand* getCurrCommand() const;
+ inline TMLCommand* getCurrCommand() const {return _currCommand;}
///Sets the pointer to the current command of the task
/**
\param iCurrCommand Pointer to the current command
*/
- void setCurrCommand(TMLCommand* iCurrCommand);
+ inline void setCurrCommand(TMLCommand* iCurrCommand){_currCommand=iCurrCommand;}
///Return a pointer to the CPU on which the task in running
/**
\return Pointer to the CPU
*/
- CPU* getCPU() const;
+ inline CPU* getCPU() const {return _currentCPU;}
///Returns a string representation of the task
/**
\return Detailed string representation
*/
- virtual std::string toString() const;
+ virtual std::string toString() const {return _name;}
///Returns a short string representation of the Task
/**
\return Short string representation
@@ -116,13 +116,13 @@ public:
/**
\return Unique ID
*/
- ID getID() const;
+ inline ID getID() const {return _ID;}
#ifdef ADD_COMMENTS
///Adds a new execution comment to the internal list
/**
\param iComment Pointer to the comment
*/
- void addComment(Comment* iComment);
+ inline void addComment(Comment* iComment) {_commentList.push_back(iComment);}
///Returns the next execution comment (pointed to by _posCommentList)
/**
\param iInit Indicates if the list iterator has to be reset to the beginning of the list
@@ -131,7 +131,8 @@ public:
*/
std::string getNextComment(bool iInit, Comment*& oComment);
#endif
- TMLTime getNextSignalChange(bool iInit, std::string& oSigChange, bool& oNoMoreTrans);
+ //TMLTime getNextSignalChange(bool iInit, std::string& oSigChange, bool& oNoMoreTrans);
+ void getNextSignalChange(bool iInit, SignalChangeData* oSigData);
///Adds a given transaction to the internal transaction list
/**
\param iTrans Pointer to the transaction
@@ -153,32 +154,34 @@ public:
\param iID ID of the Command
\return Pointer to the Commmand
*/
- TMLCommand* getCommandByID(ID iID);
+ inline TMLCommand* getCommandByID(ID iID) {return _commandHash[iID];}
///Adds a new command to the internal list
/**
\param iID ID of the command
\param iCmd Pointer to the command
*/
- void addCommand(ID iID, TMLCommand* iCmd);
+ inline void addCommand(ID iID, TMLCommand* iCmd) {_commandHash[iID]=iCmd;}
///Returns a pointer to the task variable specified by its ID
/**
\param iVarID ID of the task variable
\return Pointer to the variable
*/
- ParamType* getVariableByID(ID iVarID);
- void streamStateXML(std::ostream& s) const;
+ inline ParamType* getVariableByID(ID iVarID) {return _varLookUpID[iVarID];}
+ inline void streamStateXML(std::ostream& s) const {streamBenchmarks(s);}
///Returns an iterator for the internal variable ID hash table
/**
\param iEnd true for iterator pointing to the end of the table, false for iterator pointing to the first element
\return Const iterator for variable table
*/
- VariableLookUpTableID::const_iterator getVariableIteratorID(bool iEnd) const;
+ //VariableLookUpTableID::const_iterator getVariableIteratorID(bool iEnd) const;
+ inline const VariableLookUpTableID& getVariableLookUpTableID() const{return _varLookUpID;}
///Returns an iterator for the internal variable Name hash table
/**
\param iEnd true for iterator pointing to the end of the table, false for iterator pointing to the first element
\return Const iterator for variable table
*/
- VariableLookUpTableName::const_iterator getVariableIteratorName(bool iEnd) const;
+ //VariableLookUpTableName::const_iterator getVariableIteratorName(bool iEnd) const;
+ const VariableLookUpTableName& getVariableLookUpTableName() const{return _varLookUpName;}
///Is called when a stop command is encountered
void finished();
///Returns the current task state
@@ -197,7 +200,7 @@ public:
/**
\return Instance number
*/
- unsigned int getInstanceNo();
+ inline unsigned int getInstanceNo() {return _myInstance;}
///Notifies the Task of being scheduled by a CPU
/**
\param iCPU CPU that has scheduled the Task
diff --git a/simulators/c++2/src_simulator/app/TMLWaitCommand.cpp b/simulators/c++2/src_simulator/app/TMLWaitCommand.cpp
index 3bbc35e0b9c844cdafbc390d633a60a3f9f6e183..75fa4a4422eb8de0c04c964a8d34984fd7b7ac51 100644
--- a/simulators/c++2/src_simulator/app/TMLWaitCommand.cpp
+++ b/simulators/c++2/src_simulator/app/TMLWaitCommand.cpp
@@ -39,7 +39,7 @@ Ludovic Apvrille, Renaud Pacalet
*/
#include <TMLWaitCommand.h>
-#include <TMLEventChannel.h>
+//#include <TMLEventChannel.h>
#include <TMLTask.h>
#include <TMLTransaction.h>
#include <Bus.h>
@@ -69,18 +69,17 @@ TMLCommand* TMLWaitCommand::prepareNextTransaction(){
return this;
}
-TMLChannel* TMLWaitCommand::getChannel(unsigned int iIndex) const{
- return _channel;
-}
+//TMLChannel* TMLWaitCommand::getChannel(unsigned int iIndex) const{
+// return _channel;
+//}
-unsigned int TMLWaitCommand::getNbOfChannels() const{
- //return (_channel->getBlockedWriteTask()==0)?0:1;
- return 1;
-}
+//unsigned int TMLWaitCommand::getNbOfChannels() const{
+// return 1;
+//}
-TMLTask* TMLWaitCommand::getDependentTask(unsigned int iIndex)const{
- return _channel->getBlockedWriteTask();
-}
+//TMLTask* TMLWaitCommand::getDependentTask(unsigned int iIndex)const{
+// return _channel->getBlockedWriteTask();
+//}
std::string TMLWaitCommand::toString() const{
std::ostringstream outp;
@@ -94,19 +93,10 @@ std::string TMLWaitCommand::toShortString() const{
return outp.str();
}
-std::string TMLWaitCommand::getCommandStr() const{
- if (_channel->getRequestChannel()) return "waitReq"; else return "wait";
-}
-
-/*ParamFuncPointer TMLWaitCommand::getParamFuncPointer() const{
- return _paramFunc;
-}*/
+//std::string TMLWaitCommand::getCommandStr() const{
+// if (_channel->getRequestChannel()) return "waitReq"; else return "wait";
+//}
-Parameter* TMLWaitCommand::setParams(Parameter* ioParam){
- /*Parameter* aResult = 0;
- if (_paramFunc!=0) {
- aResult = (_task->*_paramFunc)(ioParam);
- }
- return aResult;*/
- return (_task->*_paramFunc)(ioParam);
-}
+//Parameter* TMLWaitCommand::setParams(Parameter* ioParam){
+// return (_task->*_paramFunc)(ioParam);
+//}
diff --git a/simulators/c++2/src_simulator/app/TMLWaitCommand.h b/simulators/c++2/src_simulator/app/TMLWaitCommand.h
index 6befb24b024bd1737520f3e8a060fbd8237bb3a4..3d0cf11968c27e5363cdc924fe21ec3d8dfb535a 100644
--- a/simulators/c++2/src_simulator/app/TMLWaitCommand.h
+++ b/simulators/c++2/src_simulator/app/TMLWaitCommand.h
@@ -44,8 +44,7 @@ Ludovic Apvrille, Renaud Pacalet
#include <definitions.h>
#include <TMLCommand.h>
#include <Parameter.h>
-
-class TMLEventChannel;
+#include <TMLEventChannel.h>
///This class models the waiting for an event within a TML task.
class TMLWaitCommand:public TMLCommand{
@@ -62,12 +61,12 @@ public:
*/
TMLWaitCommand(ID iID, TMLTask* iTask,TMLEventChannel* iChannel, ParamFuncPointer iParamFunc, const char* iLiveVarList, bool iCheckpoint/*, Parameter* iStatParam = 0*/);
void execute();
- TMLChannel* getChannel(unsigned int iIndex) const;
- unsigned int getNbOfChannels() const;
- TMLTask* getDependentTask(unsigned int iIndex)const;
+ inline TMLChannel* getChannel(unsigned int iIndex) const {return dynamic_cast<TMLChannel*>(_channel);}
+ inline unsigned int getNbOfChannels() const {return 1;}
+ inline TMLTask* getDependentTask(unsigned int iIndex)const {return _channel->getBlockedWriteTask();}
std::string toString() const;
std::string toShortString() const;
- std::string getCommandStr() const;
+ inline std::string getCommandStr() const {if (_channel->getRequestChannel()) return "waitReq"; else return "wait";}
/////Returns a pointer to the parameter data structure
////**
//\return Pointer to parameter data structure
@@ -77,7 +76,7 @@ public:
/**
\param ioParam Parameter data structure
*/
- Parameter* setParams(Parameter* ioParam);
+ inline Parameter* setParams(Parameter* ioParam) {return (_task->*_paramFunc)(ioParam);}
protected:
///Channel on which the event is conveyed
TMLEventChannel* _channel;
diff --git a/simulators/c++2/src_simulator/app/TMLWriteCommand.cpp b/simulators/c++2/src_simulator/app/TMLWriteCommand.cpp
index a3dccdecec533a13fb2ae6a2519e4083d781534e..8e96b6b0f36d191a5710abf3c0d4e83eac633cea 100755
--- a/simulators/c++2/src_simulator/app/TMLWriteCommand.cpp
+++ b/simulators/c++2/src_simulator/app/TMLWriteCommand.cpp
@@ -39,7 +39,7 @@ Ludovic Apvrille, Renaud Pacalet
*/
#include <TMLWriteCommand.h>
-#include <TMLChannel.h>
+//#include <TMLChannel.h>
#include <TMLTask.h>
#include <TMLTransaction.h>
#include <Bus.h>
@@ -87,17 +87,17 @@ TMLCommand* TMLWriteCommand::prepareNextTransaction(){
return this;
}
-TMLChannel* TMLWriteCommand::getChannel(unsigned int iIndex) const{
- return _channel;
-}
+//TMLChannel* TMLWriteCommand::getChannel(unsigned int iIndex) const{
+// return _channel;
+//}
-unsigned int TMLWriteCommand::getNbOfChannels() const{
- return 1;
-}
+//unsigned int TMLWriteCommand::getNbOfChannels() const{
+// return 1;
+//}
-TMLTask* TMLWriteCommand::getDependentTask(unsigned int iIndex)const{
- return _channel->getBlockedReadTask();
-}
+//TMLTask* TMLWriteCommand::getDependentTask(unsigned int iIndex)const{
+// return _channel->getBlockedReadTask();
+//}
std::string TMLWriteCommand::toString() const{
std::ostringstream outp;
@@ -111,6 +111,6 @@ std::string TMLWriteCommand::toShortString() const{
return outp.str();
}
-std::string TMLWriteCommand::getCommandStr() const{
- return "wr";
-}
+//std::string TMLWriteCommand::getCommandStr() const{
+// return "wr";
+//}
diff --git a/simulators/c++2/src_simulator/app/TMLWriteCommand.h b/simulators/c++2/src_simulator/app/TMLWriteCommand.h
index 0bd160b477eff5d1e129cf86d69dba55a3cb8e3d..05e8a6dbaf7d5012a1bb6e13d466f4dd8ae42f40 100755
--- a/simulators/c++2/src_simulator/app/TMLWriteCommand.h
+++ b/simulators/c++2/src_simulator/app/TMLWriteCommand.h
@@ -43,8 +43,7 @@ Ludovic Apvrille, Renaud Pacalet
#include <definitions.h>
#include <TMLCommand.h>
-
-class TMLChannel;
+#include <TMLChannel.h>
///This class models write operations on TML channels.
class TMLWriteCommand:public TMLCommand{
@@ -61,12 +60,12 @@ public:
*/
TMLWriteCommand(ID iID, TMLTask* iTask, LengthFuncPointer iLengthFunc, TMLChannel* iChannel, const char* iLiveVarList, bool iCheckpoint, TMLLength iStatLength=1);
void execute();
- TMLChannel* getChannel(unsigned int iIndex) const;
- unsigned int getNbOfChannels() const;
- TMLTask* getDependentTask(unsigned int iIndex)const;
+ inline TMLChannel* getChannel(unsigned int iIndex) const {return _channel;}
+ inline unsigned int getNbOfChannels() const {return 1;}
+ inline TMLTask* getDependentTask(unsigned int iIndex)const {return _channel->getBlockedReadTask();}
std::string toString() const;
std::string toShortString() const;
- std::string getCommandStr() const;
+ inline std::string getCommandStr() const {return "wr";}
protected:
///Pointer to the function returning the length of the command
LengthFuncPointer _lengthFunc;
diff --git a/simulators/c++2/src_simulator/app/TMLWriteMultCommand.cpp b/simulators/c++2/src_simulator/app/TMLWriteMultCommand.cpp
index 394b09f120f7a60f3e2471d5a5a9e6db44e0edda..44f4f409d316be0c175a6fbde606a69203b00cee 100644
--- a/simulators/c++2/src_simulator/app/TMLWriteMultCommand.cpp
+++ b/simulators/c++2/src_simulator/app/TMLWriteMultCommand.cpp
@@ -39,7 +39,7 @@ Ludovic Apvrille, Renaud Pacalet
*/
#include <TMLWriteMultCommand.h>
-#include <TMLChannel.h>
+//#include <TMLChannel.h>
#include <TMLTask.h>
#include <TMLTransaction.h>
#include <Bus.h>
@@ -86,17 +86,17 @@ TMLCommand* TMLWriteMultCommand::prepareNextTransaction(){
return this;
}
-TMLChannel* TMLWriteMultCommand::getChannel(unsigned int iIndex) const{
- return _channels[iIndex];
-}
+//TMLChannel* TMLWriteMultCommand::getChannel(unsigned int iIndex) const{
+// return _channels[iIndex];
+//}
-unsigned int TMLWriteMultCommand::getNbOfChannels() const{
- return _nbOfChannels;
-}
+//unsigned int TMLWriteMultCommand::getNbOfChannels() const{
+// return _nbOfChannels;
+//}
-TMLTask* TMLWriteMultCommand::getDependentTask(unsigned int iIndex)const{
- return _channels[iIndex]->getBlockedReadTask();
-}
+//TMLTask* TMLWriteMultCommand::getDependentTask(unsigned int iIndex)const{
+// return _channels[iIndex]->getBlockedReadTask();
+//}
std::string TMLWriteMultCommand::toString() const{
std::ostringstream outp;
@@ -110,6 +110,6 @@ std::string TMLWriteMultCommand::toShortString() const{
return outp.str();
}
-std::string TMLWriteMultCommand::getCommandStr() const{
- return "wr";
-}
+//std::string TMLWriteMultCommand::getCommandStr() const{
+// return "wr";
+//}
diff --git a/simulators/c++2/src_simulator/app/TMLWriteMultCommand.h b/simulators/c++2/src_simulator/app/TMLWriteMultCommand.h
index 934b33cf82a254fccbcf0d158278a7ab64f9121a..723faa9de6d3e0df23257c6a71b01f93475a6a18 100644
--- a/simulators/c++2/src_simulator/app/TMLWriteMultCommand.h
+++ b/simulators/c++2/src_simulator/app/TMLWriteMultCommand.h
@@ -43,8 +43,7 @@ Ludovic Apvrille, Renaud Pacalet
#include <definitions.h>
#include <TMLCommand.h>
-
-class TMLChannel;
+#include <TMLChannel.h>
///This class models write operations on several TML channels at a time.
class TMLWriteMultCommand:public TMLCommand{
@@ -62,12 +61,12 @@ public:
*/
TMLWriteMultCommand(ID iID, TMLTask* iTask, LengthFuncPointer iLengthFunc, TMLChannel** iChannels, unsigned int iNbOfChannels, const char* iLiveVarList, bool iCheckpoint, TMLLength iStatLength=1);
void execute();
- TMLChannel* getChannel(unsigned int iIndex) const;
- unsigned int getNbOfChannels() const;
- TMLTask* getDependentTask(unsigned int iIndex)const;
+ inline TMLChannel* getChannel(unsigned int iIndex) const {return _channels[iIndex];}
+ inline unsigned int getNbOfChannels() const {return _nbOfChannels;}
+ inline TMLTask* getDependentTask(unsigned int iIndex)const {return _channels[iIndex]->getBlockedReadTask();}
std::string toString() const;
std::string toShortString() const;
- std::string getCommandStr() const;
+ inline std::string getCommandStr() const {return "wr";}
protected:
///Pointer to the function returning the length of the command
LengthFuncPointer _lengthFunc;
diff --git a/simulators/c++2/src_simulator/app/TMLbrbwChannel.cpp b/simulators/c++2/src_simulator/app/TMLbrbwChannel.cpp
index 8eae7b6f0d78dbfd271f8fb686470ec48d0bd68f..4f5e98f29fab5676023f7d830fec71ace305663a 100755
--- a/simulators/c++2/src_simulator/app/TMLbrbwChannel.cpp
+++ b/simulators/c++2/src_simulator/app/TMLbrbwChannel.cpp
@@ -129,13 +129,13 @@ void TMLbrbwChannel::setTransactionLength() const{
}
}
-TMLTask* TMLbrbwChannel::getBlockedReadTask() const{
- return _readTask;
-}
+//TMLTask* TMLbrbwChannel::getBlockedReadTask() const{
+// return _readTask;
+//}
-TMLTask* TMLbrbwChannel::getBlockedWriteTask() const{
- return _writeTask;
-}
+//TMLTask* TMLbrbwChannel::getBlockedWriteTask() const{
+// return _writeTask;
+//}
std::string TMLbrbwChannel::toString() const{
std::ostringstream outp;
diff --git a/simulators/c++2/src_simulator/app/TMLbrbwChannel.h b/simulators/c++2/src_simulator/app/TMLbrbwChannel.h
index 918b86f84e3051c03f51723832b33204e8a6ee7c..e51e7d34b308081ec23f38f7eb65cd9f5b1beeb3 100755
--- a/simulators/c++2/src_simulator/app/TMLbrbwChannel.h
+++ b/simulators/c++2/src_simulator/app/TMLbrbwChannel.h
@@ -67,8 +67,8 @@ public:
void testRead(TMLTransaction* iTrans);
void write();
bool read();
- TMLTask* getBlockedReadTask() const;
- TMLTask* getBlockedWriteTask() const;
+ inline TMLTask* getBlockedReadTask() const {return _readTask;}
+ inline TMLTask* getBlockedWriteTask() const {return _writeTask;}
std::string toString() const;
virtual TMLLength insertSamples(TMLLength iNbOfSamples, Parameter* iParam);
protected:
diff --git a/simulators/c++2/src_simulator/app/TMLbrnbwChannel.cpp b/simulators/c++2/src_simulator/app/TMLbrnbwChannel.cpp
index acb7a60061dc5766b80df0f938be6cb9c00fa07c..7ee6c6fdd805328d9e87ab9adbb9d1b6a05a0451 100644
--- a/simulators/c++2/src_simulator/app/TMLbrnbwChannel.cpp
+++ b/simulators/c++2/src_simulator/app/TMLbrnbwChannel.cpp
@@ -113,13 +113,13 @@ void TMLbrnbwChannel::setTransactionLength() const{
}
}
-TMLTask* TMLbrnbwChannel::getBlockedReadTask() const{
- return _readTask;
-}
+//TMLTask* TMLbrnbwChannel::getBlockedReadTask() const{
+// return _readTask;
+//}
-TMLTask* TMLbrnbwChannel::getBlockedWriteTask() const{
- return 0;
-}
+//TMLTask* TMLbrnbwChannel::getBlockedWriteTask() const{
+// return 0;
+//}
std::string TMLbrnbwChannel::toString() const{
std::ostringstream outp;
diff --git a/simulators/c++2/src_simulator/app/TMLbrnbwChannel.h b/simulators/c++2/src_simulator/app/TMLbrnbwChannel.h
index 9e1fd9fce65d6969f90064746847daf64e3adc96..bc255eaddb2bd8b1e99e0c3171ccfb19a2785676 100644
--- a/simulators/c++2/src_simulator/app/TMLbrnbwChannel.h
+++ b/simulators/c++2/src_simulator/app/TMLbrnbwChannel.h
@@ -66,8 +66,8 @@ public:
void testRead(TMLTransaction* iTrans);
void write();
bool read();
- TMLTask* getBlockedReadTask() const;
- TMLTask* getBlockedWriteTask() const;
+ inline TMLTask* getBlockedReadTask() const {return _readTask;}
+ inline TMLTask* getBlockedWriteTask() const {return 0;}
std::string toString() const;
virtual TMLLength insertSamples(TMLLength iNbOfSamples, Parameter* iParam);
protected:
diff --git a/simulators/c++2/src_simulator/app/TMLnbrnbwChannel.cpp b/simulators/c++2/src_simulator/app/TMLnbrnbwChannel.cpp
index 33c81dc877bbe719d2023a5ebbb111cd6d5df5e5..4b3c84202f94073af228f3dd6c99bf140b2aa6d4 100644
--- a/simulators/c++2/src_simulator/app/TMLnbrnbwChannel.cpp
+++ b/simulators/c++2/src_simulator/app/TMLnbrnbwChannel.cpp
@@ -71,13 +71,13 @@ bool TMLnbrnbwChannel::read(){
return true;
}
-TMLTask* TMLnbrnbwChannel::getBlockedReadTask() const{
- return 0;
-}
+//TMLTask* TMLnbrnbwChannel::getBlockedReadTask() const{
+// return 0;
+//}
-TMLTask* TMLnbrnbwChannel::getBlockedWriteTask() const{
- return 0;
-}
+//TMLTask* TMLnbrnbwChannel::getBlockedWriteTask() const{
+// return 0;
+//}
std::string TMLnbrnbwChannel::toString() const{
std::ostringstream outp;
@@ -85,5 +85,5 @@ std::string TMLnbrnbwChannel::toString() const{
return outp.str();
}
-void TMLnbrnbwChannel::getStateHash(HashAlgo* iHash) const{
-}
+//void TMLnbrnbwChannel::getStateHash(HashAlgo* iHash) const{
+//}
diff --git a/simulators/c++2/src_simulator/app/TMLnbrnbwChannel.h b/simulators/c++2/src_simulator/app/TMLnbrnbwChannel.h
index aee5240297fdaab94ec21df8a20b332fd9ce558f..0461d3ebe90c4ba8ed2508cd80056a4b90ff154b 100644
--- a/simulators/c++2/src_simulator/app/TMLnbrnbwChannel.h
+++ b/simulators/c++2/src_simulator/app/TMLnbrnbwChannel.h
@@ -66,10 +66,10 @@ public:
void testRead(TMLTransaction* iCommand);
void write();
bool read();
- TMLTask* getBlockedReadTask() const;
- TMLTask* getBlockedWriteTask() const;
+ inline TMLTask* getBlockedReadTask() const {return 0;}
+ inline TMLTask* getBlockedWriteTask() const {return 0;}
std::string toString() const;
- void getStateHash(HashAlgo* iHash) const;
+ inline void getStateHash(HashAlgo* iHash) const {}
protected:
};
diff --git a/simulators/c++2/src_simulator/arch/Bus.cpp b/simulators/c++2/src_simulator/arch/Bus.cpp
index 09499c18d52ce4759c2bd603f7f26c9f5afe6d1d..502bcff1b1eb7a68800f83b5250471a47c1c7229 100644
--- a/simulators/c++2/src_simulator/arch/Bus.cpp
+++ b/simulators/c++2/src_simulator/arch/Bus.cpp
@@ -47,7 +47,7 @@ Ludovic Apvrille, Renaud Pacalet
//#include <TransactionListener.h>
#include <WorkloadSource.h>
-Bus::Bus(ID iID, std::string iName, WorkloadSource* iScheduler, TMLLength iBurstSize, unsigned int ibusWidth, TMLTime iTimePerSample, bool iChannelBasedPrio): SchedulableCommDevice(iID, iName, iScheduler, iChannelBasedPrio), _burstSize(iBurstSize), _schedulingNeeded(true), _timePerSample(iTimePerSample), _busWidth(ibusWidth), _busyCycles(0){}
+Bus::Bus(ID iID, std::string iName, WorkloadSource* iScheduler, TMLLength iBurstSize, unsigned int ibusWidth, TMLTime iTimePerSample, bool iChannelBasedPrio): SchedulableCommDevice(iID, iName, iScheduler, iChannelBasedPrio), _burstSize(iBurstSize), _schedulingNeeded(true), _timePerSample(iTimePerSample), _busWidth(ibusWidth) /*, _busyCycles(0)*/{}
Bus::~Bus(){
//delete _scheduler;
@@ -71,10 +71,10 @@ void Bus::schedule(){
#endif
}
-void Bus::registerTransaction(){
- _schedulingNeeded=true;
- _nextTransaction=0;
-}
+//void Bus::registerTransaction(){
+// _schedulingNeeded=true;
+// _nextTransaction=0;
+//}
bool Bus::addTransaction(TMLTransaction* iTransToBeAdded){
//std::cout << "Bus add trans " << _nextTransaction << "\n";
@@ -112,23 +112,22 @@ void Bus::calcStartTimeLength(TMLTime iTimeSlice) const{
if (aSlave!=0) aSlave->CalcTransactionLength(_nextTransaction);
}
-TMLTransaction* Bus::getNextTransaction(){
- if (_schedulingNeeded) schedule();
- //else std::cout << _name << ": skip schedule\n";
- return _nextTransaction;
-}
+//TMLTransaction* Bus::getNextTransaction(){
+// if (_schedulingNeeded) schedule();
+// return _nextTransaction;
+//}
-TMLLength Bus::getBurstSize() const{
- return _burstSize;
-}
+//TMLLength Bus::getBurstSize() const{
+// return _burstSize;
+//}
//void Bus::truncateToBurst(TMLTransaction* iTrans) const{
// iTrans->setVirtualLength(min(iTrans->getVirtualLength(), _burstSize));
//}
-std::string Bus::toString() const{
- return _name;
-}
+//std::string Bus::toString() const{
+// return _name;
+//}
std::string Bus::toShortString() const{
std::ostringstream outp;
@@ -169,24 +168,29 @@ void Bus::schedule2HTML(std::ofstream& myfile) const{
}
void Bus::schedule2TXT(std::ofstream& myfile) const{
+ myfile << "========= Scheduling for device: "<< _name << " =========\n" ;
+ for(TransactionList::const_iterator i=_transactList.begin(); i != _transactList.end(); ++i){
+ myfile << (*i)->toShortString() << std::endl;
+ }
}
-TMLTime Bus::getNextSignalChange(bool iInit, std::string& oSigChange, bool& oNoMoreTrans){
- //end_idle end_read end_write
- std::ostringstream outp;
+//TMLTime Bus::getNextSignalChange(bool iInit, std::string& oSigChange, bool& oNoMoreTrans){
+void Bus::getNextSignalChange(bool iInit, SignalChangeData* oSigData){
+ //std::ostringstream outp;
if (iInit){
_posTrasactListVCD=_transactList.begin();
_previousTransEndTime=0;
_vcdOutputState=INIT_BUS;
}
if (_posTrasactListVCD == _transactList.end()){
- outp << VCD_PREFIX << vcdValConvert(END_IDLE_BUS) << " bus" << _ID;
- oSigChange=outp.str();
- oNoMoreTrans=true;
- return _previousTransEndTime;
+ //outp << VCD_PREFIX << vcdValConvert(END_IDLE_BUS) << "bus" << _ID;
+ //oSigChange=outp.str();
+ //oNoMoreTrans=true;
+ //return _previousTransEndTime;
+ new (oSigData) SignalChangeData(END_IDLE_BUS, _previousTransEndTime, this);
}else{
TMLTransaction* aCurrTrans=*_posTrasactListVCD;
- oNoMoreTrans=false;
+ //oNoMoreTrans=false;
switch (_vcdOutputState){
case END_READ_BUS:
do{
@@ -194,15 +198,17 @@ TMLTime Bus::getNextSignalChange(bool iInit, std::string& oSigChange, bool& oNoM
_posTrasactListVCD++;
}while (_posTrasactListVCD != _transactList.end() && (*_posTrasactListVCD)->getStartTimeOperation()==_previousTransEndTime && (*_posTrasactListVCD)->getCommand()->getTask()==(*_posTrasactListVCD)->getChannel()->getBlockedReadTask());
if (_posTrasactListVCD != _transactList.end() && (*_posTrasactListVCD)->getStartTimeOperation()==_previousTransEndTime){
- outp << VCD_PREFIX << vcdValConvert(END_WRITE_BUS) << " bus" << _ID;
+ //outp << VCD_PREFIX << vcdValConvert(END_WRITE_BUS) << "bus" << _ID;
_vcdOutputState=END_WRITE_BUS;
+ new (oSigData) SignalChangeData(END_WRITE_BUS, _previousTransEndTime, this);
}else{
- outp << VCD_PREFIX << vcdValConvert(END_IDLE_BUS) << " bus" << _ID;
+ //outp << VCD_PREFIX << vcdValConvert(END_IDLE_BUS) << "bus" << _ID;
_vcdOutputState=END_IDLE_BUS;
- if (_posTrasactListVCD == _transactList.end()) oNoMoreTrans=true;
+ //if (_posTrasactListVCD == _transactList.end()) oNoMoreTrans=true;
+ new (oSigData) SignalChangeData(END_IDLE_BUS, _previousTransEndTime, this);
}
- oSigChange=outp.str();
- return _previousTransEndTime;
+ //oSigChange=outp.str();
+ //return _previousTransEndTime;
break;
case END_WRITE_BUS:
do{
@@ -210,37 +216,43 @@ TMLTime Bus::getNextSignalChange(bool iInit, std::string& oSigChange, bool& oNoM
_posTrasactListVCD++;
}while (_posTrasactListVCD != _transactList.end() && (*_posTrasactListVCD)->getStartTimeOperation()==_previousTransEndTime && (*_posTrasactListVCD)->getCommand()->getTask()==(*_posTrasactListVCD)->getChannel()->getBlockedWriteTask());
if (_posTrasactListVCD != _transactList.end() && (*_posTrasactListVCD)->getStartTimeOperation()==_previousTransEndTime){
- outp << VCD_PREFIX << vcdValConvert(END_READ_BUS) << " bus" << _ID;
+ //outp << VCD_PREFIX << vcdValConvert(END_READ_BUS) << "bus" << _ID;
_vcdOutputState=END_READ_BUS;
+ new (oSigData) SignalChangeData(END_READ_BUS, _previousTransEndTime, this);
}else{
- outp << VCD_PREFIX << vcdValConvert(END_IDLE_BUS) << " bus" << _ID;
+ //outp << VCD_PREFIX << vcdValConvert(END_IDLE_BUS) << "bus" << _ID;
_vcdOutputState=END_IDLE_BUS;
- if (_posTrasactListVCD == _transactList.end()) oNoMoreTrans=true;
+ //if (_posTrasactListVCD == _transactList.end()) oNoMoreTrans=true;
+ new (oSigData) SignalChangeData(END_IDLE_BUS, _previousTransEndTime, this);
}
- oSigChange=outp.str();
- return _previousTransEndTime;
+ //oSigChange=outp.str();
+ //return _previousTransEndTime;
break;
case INIT_BUS:
if (aCurrTrans->getStartTimeOperation()!=0){
_vcdOutputState=END_IDLE_BUS;
- outp << VCD_PREFIX << vcdValConvert(END_IDLE_BUS) << " bus" << _ID;
- oSigChange=outp.str();
- return 0;
+ //outp << VCD_PREFIX << vcdValConvert(END_IDLE_BUS) << "bus" << _ID;
+ //oSigChange=outp.str();
+ new (oSigData) SignalChangeData(END_IDLE_BUS, 0, this);
+ //return 0;
+ return;
}
case END_IDLE_BUS:
if (aCurrTrans->getCommand()->getTask()==aCurrTrans->getChannel()->getBlockedReadTask()){
_vcdOutputState=END_READ_BUS;
- outp << VCD_PREFIX << vcdValConvert(END_READ_BUS) << " bus" << _ID;
+ new (oSigData) SignalChangeData(END_READ_BUS, aCurrTrans->getStartTimeOperation(), this);
+ //outp << VCD_PREFIX << vcdValConvert(END_READ_BUS) << "bus" << _ID;
}else{
_vcdOutputState=END_WRITE_BUS;
- outp << VCD_PREFIX << vcdValConvert(END_WRITE_BUS) << " bus" << _ID;
+ new (oSigData) SignalChangeData(END_WRITE_BUS, aCurrTrans->getStartTimeOperation(), this);
+ //outp << VCD_PREFIX << vcdValConvert(END_WRITE_BUS) << "bus" << _ID;
}
- oSigChange=outp.str();
- return aCurrTrans->getStartTimeOperation();
+ //oSigChange=outp.str();
+ //return aCurrTrans->getStartTimeOperation();
break;
}
}
- return 0;
+ //return 0;
}
void Bus::reset(){
@@ -259,9 +271,9 @@ void Bus::streamBenchmarks(std::ostream& s) const{
s << TAG_BUSc;
}
-void Bus::streamStateXML(std::ostream& s) const{
- streamBenchmarks(s);
-}
+//void Bus::streamStateXML(std::ostream& s) const{
+// streamBenchmarks(s);
+//}
std::istream& Bus::readObject(std::istream &is){
SchedulableDevice::readObject(is);
diff --git a/simulators/c++2/src_simulator/arch/Bus.h b/simulators/c++2/src_simulator/arch/Bus.h
index 9f0acba7bffafea727b3e4681b0983d1dbbbf04b..b1eac1a63c6fe599f9c023ac510f8e7bae9c7198 100644
--- a/simulators/c++2/src_simulator/arch/Bus.h
+++ b/simulators/c++2/src_simulator/arch/Bus.h
@@ -73,7 +73,7 @@ public:
///Destructor
virtual ~Bus();
///Add a transaction waiting for execution to the internal list
- void registerTransaction();
+ inline void registerTransaction() {_schedulingNeeded=true; _nextTransaction=0;}
///Determines the next bus transaction to be executed
void schedule();
///Adds the transaction determined by the scheduling algorithm to the internal list of scheduled transactions
@@ -82,17 +82,20 @@ public:
/**
\return Pointer to transaction
*/
- TMLTransaction* getNextTransaction();
+ inline TMLTransaction* getNextTransaction() {
+ if (_schedulingNeeded) schedule();
+ return _nextTransaction;
+ }
///Returns the size of an atomic bus transaction
/**
\return Burst size
*/
- TMLLength getBurstSize() const;
+ inline TMLLength getBurstSize() const {return _burstSize;}
///Returns a string representation of the Bus
/**
\return Detailed string representation
*/
- std::string toString() const;
+ inline std::string toString() const {return _name;}
///Returns a short string representation of the bus
/**
\return Short string representation
@@ -108,10 +111,11 @@ public:
\param myfile Reference to the ofstream object representing the output file
*/
void schedule2TXT(std::ofstream& myfile) const;
- TMLTime getNextSignalChange(bool iInit, std::string& oSigChange, bool& oNoMoreTrans);
+ //TMLTime getNextSignalChange(bool iInit, std::string& oSigChange, bool& oNoMoreTrans);
+ void getNextSignalChange(bool iInit, SignalChangeData* oSigData);
virtual void streamBenchmarks(std::ostream& s) const;
virtual void reset();
- void streamStateXML(std::ostream& s) const;
+ inline void streamStateXML(std::ostream& s) const {streamBenchmarks(s);}
std::istream& readObject(std::istream &is);
std::ostream& writeObject(std::ostream &os);
protected:
@@ -128,8 +132,8 @@ protected:
TMLTime _timePerSample;
///Bus width in bytes
unsigned int _busWidth;
- ///Busy cycles since simulation start
- TMLTime _busyCycles;
+ /////Busy cycles since simulation start
+ //TMLTime _busyCycles;
///State variable for the VCD output
vcdBusVisState _vcdOutputState;
};
diff --git a/simulators/c++2/src_simulator/arch/PrioScheduler.cpp b/simulators/c++2/src_simulator/arch/PrioScheduler.cpp
index 8e4ebbe2574c2226bd50316cd282bd96571f45f4..9a4afc33c350fadad1e47e9ab9073ad99a215662 100644
--- a/simulators/c++2/src_simulator/arch/PrioScheduler.cpp
+++ b/simulators/c++2/src_simulator/arch/PrioScheduler.cpp
@@ -94,13 +94,13 @@ TMLTime PrioScheduler::schedule(TMLTime iEndSchedule){
return 0;
}
-TMLTransaction* PrioScheduler::getNextTransaction(TMLTime iEndSchedule) const{
- return _nextTransaction;
-}
+//TMLTransaction* PrioScheduler::getNextTransaction(TMLTime iEndSchedule) const{
+// return _nextTransaction;
+//}
-std::string PrioScheduler::toString() const{
- return _name;
-}
+//std::string PrioScheduler::toString() const{
+// return _name;
+//}
PrioScheduler::~PrioScheduler(){
std::cout << _name << ": Scheduler deleted\n";
diff --git a/simulators/c++2/src_simulator/arch/PrioScheduler.h b/simulators/c++2/src_simulator/arch/PrioScheduler.h
index 472e41176c231c696f09c7542020d521dfb5079e..09225e69f4e5dbba2b5271531f8c4b86534d59ff 100644
--- a/simulators/c++2/src_simulator/arch/PrioScheduler.h
+++ b/simulators/c++2/src_simulator/arch/PrioScheduler.h
@@ -62,8 +62,8 @@ public:
PrioScheduler(const std::string& iName, Priority iPrio, WorkloadSource** aSourceArray, unsigned int iNbOfSources);
~PrioScheduler();
TMLTime schedule(TMLTime iEndSchedule);
- TMLTransaction* getNextTransaction(TMLTime iEndSchedule) const;
- std::string toString() const;
+ inline TMLTransaction* getNextTransaction(TMLTime iEndSchedule) const {return _nextTransaction;}
+ inline std::string toString() const {return _name;}
void reset();
//void transWasScheduled(SchedulableDevice* iDevice);
protected:
diff --git a/simulators/c++2/src_simulator/arch/RRPrioScheduler.cpp b/simulators/c++2/src_simulator/arch/RRPrioScheduler.cpp
index 6efcbaf570f9480f263da2152389836d62799f4f..97648940e57213aa7ce3dae7200b434b5dcba537 100644
--- a/simulators/c++2/src_simulator/arch/RRPrioScheduler.cpp
+++ b/simulators/c++2/src_simulator/arch/RRPrioScheduler.cpp
@@ -132,9 +132,9 @@ TMLTime RRPrioScheduler::schedule(TMLTime iEndSchedule){
return _timeSlice-_elapsedTime;
}
-TMLTransaction* RRPrioScheduler::getNextTransaction(TMLTime iEndSchedule) const{
- return _nextTransaction;
-}
+//TMLTransaction* RRPrioScheduler::getNextTransaction(TMLTime iEndSchedule) const{
+// return _nextTransaction;
+//}
void RRPrioScheduler::reset(){
WorkloadSource::reset();
@@ -143,9 +143,9 @@ void RRPrioScheduler::reset(){
_lastSource=0;
}
-std::string RRPrioScheduler::toString() const{
- return _name;
-}
+//std::string RRPrioScheduler::toString() const{
+// return _name;
+//}
RRPrioScheduler::~RRPrioScheduler(){
std::cout << _name << ": Scheduler deleted\n";
diff --git a/simulators/c++2/src_simulator/arch/RRPrioScheduler.h b/simulators/c++2/src_simulator/arch/RRPrioScheduler.h
index fc9722da763bfbfc2175e9a06b2fbd397a28370b..5df23c3f6ae34d9c9d553c85326e8fb364122a2c 100644
--- a/simulators/c++2/src_simulator/arch/RRPrioScheduler.h
+++ b/simulators/c++2/src_simulator/arch/RRPrioScheduler.h
@@ -69,11 +69,11 @@ public:
///Destructor
~RRPrioScheduler();
TMLTime schedule(TMLTime iEndSchedule);
- TMLTransaction* getNextTransaction(TMLTime iEndSchedule) const;
+ inline TMLTransaction* getNextTransaction(TMLTime iEndSchedule) const {return _nextTransaction;}
void reset();
std::istream& readObject(std::istream &is);
std::ostream& writeObject(std::ostream &os);
- std::string toString() const;
+ inline std::string toString() const {return _name;}
//void transWasScheduled(SchedulableDevice* iDevice);
protected:
///Name of the scheduler
diff --git a/simulators/c++2/src_simulator/arch/RRScheduler.cpp b/simulators/c++2/src_simulator/arch/RRScheduler.cpp
index 4b41edb3c8da20272c38d39774d618ff45c21dde..e6a025c019ec2fd523aba1dbc3a071189ef46bd4 100644
--- a/simulators/c++2/src_simulator/arch/RRScheduler.cpp
+++ b/simulators/c++2/src_simulator/arch/RRScheduler.cpp
@@ -126,9 +126,9 @@ TMLTime RRScheduler::schedule(TMLTime iEndSchedule){
return _timeSlice-_elapsedTime;
}
-TMLTransaction* RRScheduler::getNextTransaction(TMLTime iEndSchedule) const{
- return _nextTransaction;
-}
+//TMLTransaction* RRScheduler::getNextTransaction(TMLTime iEndSchedule) const{
+// return _nextTransaction;
+//}
void RRScheduler::reset(){
WorkloadSource::reset();
@@ -137,9 +137,9 @@ void RRScheduler::reset(){
_lastSource=0;
}
-std::string RRScheduler::toString() const{
- return _name;
-}
+//std::string RRScheduler::toString() const{
+// return _name;
+//}
RRScheduler::~RRScheduler(){
std::cout << _name << ": Scheduler deleted\n";
diff --git a/simulators/c++2/src_simulator/arch/RRScheduler.h b/simulators/c++2/src_simulator/arch/RRScheduler.h
index 2b22b060eabdb347c26f13d91fa14e0f0a906a26..1291fd2d42f2260ed81f7d998b36c576f3c2a17b 100644
--- a/simulators/c++2/src_simulator/arch/RRScheduler.h
+++ b/simulators/c++2/src_simulator/arch/RRScheduler.h
@@ -69,11 +69,11 @@ public:
///Destructor
~RRScheduler();
TMLTime schedule(TMLTime iEndSchedule);
- TMLTransaction* getNextTransaction(TMLTime iEndSchedule) const;
+ inline TMLTransaction* getNextTransaction(TMLTime iEndSchedule) const {return _nextTransaction;}
void reset();
std::istream& readObject(std::istream &is);
std::ostream& writeObject(std::ostream &os);
- std::string toString() const;
+ inline std::string toString() const {return _name;}
//void transWasScheduled(SchedulableDevice* iDevice);
protected:
///Name of the scheduler
diff --git a/simulators/c++2/src_simulator/arch/SchedulableDevice.h b/simulators/c++2/src_simulator/arch/SchedulableDevice.h
index 180987e440ac794ddda14cab9566e10cae708bab..01436b5353a1cc5535ecff9db739dc7c2f768ed3 100644
--- a/simulators/c++2/src_simulator/arch/SchedulableDevice.h
+++ b/simulators/c++2/src_simulator/arch/SchedulableDevice.h
@@ -61,7 +61,7 @@ public:
\param iName Name of the device
\param iScheduler Pointer to the scheduler object
*/
- SchedulableDevice(ID iID, std::string iName, WorkloadSource* iScheduler):_ID(iID), _name(iName), _endSchedule(0), _scheduler(iScheduler), _nextTransaction(0), _deleteScheduler(true) {
+ SchedulableDevice(ID iID, std::string iName, WorkloadSource* iScheduler):_ID(iID), _name(iName), _endSchedule(0), _scheduler(iScheduler), _nextTransaction(0), _deleteScheduler(true), _busyCycles(0) {
_transactList.reserve(BLOCK_SIZE_TRANS);
}
///Determines the next transaction to be executed
@@ -162,6 +162,10 @@ public:
_transactList.push_back(iTrans);
}
+ TMLTime getBusyCycles(){
+ return _busyCycles;
+ }
+
protected:
///Unique ID of the device
ID _ID;
@@ -181,6 +185,9 @@ protected:
TransactionList::iterator _posTrasactListGraph;
///Flag indicating whether the scheduler has to be deleted when the device is deleted
bool _deleteScheduler;
+ ///Busy cycles since simulation start
+ TMLTime _busyCycles;
+
};
#endif
diff --git a/simulators/c++2/src_simulator/arch/SingleCoreCPU.cpp b/simulators/c++2/src_simulator/arch/SingleCoreCPU.cpp
index ec8c8530eba02dcb73b3dac654eaea212d17cb5d..34289d4e41d8385f62be7fbceede888a2ddde388 100644
--- a/simulators/c++2/src_simulator/arch/SingleCoreCPU.cpp
+++ b/simulators/c++2/src_simulator/arch/SingleCoreCPU.cpp
@@ -52,7 +52,7 @@ SingleCoreCPU::SingleCoreCPU(ID iID, std::string iName, WorkloadSource* iSchedul
, _pipelineSize(iPipelineSize), _taskSwitchingCycles(iTaskSwitchingCycles),_brachingMissrate(iBranchingMissrate)
, _changeIdleModeCycles(iChangeIdleModeCycles), _cyclesBeforeIdle(iCyclesBeforeIdle)
#endif
-, _cyclesPerExeci(iCyclesPerExeci), _busyCycles(0)
+, _cyclesPerExeci(iCyclesPerExeci) /*, _busyCycles(0)*/
#ifdef PENALTIES_ENABLED
, _timePerExeci(_cyclesPerExeci * _timePerCycle * (_pipelineSize * _brachingMissrate + 100 - _brachingMissrate) /100.0)
,_taskSwitchingTime(_taskSwitchingCycles*_timePerCycle)
@@ -69,7 +69,8 @@ SingleCoreCPU::SingleCoreCPU(ID iID, std::string iName, WorkloadSource* iSchedul
}
SingleCoreCPU::~SingleCoreCPU(){
- std::cout << _transactList.size() << " elements in List of " << _name << std::endl;
+ std::cout << _transactList.size() << " elements in List of " << _name << ", busy cycles: " << _busyCycles << std::endl;
+
//delete _scheduler;
}
@@ -304,10 +305,9 @@ void SingleCoreCPU::schedule(){
//std::cout << "CPU:schedule END " << _name << "+++++++++++++++++++++++++++++++++\n";
}
-std::string SingleCoreCPU::toString() const{
- //std::cout << "SingleCoreCPU::toString() called" << std::endl;
- return _name;
-}
+//std::string SingleCoreCPU::toString() const{
+// return _name;
+//}
std::string SingleCoreCPU::toShortString() const{
std::ostringstream outp;
@@ -396,27 +396,30 @@ void SingleCoreCPU::schedule2TXT(std::ofstream& myfile) const{
}
}
-TMLTime SingleCoreCPU::getNextSignalChange(bool iInit, std::string& oSigChange, bool& oNoMoreTrans){
- std::ostringstream outp;
- oNoMoreTrans=false;
+//TMLTime SingleCoreCPU::getNextSignalChange(bool iInit, std::string& oSigChange, bool& oNoMoreTrans){
+void SingleCoreCPU::getNextSignalChange(bool iInit, SignalChangeData* oSigData){
+ //new (oSigData) SignalChangeData(RUNNING, aCurrTrans->getStartTimeOperation(), this);
+ //std::ostringstream outp;
+ //oNoMoreTrans=false;
if (iInit){
_posTrasactListVCD=_transactList.begin();
_previousTransEndTime=0;
_vcdOutputState=END_IDLE_CPU;
- //if (_posTrasactListVCD != _transactList.end() && (*_posTrasactListVCD)->getStartTime()==0) _vcdOutputState=END_IDLE_CPU; else _vcdOutputState=END_TASK_CPU;
if (_posTrasactListVCD != _transactList.end() && (*_posTrasactListVCD)->getStartTime()!=0){
- outp << VCD_PREFIX << vcdValConvert(END_IDLE_CPU) << " cpu" << _ID;
- oSigChange=outp.str();
- return 0;
+ //outp << VCD_PREFIX << vcdValConvert(END_IDLE_CPU) << "cpu" << _ID;
+ //oSigChange=outp.str();
+ new (oSigData) SignalChangeData(END_IDLE_CPU, 0, this);
+ //return 0
+ return;
}
}
if (_posTrasactListVCD == _transactList.end()){
- outp << VCD_PREFIX << vcdValConvert(END_IDLE_CPU) << " cpu" << _ID;
- oSigChange=outp.str();
- oNoMoreTrans=true;
- return _previousTransEndTime;
+ //outp << VCD_PREFIX << vcdValConvert(END_IDLE_CPU) << "cpu" << _ID;
+ //oSigChange=outp.str();
+ //oNoMoreTrans=true;
+ //return _previousTransEndTime;
+ new (oSigData) SignalChangeData(END_IDLE_CPU, _previousTransEndTime, this);
}else{
- //std::cout << "VCD out trans: " << (*_posTrasactListVCD)->toShortString() << std::endl;
TMLTransaction* aCurrTrans=*_posTrasactListVCD;
switch (_vcdOutputState){
case END_TASK_CPU:
@@ -425,36 +428,41 @@ TMLTime SingleCoreCPU::getNextSignalChange(bool iInit, std::string& oSigChange,
_posTrasactListVCD++;
}while (_posTrasactListVCD != _transactList.end() && (*_posTrasactListVCD)->getStartTimeOperation()==_previousTransEndTime);
if (_posTrasactListVCD != _transactList.end() && (*_posTrasactListVCD)->getStartTime()==_previousTransEndTime){
- outp << VCD_PREFIX << vcdValConvert(END_PENALTY_CPU) << " cpu" << _ID;
+ //outp << VCD_PREFIX << vcdValConvert(END_PENALTY_CPU) << "cpu" << _ID;
_vcdOutputState=END_PENALTY_CPU;
+ new (oSigData) SignalChangeData(END_PENALTY_CPU, _previousTransEndTime, this);
}else{
- outp << VCD_PREFIX << vcdValConvert(END_IDLE_CPU) << " cpu" << _ID;
+ //outp << VCD_PREFIX << vcdValConvert(END_IDLE_CPU) << "cpu" << _ID;
_vcdOutputState=END_IDLE_CPU;
- if (_posTrasactListVCD == _transactList.end()) oNoMoreTrans=true;
+ //if (_posTrasactListVCD == _transactList.end()) oNoMoreTrans=true;
+ new (oSigData) SignalChangeData(END_IDLE_CPU, _previousTransEndTime, this);
}
- oSigChange=outp.str();
- return _previousTransEndTime;
+ //oSigChange=outp.str();
+ //return _previousTransEndTime;
break;
case END_PENALTY_CPU:
- outp << VCD_PREFIX << vcdValConvert(END_TASK_CPU) << " cpu" << _ID;
- oSigChange=outp.str();
+ //outp << VCD_PREFIX << vcdValConvert(END_TASK_CPU) << "cpu" << _ID;
+ //oSigChange=outp.str();
_vcdOutputState=END_TASK_CPU;
- return aCurrTrans->getStartTimeOperation();
+ //return aCurrTrans->getStartTimeOperation();
+ new (oSigData) SignalChangeData(END_TASK_CPU, aCurrTrans->getStartTimeOperation(), this);
break;
case END_IDLE_CPU:
if (aCurrTrans->getPenalties()==0){
- outp << VCD_PREFIX << vcdValConvert(END_TASK_CPU) << " cpu" << _ID;
+ //outp << VCD_PREFIX << vcdValConvert(END_TASK_CPU) << "cpu" << _ID;
_vcdOutputState=END_TASK_CPU;
+ new (oSigData) SignalChangeData(END_TASK_CPU, aCurrTrans->getStartTime(), this);
}else{
- outp << VCD_PREFIX << vcdValConvert(END_PENALTY_CPU) << " cpu" << _ID;
+ //outp << VCD_PREFIX << vcdValConvert(END_PENALTY_CPU) << "cpu" << _ID;
_vcdOutputState=END_PENALTY_CPU;
+ new (oSigData) SignalChangeData(END_PENALTY_CPU, aCurrTrans->getStartTime(), this);
}
- oSigChange=outp.str();
- return aCurrTrans->getStartTime();
+ //oSigChange=outp.str();
+ //return aCurrTrans->getStartTime();
break;
}
}
- return 0;
+ //return 0;
}
void SingleCoreCPU::reset(){
@@ -474,9 +482,9 @@ void SingleCoreCPU::streamBenchmarks(std::ostream& s) const{
s << TAG_CPUc;
}
-void SingleCoreCPU::streamStateXML(std::ostream& s) const{
- streamBenchmarks(s);
-}
+//void SingleCoreCPU::streamStateXML(std::ostream& s) const{
+// streamBenchmarks(s);
+//}
/*void SingleCoreCPU::addBusMaster(BusMaster* iMaster){
_busMasterList.push_back(iMaster);
diff --git a/simulators/c++2/src_simulator/arch/SingleCoreCPU.h b/simulators/c++2/src_simulator/arch/SingleCoreCPU.h
index 6ece8d97b8edeb3466423b9a365d53c491ca0c8e..a02058492363f7c1b32a183ccea88a8a3589c8ed 100644
--- a/simulators/c++2/src_simulator/arch/SingleCoreCPU.h
+++ b/simulators/c++2/src_simulator/arch/SingleCoreCPU.h
@@ -99,7 +99,7 @@ public:
/**
\return Detailed string representation
*/
- std::string toString() const;
+ inline std::string toString() const {return _name;}
///Returns a short string representation of the transaction
/**
\return Short string representation
@@ -110,7 +110,8 @@ public:
\param myfile Reference to the ofstream object representing the output file
*/
void schedule2HTML(std::ofstream& myfile) const;
- TMLTime getNextSignalChange(bool iInit, std::string& oSigChange, bool& oNoMoreTrans);
+ //TMLTime getNextSignalChange(bool iInit, std::string& oSigChange, bool& oNoMoreTrans);
+ void getNextSignalChange(bool iInit, SignalChangeData* oSigData);
///Writes a plain text representation of the schedule to an output file
/**
\param myfile Reference to the ofstream object representing the output file
@@ -119,7 +120,7 @@ public:
virtual void streamBenchmarks(std::ostream& s) const;
virtual void reset();
//void truncateAndRescheduleIfNecessary(TMLTime iTime);
- void streamStateXML(std::ostream& s) const;
+ inline void streamStateXML(std::ostream& s) const {streamBenchmarks(s);}
/////Adds a new bus master to the internal list
//**
//\param iMaster Pointer to bus master
@@ -167,8 +168,8 @@ protected:
#endif
///Cycles needed to execute one execi unit
unsigned int _cyclesPerExeci;
- ///Busy cycles since simulation start
- TMLTime _busyCycles;
+ /////Busy cycles since simulation start
+ //TMLTime _busyCycles;
//values deduced from CPU parameters
///Time needed to execute one execi unit
diff --git a/simulators/c++2/src_simulator/arch/TraceableDevice.h b/simulators/c++2/src_simulator/arch/TraceableDevice.h
index d8d383c061041d4e2567ffb704419d975caa551f..879fcaa0d136f9842b0589ec2f1307bb00fe9d1e 100644
--- a/simulators/c++2/src_simulator/arch/TraceableDevice.h
+++ b/simulators/c++2/src_simulator/arch/TraceableDevice.h
@@ -64,7 +64,8 @@ public:
\param oNoMoreTrans Is true if the last transaction of the schedule has been retrieved
\return Point in time when the signal changes
*/
- virtual TMLTime getNextSignalChange(bool iInit, std::string& oSigChange, bool& oNoMoreTrans)=0;
+ //virtual TMLTime getNextSignalChange(bool iInit, std::string& oSigChange, bool& oNoMoreTrans)=0;
+ virtual void getNextSignalChange(bool iInit, SignalChangeData* oSigData)=0;
///Writes benchmarking data to a given stream
/**
\param s Reference to an output stream
diff --git a/simulators/c++2/src_simulator/definitions.cpp b/simulators/c++2/src_simulator/definitions.cpp
index 364c7a14e35716500b2cfdd3c6010c4a5836beca..22a52395b6cd4c6cc83ebe9088c1ac62d3e740be 100644
--- a/simulators/c++2/src_simulator/definitions.cpp
+++ b/simulators/c++2/src_simulator/definitions.cpp
@@ -77,15 +77,13 @@ long getTimeDiff(struct timeval& begin, struct timeval& end){
}
-bool greaterRunnableTime::operator()(TMLTransaction const* p1, TMLTransaction const* p2){
- //std::cout << "greaterRunnableTime\n";
+/*bool greaterRunnableTime::operator()(TMLTransaction const* p1, TMLTransaction const* p2){
return p1->getRunnableTime() > p2->getRunnableTime();
}
bool greaterPrio::operator()(TMLTransaction const* p1, TMLTransaction const* p2){
- //std::cout << "greaterPrio\n";
return p1->getCommand()->getTask()->getPriority() > p2->getCommand()->getTask()->getPriority();
-}
+}*/
bool greaterStartTime::operator()(TMLTransaction const* p1, TMLTransaction const* p2){
return p1->getStartTime() > p2->getStartTime();
@@ -98,7 +96,11 @@ void replaceAll(std::string& ioHTML, std::string iSearch, std::string iReplace){
}
}
-std::string vcdValConvert(unsigned int iVal){
+//std::string vcdValConvert(unsigned int iVal){
+// if(iVal==1 || iVal==2) return "1"; else return "0";
+//}
+
+std::string vcdTimeConvert(TMLTime iVal){
std::string iResult;
do{
if (iVal & 1) iResult="1" + iResult; else iResult="0" + iResult;
diff --git a/simulators/c++2/src_simulator/definitions.h b/simulators/c++2/src_simulator/definitions.h
index 8ff60d56b19864be43b806e52e65c6698796db54..92ab23a57a39a5dd16de217f3e8f2f74e89fbb76 100644
--- a/simulators/c++2/src_simulator/definitions.h
+++ b/simulators/c++2/src_simulator/definitions.h
@@ -65,6 +65,9 @@ Ludovic Apvrille, Renaud Pacalet
#include <pthread.h>
#include <dlfcn.h>
#include <stdlib.h>
+#include <sys/times.h>
+#include <sys/time.h>
+#include <sys/resource.h>
#define WRITE_STREAM(s,v) s.write((char*) &v,sizeof(v));
//std::cout << sizeof(v) << " bytes written" << std::endl;
@@ -81,14 +84,15 @@ using std::max;
#define BUS_ENABLED
#define WAIT_SEND_VLEN 1
-#define PENALTIES_ENABLED
-#undef STATE_HASH_ENABLED
-#undef LISTENERS_ENABLED
+#undef PENALTIES_ENABLED
+#define STATE_HASH_ENABLED
+#define LISTENERS_ENABLED
+#define EXPLO_ENABLED
#undef EBRDD_ENABLED
-//#define DOT_GRAPH_ENABLED
+#define EXPLOGRAPH_ENABLED
#define CLOCK_INC 20
-#define BLOCK_SIZE_TRANS 500000
+#define BLOCK_SIZE_TRANS 8000000
#define BLOCK_SIZE_PARAM 100
#define BLOCK_SIZE_COMMENT 100
#define PARAMETER_BLOCK_SIZE 1000
@@ -97,7 +101,6 @@ using std::max;
#define SAVE_BENCHMARK_VARS
#define PORT "3490"
#define BACKLOG 10
-#define VCD_PREFIX "b"
//Task VCD output
#define UNKNOWN 4
@@ -372,10 +375,16 @@ public:
\param iTime Time when the change occurred
\param iDevice Pointer to the device the signal belongs to
*/
- SignalChangeData( std::string& iSigChange, TMLTime iTime, TraceableDevice* iDevice):_sigChange(iSigChange),_time(iTime),_device(iDevice){
+ //SignalChangeData( std::string& iSigChange, TMLTime iTime, TraceableDevice* iDevice):_sigChange(iSigChange),_time(iTime),_device(iDevice){
+ //}
+ SignalChangeData(unsigned int iSigChange, TMLTime iTime, TraceableDevice* iDevice):_sigChange(iSigChange),_time(iTime),_device(iDevice){
+ //std::cout << _sigChange << " " << _time << " " << _device << " " << " constructor***\n";
+ }
+ SignalChangeData():_sigChange(0),_time(0),_device(0){
}
///String representation of the signal change in VCD format
- std::string _sigChange;
+ //std::string _sigChange;
+ unsigned int _sigChange;
///Time when the change occurred
TMLTime _time;
///Pointer to the device the signal belongs to
@@ -383,14 +392,14 @@ public:
};
///Function object for the comparison of the runnable time of two transaction
-struct greaterRunnableTime{
+/*struct greaterRunnableTime{
bool operator()(TMLTransaction const* p1, TMLTransaction const* p2);
};
///Function object for the comparison of the priority of two transaction
struct greaterPrio{
bool operator()(TMLTransaction const* p1, TMLTransaction const* p2);
-};
+};*/
///Function object for the comparison of the start time of two transaction
struct greaterStartTime{
@@ -400,7 +409,7 @@ struct greaterStartTime{
namespace std{
///Specialization of std::greater for SignalChangeData pointers
template<> struct greater<SignalChangeData*>{
- bool operator()(SignalChangeData const* p1, SignalChangeData const* p2){
+ inline bool operator()(SignalChangeData const* p1, SignalChangeData const* p2){
return p1->_time > p2->_time;
}
};
@@ -408,10 +417,10 @@ namespace std{
///Priority queue for SignalChangeData objects, keeps track of the temporal ordering of signal changes (for VCD output)
typedef std::priority_queue<SignalChangeData*, std::vector<SignalChangeData*>, std::greater<SignalChangeData*> > SignalChangeQueue;
-///Priority queue for not yet processed transactions, runnableTime being less than the end of the last scheduled transaction of the device
-typedef std::priority_queue<TMLTransaction*, std::vector<TMLTransaction*>, greaterPrio > PastTransactionQueue;
-///Priority queue for not yet processed transactions, runnableTime being greater than the end of the last scheduled transaction of the device
-typedef std::priority_queue<TMLTransaction*, std::vector<TMLTransaction*>, greaterRunnableTime > FutureTransactionQueue;
+////Priority queue for not yet processed transactions, runnableTime being less than the end of the last scheduled transaction of the device
+//typedef std::priority_queue<TMLTransaction*, std::vector<TMLTransaction*>, greaterPrio > PastTransactionQueue;
+////Priority queue for not yet processed transactions, runnableTime being greater than the end of the last scheduled transaction of the device
+//typedef std::priority_queue<TMLTransaction*, std::vector<TMLTransaction*>, greaterRunnableTime > FutureTransactionQueue;
///Priority queue holding Transactions for the graph output
typedef std::priority_queue<TMLTransaction*, std::vector<TMLTransaction*>, greaterStartTime > GraphTransactionQueue;
//typedef std::map<SchedulableCommDevice*, FutureTransactionQueue*> BridgeTransactionListHash;
@@ -439,7 +448,8 @@ long getTimeDiff(struct timeval& begin, struct timeval& end);
\param iReplace String which is filled in
*/
void replaceAll(std::string& ioHTML, std::string iSearch, std::string iReplace);
-std::string vcdValConvert(unsigned int iVal);
+inline std::string vcdValConvert(unsigned int iVal) {if(iVal==1 || iVal==2) return "1"; else return "0";}
+std::string vcdTimeConvert(TMLTime iVal);
int getexename(char* buf, size_t size);
unsigned int getEnabledBranchNo(int iNo, int iMask);
#endif
diff --git a/simulators/c++2/src_simulator/evt/GeneralListener.h b/simulators/c++2/src_simulator/evt/GeneralListener.h
index 3a19278de32e49d86480a731bf6bf9d6c9087e65..ef5eaa726d3a989559dbcccaa3f00720f41405ee 100644
--- a/simulators/c++2/src_simulator/evt/GeneralListener.h
+++ b/simulators/c++2/src_simulator/evt/GeneralListener.h
@@ -41,30 +41,25 @@ Ludovic Apvrille, Renaud Pacalet
#ifndef GeneralListenerH
#define GeneralListenerH
-#define NOTIFY_SIM_STARTED() {this->listenersLock(); for(std::list<GeneralListener*>::iterator i=this->_listeners.begin(); i != this->_listeners.end(); ++i) (*i)->simulationStarted(); this->listenersUnLock();}
-#define NOTIFY_SIM_STOPPED() {this->listenersLock(); for(std::list<GeneralListener*>::iterator i=this->_listeners.begin(); i != this->_listeners.end(); ++i) (*i)->simulationStopped(); this->listenersUnLock();}
-#define NOTIFY_TIME_ADVANCES(iTime) {this->listenersLock(); for(std::list<GeneralListener*>::iterator i=this->_listeners.begin(); i != this->_listeners.end(); ++i) (*i)->timeAdvances(iTime); this->listenersUnLock();}
-#define NOTIFY_TASK_TRANS_EXECUTED(iTrans) {this->listenersLock(); for(std::list<GeneralListener*>::iterator i=this->_listeners.begin(); i != this->_listeners.end(); ++i) (*i)->transExecuted(iTrans,this->_ID); this->listenersUnLock();}
-#define NOTIFY_TASK_FINISHED(iTrans) {this->listenersLock(); for(std::list<GeneralListener*>::iterator i=this->_listeners.begin(); i != this->_listeners.end(); ++i) (*i)->taskFinished(iTrans,this->_ID); this->listenersUnLock();}
-#define NOTIFY_TASK_STARTED(iTrans) {this->listenersLock(); for(std::list<GeneralListener*>::iterator i=this->_listeners.begin(); i != this->_listeners.end(); ++i) (*i)->taskStarted(iTrans,this->_ID); this->listenersUnLock();}
-#define NOTIFY_TRANS_EXECUTED(iTrans) {this->listenersLock(); for(std::list<GeneralListener*>::iterator i=this->_listeners.begin(); i != this->_listeners.end(); ++i) (*i)->transExecuted(iTrans,this->_ID); this->listenersUnLock();}
-#define NOTIFY_CMD_ENTERED(iComm) {this->listenersLock(); for(std::list<GeneralListener*>::iterator i=this->_listeners.begin(); i != this->_listeners.end(); ++i) (*i)->commandEntered(iComm,this->_ID); this->listenersUnLock();}
+#define NOTIFY_SIM_STARTED() {if (!this->_listeners.empty()){this->listenersLock(); for(std::list<GeneralListener*>::const_iterator i=this->_listeners.begin(); i != this->_listeners.end(); ++i) (*i)->simulationStarted(); this->listenersUnLock();}}
+#define NOTIFY_SIM_STOPPED() {if (!this->_listeners.empty()){this->listenersLock(); for(std::list<GeneralListener*>::const_iterator i=this->_listeners.begin(); i != this->_listeners.end(); ++i) (*i)->simulationStopped(); this->listenersUnLock();}}
+#define NOTIFY_TIME_ADVANCES(iTime) {if (!this->_listeners.empty()){this->listenersLock(); for(std::list<GeneralListener*>::const_iterator i=this->_listeners.begin(); i != this->_listeners.end(); ++i) (*i)->timeAdvances(iTime); this->listenersUnLock();}}
+#define NOTIFY_TASK_TRANS_EXECUTED(iTrans) {if (!this->_listeners.empty()){this->listenersLock(); for(std::list<GeneralListener*>::const_iterator i=this->_listeners.begin(); i != this->_listeners.end(); ++i) (*i)->transExecuted(iTrans,this->_ID); this->listenersUnLock();}}
+#define NOTIFY_TASK_FINISHED(iTrans) {if (!this->_listeners.empty()){this->listenersLock(); for(std::list<GeneralListener*>::const_iterator i=this->_listeners.begin(); i != this->_listeners.end(); ++i) (*i)->taskFinished(iTrans,this->_ID); this->listenersUnLock();}}
+#define NOTIFY_TASK_STARTED(iTrans) {if (!this->_listeners.empty()){this->listenersLock(); for(std::list<GeneralListener*>::const_iterator i=this->_listeners.begin(); i != this->_listeners.end(); ++i) (*i)->taskStarted(iTrans,this->_ID); this->listenersUnLock();}}
+#define NOTIFY_TRANS_EXECUTED(iTrans) {if (!this->_listeners.empty()){this->listenersLock(); for(std::list<GeneralListener*>::const_iterator i=this->_listeners.begin(); i != this->_listeners.end(); ++i) (*i)->transExecuted(iTrans,this->_ID); this->listenersUnLock();}}
+#define NOTIFY_CMD_ENTERED(iComm) {if (!this->_listeners.empty()){this->listenersLock(); for(std::list<GeneralListener*>::const_iterator i=this->_listeners.begin(); i != this->_listeners.end(); ++i) (*i)->commandEntered(iComm,this->_ID); this->listenersUnLock();}}
-//#define NOTIFY_CMD_EXECUTED(iComm) {this->listenersLock();for(std::list<GeneralListener*>::iterator i=this->_listeners.begin(); i != this->_listeners.end(); ++i) (*i)->commandExecuted(iComm,this->_ID); this->listenersUnLock();}
-#define NOTIFY_CMD_EXECUTED(iTrans) {this->listenersLock();for(std::list<GeneralListener*>::iterator i=this->_listeners.begin(); i != this->_listeners.end(); ++i) (*i)->transExecuted(iTrans,this->_ID); this->listenersUnLock();}
-#define NOTIFY_CMD_FINISHED(iComm) {this->listenersLock();for(std::list<GeneralListener*>::iterator i=this->_listeners.begin(); i != this->_listeners.end(); ++i) (*i)->commandFinished(iComm,this->_ID); this->listenersUnLock();}
-//#define NOTIFY_CMD_FINISHED(iTrans) {this->listenersLock();for(std::list<GeneralListener*>::iterator i=this->_listeners.begin(); i != this->_listeners.end(); ++i) (*i)->commandFinished(iTrans,this->_ID); this->listenersUnLock();}
+#define NOTIFY_CMD_EXECUTED(iTrans) {if (!this->_listeners.empty()){this->listenersLock();for(std::list<GeneralListener*>::const_iterator i=this->_listeners.begin(); i != this->_listeners.end(); ++i) (*i)->transExecuted(iTrans,this->_ID); this->listenersUnLock();}}
-#define NOTIFY_CMD_STARTED(iComm) {this->listenersLock(); for(std::list<GeneralListener*>::iterator i=this->_listeners.begin(); i != this->_listeners.end(); ++i) (*i)->commandStarted(iComm,this->_ID); this->listenersUnLock();}
-//#define NOTIFY_CMD_STARTED(iTrans) {this->listenersLock(); for(std::list<GeneralListener*>::iterator i=this->_listeners.begin(); i != this->_listeners.end(); ++i) (*i)->commandStarted(iTrans,this->_ID); this->listenersUnLock();}
+#define NOTIFY_CMD_FINISHED(iComm) {if (!this->_listeners.empty()){this->listenersLock();for(std::list<GeneralListener*>::const_iterator i=this->_listeners.begin(); i != this->_listeners.end(); ++i) (*i)->commandFinished(iComm,this->_ID); this->listenersUnLock();}}
-//#define NOTIFY_WRITE_TRANS_EXECUTED(iTrans) {this->listenersLock(); for(std::list<GeneralListener*>::iterator i=this->_listeners.begin(); i != this->_listeners.end(); ++i) {(*i)->transExecuted(iTrans,this->_ID);(*i)->writeTrans(iTrans,this->_ID);} this->listenersUnLock();}
-//#define NOTIFY_READ_TRANS_EXECUTED(iTrans) {this->listenersLock(); for(std::list<GeneralListener*>::iterator i=this->_listeners.begin(); i != this->_listeners.end(); ++i) {(*i)->transExecuted(iTrans,this->_ID);(*i)->readTrans(iTrans,this->_ID);} this->listenersUnLock();}
+#define NOTIFY_CMD_STARTED(iComm) {if (!this->_listeners.empty()){this->listenersLock(); for(std::list<GeneralListener*>::const_iterator i=this->_listeners.begin(); i != this->_listeners.end(); ++i) (*i)->commandStarted(iComm,this->_ID); this->listenersUnLock();}}
-#define NOTIFY_WRITE_TRANS_EXECUTED(iTrans) {this->listenersLock(); for(std::list<GeneralListener*>::iterator i=this->_listeners.begin(); i != this->_listeners.end(); ++i) {(*i)->transExecuted(iTrans,this->_ID);} this->listenersUnLock();}
-#define NOTIFY_READ_TRANS_EXECUTED(iTrans) {this->listenersLock(); for(std::list<GeneralListener*>::iterator i=this->_listeners.begin(); i != this->_listeners.end(); ++i) {(*i)->transExecuted(iTrans,this->_ID);} this->listenersUnLock();}
-#define NOTIFY_EVALUATE() {this->listenersLock(); for(std::list<GeneralListener*>::iterator i=this->_listeners.begin(); i != this->_listeners.end(); ++i) {(*i)->evaluate();} this->listenersUnLock();}
+#define NOTIFY_WRITE_TRANS_EXECUTED(iTrans) {if (!this->_listeners.empty()){this->listenersLock(); for(std::list<GeneralListener*>::const_iterator i=this->_listeners.begin(); i != this->_listeners.end(); ++i) {(*i)->transExecuted(iTrans,this->_ID);} this->listenersUnLock();}}
+#define NOTIFY_READ_TRANS_EXECUTED(iTrans) {if (!this->_listeners.empty()){this->listenersLock(); for(std::list<GeneralListener*>::const_iterator i=this->_listeners.begin(); i != this->_listeners.end(); ++i) {(*i)->transExecuted(iTrans,this->_ID);} this->listenersUnLock();}}
+#define NOTIFY_EVALUATE() {if (!this->_listeners.empty()){this->listenersLock(); for(std::list<GeneralListener*>::const_iterator i=this->_listeners.begin(); i != this->_listeners.end(); ++i) {(*i)->evaluate();} this->listenersUnLock();}}
///Encapsulates events associated with transactions
class GeneralListener{
diff --git a/simulators/c++2/src_simulator/evt/ListenersSimCmd.cpp b/simulators/c++2/src_simulator/evt/ListenersSimCmd.cpp
index f210ca8be713648da67601b6c91d65d498d1c5ff..38617e99b8f09fc3c0548bd2ee2dfbd5d6be88cc 100644
--- a/simulators/c++2/src_simulator/evt/ListenersSimCmd.cpp
+++ b/simulators/c++2/src_simulator/evt/ListenersSimCmd.cpp
@@ -58,12 +58,12 @@ bool CondBreakpoint::_enabled=true;
//************************************************************************
RunXTransactions::RunXTransactions(SimComponents* iSimComp, unsigned int iTransToExecute):_simComp(iSimComp), _count(0), _transToExecute(iTransToExecute){
- for(CPUList::const_iterator i=_simComp->getCPUIterator(false); i != _simComp->getCPUIterator(true); ++i)
+ for(CPUList::const_iterator i=_simComp->getCPUList().begin(); i != _simComp->getCPUList().end(); ++i)
(*i)->registerListener(this);
}
RunXTransactions::~RunXTransactions(){
- for(CPUList::const_iterator i=_simComp->getCPUIterator(false); i != _simComp->getCPUIterator(true); ++i)
+ for(CPUList::const_iterator i=_simComp->getCPUList().begin(); i != _simComp->getCPUList().end(); ++i)
(*i)->removeListener(this);
}
@@ -115,7 +115,8 @@ CondBreakpoint::CondBreakpoint(SimComponents* iSimComp, std::string iCond, TMLTa
_cSourceFileCreated=true;
std::ostringstream aCmd;
myfile << "#include <" << iTask->toString() << ".h>\n";
- for(VariableLookUpTableName::const_iterator i=iTask->getVariableIteratorName(false); i !=iTask->getVariableIteratorName(true); ++i){
+ //for(VariableLookUpTableName::const_iterator i=iTask->getVariableIteratorName(false); i !=iTask->getVariableIteratorName(true); ++i){
+ for(VariableLookUpTableName::const_iterator i=iTask->getVariableLookUpTableName().begin(); i !=iTask->getVariableLookUpTableName().end(); ++i){
myfile << "#define " << *(i->first) << " _castTask_->" << *(i->first) << "\n";
}
myfile << "class TMLTask;\n\n";
@@ -249,12 +250,12 @@ void RunXCommands::setCmdsToExecute(unsigned int iCommandsToExecute){
//************************************************************************
RunXTimeUnits::RunXTimeUnits(SimComponents* iSimComp, TMLTime iEndTime):_simComp(iSimComp), _endTime(iEndTime){
- for(CPUList::const_iterator i=_simComp->getCPUIterator(false); i != _simComp->getCPUIterator(true); ++i)
+ for(CPUList::const_iterator i=_simComp->getCPUList().begin(); i != _simComp->getCPUList().end(); ++i)
(*i)->registerListener(this);
}
RunXTimeUnits::~RunXTimeUnits(){
- for(CPUList::const_iterator i=_simComp->getCPUIterator(false); i != _simComp->getCPUIterator(true); ++i)
+ for(CPUList::const_iterator i=_simComp->getCPUList().begin(); i != _simComp->getCPUList().end(); ++i)
(*i)->removeListener(this);
}
diff --git a/simulators/c++2/src_simulator/sim/SimComponents.cpp b/simulators/c++2/src_simulator/sim/SimComponents.cpp
index 78513d7524b3740ce42c59afe5d97733f5e3134a..e42207d2c839025f71c646030f55f85ab9299c16 100644
--- a/simulators/c++2/src_simulator/sim/SimComponents.cpp
+++ b/simulators/c++2/src_simulator/sim/SimComponents.cpp
@@ -51,6 +51,7 @@ Ludovic Apvrille, Renaud Pacalet
#include <Bridge.h>
#include <IndeterminismSource.h>
#include <ListenersSimCmd.h>
+#include <Simulator.h>
#ifdef EBRDD_ENABLED
#include <EBRDD.h>
#endif
@@ -356,11 +357,11 @@ ListenerSubject <GeneralListener>* SimComponents::getListenerByID(ID iID){
return getChannelByID(iID);
}
-int SimComponents::getHashValue(){
- return _hashValue;
-}
+//int SimComponents::getHashValue(){
+// return _hashValue;
+//}
-TaskList::const_iterator SimComponents::getTaskIterator(bool iEnd) const{
+/*TaskList::const_iterator SimComponents::getTaskIterator(bool iEnd) const{
return (iEnd)? _taskList.end():_taskList.begin();
}
@@ -380,7 +381,7 @@ EBRDDList::const_iterator SimComponents::getEBRDDIterator(bool iEnd) const{
CPUList::const_iterator SimComponents::getCPUIterator(bool iEnd) const{
return (iEnd)? _cpuList.end():_cpuList.begin();
-}
+}*/
/*void SimComponents::setBreakpointOnChoiceCmds(){
TMLChoiceCommand* aResult;
@@ -448,16 +449,29 @@ ID SimComponents::checkForRecurringSystemState(){
return aRetVal;
}
-ID SimComponents::wasKnownStateReached() const{
- return _knownStateReached;
-}
+//ID SimComponents::wasKnownStateReached() const{
+// return _knownStateReached;
+//}
-bool SimComponents::getOnKnownPath(){
- _knownStateReached=0;
- return _onKnownPath;
-}
+//bool SimComponents::getOnKnownPath(){
+// _knownStateReached=0;
+// return _onKnownPath;
+//}
void SimComponents::showTaskStates(){
+ static int iCount=0;
+ static ParamType *aDatalen, *aStandard;
+ static SchedulableDevice *aFEP, *aDeint, *aChDec;
+ if (iCount==0){
+ bool oIsID;
+ aDatalen = getTaskByName("PacketManagerDesign__PacketGenerator")->getVariableByName("datalen", oIsID);
+ aStandard = getTaskByName("PacketManagerDesign__PacketGenerator")->getVariableByName("standard", oIsID);
+ aFEP = getCPUByName("FEP_0");
+ aDeint = getCPUByName("Deinterleaver_0");
+ aChDec = getCPUByName("ChannelDecoder_0");
+ }
+
+ /*std::cout<< "***** NEW entry " << iCount++ << " Sim Time " << SchedulableDevice::getSimulatedTime() << " *****\n";
for(TaskList::const_iterator i=_taskList.begin(); i != _taskList.end(); ++i){
std::cout << "State of " << (*i)->toString() << ": " ;
if ((*i)->getCurrCommand()==0 || (*i)->getCurrCommand()->getCurrTransaction()==0){
@@ -474,7 +488,10 @@ void SimComponents::showTaskStates(){
if (nextBusTrans!=0){
std::cout << "Bus " << (*i)->toString() << " has next trans: " << nextBusTrans->toString() << "\n";
}
- }
+ }*/
+ std::cout << *aDatalen << "," << *aStandard << "," << SchedulableDevice::getSimulatedTime() << "," <<
+ aFEP->getBusyCycles() << "," << aDeint->getBusyCycles() << "," << aChDec->getBusyCycles() << "\n";
+
}
bool SimComponents::couldCPUBeIdle(CPU* iCPU){
diff --git a/simulators/c++2/src_simulator/sim/SimComponents.h b/simulators/c++2/src_simulator/sim/SimComponents.h
index 44691f6a6378849bb8c615f74f8620dbf5914e2e..6f15ff983d8795e9532657c4063aca67c5e13cb8 100644
--- a/simulators/c++2/src_simulator/sim/SimComponents.h
+++ b/simulators/c++2/src_simulator/sim/SimComponents.h
@@ -196,24 +196,27 @@ public:
\param iEnd true for iterator pointing to the end of the list, false for iterator pointing to the first element
\return Const iterator for CPU list
*/
- CPUList::const_iterator getCPUIterator(bool iEnd) const;
+ //CPUList::const_iterator getCPUIterator(bool iEnd) const;
+ inline const CPUList& getCPUList() const{return _cpuList;}
///Returns an iterator for the internal bus list
/**
\param iEnd true for iterator pointing to the end of the list, false for iterator pointing to the first element
\return Const iterator for bus list
*/
- BusList::const_iterator getBusIterator(bool iEnd) const;
+ //BusList::const_iterator getBusIterator(bool iEnd) const;
+ inline const BusList& getBusList() const{return _busList;}
///Returns an iterator for the internal VCD list
/**
\param iEnd true for iterator pointing to the end of the list, false for iterator pointing to the first element
\return Const iterator for VCD list
*/
- TraceableDeviceList::const_iterator getVCDIterator(bool iEnd) const;
+ //TraceableDeviceList::const_iterator getVCDIterator(bool iEnd) const;
+ inline const TraceableDeviceList& getVCDList() const{return _vcdList;}
///Returns the state of the stop flag
/**
\return Stop flag
*/
- bool getStopFlag() const {return _stopFlag;}
+ inline bool getStopFlag() const {return _stopFlag;}
///Sets the value of the stop flag
/**
\param iStopFlag Stop flag
@@ -224,49 +227,50 @@ public:
/**
\return Flag indicating if the simulation stopped on an Action command
*/
- bool getStoppedOnAction(){return _stoppedOnAction;}
+ inline bool getStoppedOnAction(){return _stoppedOnAction;}
///Sets the flag indicating that the simulation stopped on an Action command
- void setStoppedOnAction(){_stoppedOnAction=true; /*std::cout << "_stoppedOnAction=true\n";*/}
+ inline void setStoppedOnAction(){_stoppedOnAction=true; /*std::cout << "_stoppedOnAction=true\n";*/}
///If a task has a choice command as current command, a pointer to it is returned
/**
\return Pointer if choice command was found, null otherwise
*/
- //TMLChoiceCommand* getCurrentChoiceCmd();
IndeterminismSource* getCurrentRandomCmd();
///Returns a hash value for the current application and architecture
/**
\return Hash value
*/
- int getHashValue();
+ inline int getHashValue() {return _hashValue;}
///Returns an iterator for the internal task list
/**
\param iEnd true for iterator pointing to the end of the list, false for iterator pointing to the first element
\return Const iterator for task list
*/
- TaskList::const_iterator getTaskIterator(bool iEnd) const;
+ //TaskList::const_iterator getTaskIterator(bool iEnd) const;
+ inline const TaskList& getTaskList() const{return _taskList;}
#ifdef EBRDD_ENABLED
///Returns an iterator for the internal EBRDD list
/**
\param iEnd true for iterator pointing to the end of the list, false for iterator pointing to the first element
\return Const iterator for EBRDD list
*/
- EBRDDList::const_iterator getEBRDDIterator(bool iEnd) const;
+ //EBRDDList::const_iterator getEBRDDIterator(bool iEnd) const;
+ inline const EBRDDList& getEBRDDList() const{return _ebrddList;}
#endif
///Returns the reason why the simulation stopped
/**
\return Reason why the simulation stopped
*/
- std::string getStopReason(){return _stopReason;}
+ inline std::string getStopReason(){return _stopReason;}
///Returns a pointer to the simulator
/**
\return Pointer to simulator
*/
- Simulator* getSimulator(){return _simulator;}
+ inline Simulator* getSimulator(){return _simulator;}
///Sets a reference to the simulator
/**
\param iSim Pointer to simulator
*/
- void setSimulator(Simulator* iSim){_simulator=iSim;}
+ inline void setSimulator(Simulator* iSim){_simulator=iSim;}
///Returns the name of the component with the indicated ID
/**
\param iID Component ID
@@ -280,10 +284,14 @@ public:
\return Flag indicating whether a known state has been encountered
*/
//ID wasKnownStateReached(HashValueType* oSystemHash) const;
- ID wasKnownStateReached() const;
+ inline ID wasKnownStateReached() const {return _knownStateReached;}
+ //inline ID wasKnownStateReached() const {return false;}
///Resets the global system hash
void resetStateHash();
- bool getOnKnownPath();
+ inline bool getOnKnownPath(){
+ _knownStateReached=0;
+ return _onKnownPath;
+ }
//ListenerSubject <TransactionListener>* getListenerByID(ID iID);
ListenerSubject<GeneralListener>* getListenerByID(ID iID);
virtual void generateTEPEs()=0;
diff --git a/simulators/c++2/src_simulator/sim/Simulator.cpp b/simulators/c++2/src_simulator/sim/Simulator.cpp
index 63d5706046c1667a1fc50f1f9a03913351e39a83..e7fb0ec8c469b36f881bfca2fecc6b7fd8ffb48e 100644
--- a/simulators/c++2/src_simulator/sim/Simulator.cpp
+++ b/simulators/c++2/src_simulator/sim/Simulator.cpp
@@ -59,7 +59,7 @@ Ludovic Apvrille, Renaud Pacalet
#endif
-Simulator::Simulator(SimServSyncInfo* iSyncInfo):_syncInfo(iSyncInfo), _simComp(_syncInfo->_simComponents), _busy(false), _simTerm(false), _randChoiceBreak(_syncInfo->_simComponents), _wasReset(true){
+Simulator::Simulator(SimServSyncInfo* iSyncInfo):_syncInfo(iSyncInfo), _simComp(_syncInfo->_simComponents), _busy(false), _simTerm(false), _randChoiceBreak(_syncInfo->_simComponents), _wasReset(true), _longRunTime(0), _shortRunTime(-1), _replyToServer(true){
}
Simulator::~Simulator(){
@@ -67,11 +67,6 @@ Simulator::~Simulator(){
//if (_randChoiceBreak!=0) delete _randChoiceBreak;
}
-//void Simulator::init(){
-// _simComp = _syncInfo->_simComponents;
-// _randChoiceBreak = new RunTillNextRandomChoice(_syncInfo->_simComponents);
-//}
-
TMLTransaction* Simulator::getTransLowestEndTime(SchedulableDevice*& oResultDevice) const{
//int tmp=0;
TMLTransaction *aMarker=0, *aTempTrans;
@@ -82,7 +77,8 @@ TMLTransaction* Simulator::getTransLowestEndTime(SchedulableDevice*& oResultDevi
std::cout << "kernel:getTLET: before loop" << std::endl;
#endif
//for(SchedulingList::const_iterator i=_simComp->_cpuList.begin(); i != _simComp->_cpuList.end(); ++i){
- for(CPUList::const_iterator i=_simComp->getCPUIterator(false); i != _simComp->getCPUIterator(true); ++i){
+ //for(CPUList::const_iterator i=_simComp->getCPUIterator(false); i != _simComp->getCPUIterator(true); ++i){
+ for(CPUList::const_iterator i=_simComp->getCPUList().begin(); i != _simComp->getCPUList().end(); ++i){
aTempDevice=*i;
aTempTrans=aTempDevice->getNextTransaction();
if (aTempTrans!=0 && aTempTrans->getVirtualLength()>0){
@@ -110,66 +106,21 @@ TMLTransaction* Simulator::getTransLowestEndTime(SchedulableDevice*& oResultDevi
return aMarker;
}
-/*void Simulator::schedule2Graph(std::string& iTraceFileName) const{
- struct timeval aBegin,aEnd;
- gettimeofday(&aBegin,NULL);
- std::ofstream myfile (iTraceFileName.c_str());
- if (myfile.is_open()){
- CPUList::iterator i;
- GraphTransactionQueue aQueue;
- TMLTransaction* aTrans, *aTopElement;
- unsigned int aTransitionNo=0;
- for(CPUList::const_iterator i=_simComp->getCPUIterator(false); i != _simComp->getCPUIterator(true); ++i){
- aTrans = (*i)->getTransactions1By1(true);
- if (aTrans!=0) aQueue.push(aTrans);
- }
- std::ostringstream aOutp;
- while (!aQueue.empty()){
- //std::ostringstream aTempStr;
- CPU* aCPU;
- aTopElement = aQueue.top();
- aCPU = aTopElement->getCommand()->getTask()->getCPU();
- for (TMLLength a=0; a < aTopElement->getVirtualLength(); a++){
- aOutp << "(" << aTransitionNo << ",\"i(" << aCPU->toString() << "__" << aTopElement->getCommand()->getTask()->toString() << "__" << aTopElement->getCommand()->getCommandStr();
- if (aTopElement->getChannel()!=0){
- aOutp << "__" << aTopElement->getChannel()->toShortString();
- //if (dynamic_cast<TMLEventChannel*>(aTopElement->getChannel())==0) aOutp << "<" << aTopElement->getVirtualLength() << ", " << ">";
- }
- aOutp << ")\"," << ++aTransitionNo << ")\n";
-
- //aOutp << aTempStr.str() << ++aTransitionNo << ")\n";
- }
- //myfile << aTempStr.str();
- aQueue.pop();
- aTrans = aCPU->getTransactions1By1(false);
- if (aTrans!=0) aQueue.push(aTrans);
- }
- myfile << "des (0, " << aTransitionNo+1 << ", " << aTransitionNo+2 << ")\n";
- myfile << aOutp.str() << "(" << aTransitionNo << ",\"i(exit)\", " << aTransitionNo+1 << ")\n";
- myfile.close();
- }
- else
- std::cout << "Unable to open Graph output file" << std::endl;
- gettimeofday(&aEnd,NULL);
- std::cout << "The Graph output took " << getTimeDiff(aBegin,aEnd) << "usec. File: " << iTraceFileName << std::endl;
-}*/
-
ID Simulator::schedule2GraphDOT(std::ostream& iDOTFile, std::ostream& iAUTFile, ID iStartState, unsigned int& oTransCounter) const{
CPUList::iterator i;
+ //std::cout << "entry graph output\n";
GraphTransactionQueue aQueue;
TMLTransaction* aTrans, *aTopElement;
ID aStartState=iStartState, aEndState=0;
- for(CPUList::const_iterator i=_simComp->getCPUIterator(false); i != _simComp->getCPUIterator(true); ++i){
+ for(CPUList::const_iterator i=_simComp->getCPUList().begin(); i != _simComp->getCPUList().end(); ++i){
aTrans = (*i)->getTransactions1By1(true);
if (aTrans!=0) aQueue.push(aTrans);
}
//std::ostringstream aOutp;
while (!aQueue.empty()){
- //std::ostringstream aTempStr;
CPU* aCPU;
aTopElement = aQueue.top();
aCPU = aTopElement->getCommand()->getTask()->getCPU();
- //for (TMLLength a=0; a < aTopElement->getVirtualLength(); a++){
aEndState = aTopElement->getStateID();
if (aEndState==0){
aEndState=TMLTransaction::getID();
@@ -177,28 +128,23 @@ ID Simulator::schedule2GraphDOT(std::ostream& iDOTFile, std::ostream& iAUTFile,
}
//13 -> 17 [label = "i(CPU0__test1__TMLTask_1__wro__test1__ch<4 ,4>)"];
oTransCounter++;
-//#ifdef DOT_GRAPH_ENABLED
iDOTFile << aStartState << " -> " << aEndState << " [label = \"i(" << aCPU->toString() << "__" << aTopElement->getCommand()->getTask()->toString() << "__" << aTopElement->getCommand()->getCommandStr();
if (aTopElement->getChannel()!=0){
- iDOTFile << "__" << aTopElement->getChannel()->toShortString();
+ //iDOTFile << "__" << aTopElement->getChannel()->toShortString();
}
iDOTFile << "<" << aTopElement->getVirtualLength() << ">)\"]\n";
-//#else
//(20,"i(CPU0__test1__TMLTask_1__wr__test1__ch<4 ,4>)", 24)
iAUTFile << "(" << aStartState << "," << "\"i(" << aCPU->toString() << "__" << aTopElement->getCommand()->getTask()->toString() << "__" << aTopElement->getCommand()->getCommandStr();
if (aTopElement->getChannel()!=0){
iAUTFile << "__" << aTopElement->getChannel()->toShortString();
}
iAUTFile << "<" << aTopElement->getVirtualLength() << ">)\"," << aEndState <<")\n";
-//#endif
aStartState = aEndState;
- //aOutp << aTempStr.str() << ++aTransitionNo << ")\n";
- //}
- //myfile << aTempStr.str();
aQueue.pop();
aTrans = aCPU->getTransactions1By1(false);
if (aTrans!=0) aQueue.push(aTrans);
}
+ //std::cout << "exit graph output\n";
return aStartState;
}
@@ -212,7 +158,8 @@ void Simulator::schedule2Graph(std::string& iTraceFileName) const{
GraphTransactionQueue aQueue;
TMLTransaction* aTrans, *aTopElement;
unsigned int aTransitionNo=0;
- for(CPUList::const_iterator i=_simComp->getCPUIterator(false); i != _simComp->getCPUIterator(true); ++i){
+ //for(CPUList::const_iterator i=_simComp->getCPUIterator(false); i != _simComp->getCPUIterator(true); ++i){
+ for(CPUList::const_iterator i=_simComp->getCPUList().begin(); i != _simComp->getCPUList().end(); ++i){
aTrans = (*i)->getTransactions1By1(true);
if (aTrans!=0) aQueue.push(aTrans);
}
@@ -252,9 +199,14 @@ void Simulator::schedule2TXT(std::string& iTraceFileName) const{
gettimeofday(&aBegin,NULL);
std::ofstream myfile (iTraceFileName.c_str());
if (myfile.is_open()){
- for(CPUList::const_iterator i=_simComp->getCPUIterator(false); i != _simComp->getCPUIterator(true); ++i){
+ //for(CPUList::const_iterator i=_simComp->getCPUIterator(false); i != _simComp->getCPUIterator(true); ++i){
+ for(CPUList::const_iterator i=_simComp->getCPUList().begin(); i != _simComp->getCPUList().end(); ++i){
(*i)->schedule2TXT(myfile);
}
+ //for(BusList::const_iterator j=_simComp->getBusIterator(false); j != _simComp->getBusIterator(true); ++j){
+ for(BusList::const_iterator j=_simComp->getBusList().begin(); j != _simComp->getBusList().end(); ++j){
+ (*j)->schedule2TXT(myfile);
+ }
myfile.close();
}
else
@@ -270,10 +222,12 @@ void Simulator::schedule2HTML(std::string& iTraceFileName) const{
if (myfile.is_open()){
myfile << "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\"\n\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n";
myfile << "<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"en\" lang=\"en\">\n<head>\n<link rel=\"stylesheet\" type=\"text/css\" href=\"schedstyle.css\" />\n<meta http-equiv=\"content-type\" content=\"text/html; charset=ISO-8859-1\" />\n<title>Scheduling</title>\n</head>\n<body>\n";
- for(CPUList::const_iterator i=_simComp->getCPUIterator(false); i != _simComp->getCPUIterator(true); ++i){
+ //for(CPUList::const_iterator i=_simComp->getCPUIterator(false); i != _simComp->getCPUIterator(true); ++i){
+ for(CPUList::const_iterator i=_simComp->getCPUList().begin(); i != _simComp->getCPUList().end(); ++i){
(*i)->schedule2HTML(myfile);
}
- for(BusList::const_iterator j=_simComp->getBusIterator(false); j != _simComp->getBusIterator(true); ++j){
+ //for(BusList::const_iterator j=_simComp->getBusIterator(false); j != _simComp->getBusIterator(true); ++j){
+ for(BusList::const_iterator j=_simComp->getBusList().begin(); j != _simComp->getBusList().end(); ++j){
(*j)->schedule2HTML(myfile);
}
//for_each(iCPUlist.begin(), iCPUlist.end(),std::bind2nd(std::mem_fun(&CPU::schedule2HTML),myfile));
@@ -295,32 +249,37 @@ void Simulator::schedule2VCD(std::string& iTraceFileName) const{
aTimeinfo=localtime(&aRawtime);
std::ofstream myfile (iTraceFileName.c_str());
if (myfile.is_open()){
- std::cout << "File is open" << std::endl;
+ //std::cout << "File is open" << std::endl;
SignalChangeQueue aQueue;
std::string aSigString;
- bool aNoMoreTrans;
- TraceableDevice* actDevice;
- TMLTime aTime=0, aCurrTime=-1;
+ //bool aNoMoreTrans;
+ //TraceableDevice* actDevice;
+ TMLTime aCurrTime=-1;
SignalChangeData* aTopElement;
TMLTime aNextClockEvent=0;
- myfile << "$date\n" << asctime(aTimeinfo) << "$end\n\n$version\nDaniels TML simulator\n$end\n\n";
+ myfile << "$date\n" << asctime(aTimeinfo) << "$end\n\n$version\nDaniel's TML simulator\n$end\n\n";
myfile << "$timescale\n1 ns\n$end\n\n$scope module Simulation $end\n";
- std::cout << "Before 1st loop" << std::endl;
- for (TraceableDeviceList::const_iterator i=_simComp->getVCDIterator(false); i!= _simComp->getVCDIterator(true); ++i){
- TraceableDevice* a=*i;
+ //std::cout << "Before 1st loop" << std::endl;
+ //for (TraceableDeviceList::const_iterator i=_simComp->getVCDIterator(false); i!= _simComp->getVCDIterator(true); ++i){
+ for (TraceableDeviceList::const_iterator i=_simComp->getVCDList().begin(); i!= _simComp->getVCDList().end(); ++i){
+ //TraceableDevice* a=*i;
// a->streamBenchmarks(std::cout);
// a->toString();
- std::cout << "in 1st loop " << a << std::endl;
- std::cout << "device: " << (*i)->toString() << std::endl;
- myfile << "$var integer 3 " << (*i)->toShortString() << " " << (*i)->toString() << " $end\n";
- std::cout << "get next signal change" << std::endl;
- aTime = (*i)->getNextSignalChange(true, aSigString, aNoMoreTrans);
- std::cout << "push" << std::endl;
- aQueue.push(new SignalChangeData(aSigString, aTime, (aNoMoreTrans)?0:(*i)));
+ //std::cout << "in 1st loop " << a << std::endl;
+ //std::cout << "device: " << (*i)->toString() << std::endl;
+ //myfile << "$var integer 3 " << (*i)->toShortString() << " " << (*i)->toString() << " $end\n";
+ myfile << "$var wire 1 " << (*i)->toShortString() << " " << (*i)->toString() << " $end\n";
+ //std::cout << "get next signal change" << std::endl;
+ //aTime = (*i)->getNextSignalChange(true, aSigString, aNoMoreTrans);
+ aTopElement = new SignalChangeData();
+ (*i)->getNextSignalChange(true, aTopElement);
+ aQueue.push(aTopElement);
+ //std::cout << "push" << std::endl;
+ //aQueue.push(new SignalChangeData(aSigString, aTime, (aNoMoreTrans)?0:(*i)));
}
myfile << "$var integer 32 clk Clock $end\n";
myfile << "$upscope $end\n$enddefinitions $end\n\n";
- std::cout << "Before 2nd loop" << std::endl;
+ //std::cout << "Before 2nd loop" << std::endl;
while (!aQueue.empty()){
aTopElement=aQueue.top();
while (aNextClockEvent < aTopElement->_time){
@@ -332,20 +291,30 @@ void Simulator::schedule2VCD(std::string& iTraceFileName) const{
myfile << "#" << aCurrTime << "\n";
}
if (aNextClockEvent == aTopElement->_time){
- myfile << VCD_PREFIX << vcdValConvert(aNextClockEvent) << " clk\n";
+ myfile << "b" << vcdTimeConvert(aNextClockEvent) << " clk\n";
aNextClockEvent+=CLOCK_INC;
}
- myfile << aTopElement->_sigChange << "\n";
- actDevice=aTopElement->_device;
- if (actDevice!=0) aTime = actDevice->getNextSignalChange(false, aSigString, aNoMoreTrans);
- delete aTopElement;
+ //myfile << aTopElement->_sigChange << "\n";
+ myfile << vcdValConvert(aTopElement->_sigChange) << aTopElement->_device->toShortString() << "\n";
aQueue.pop();
- if (actDevice!=0) aQueue.push(new SignalChangeData(aSigString, aTime, (aNoMoreTrans)?0:actDevice));
+ TMLTime aTime = aTopElement->_time;
+ aTopElement->_device->getNextSignalChange(false, aTopElement);
+ if (aTopElement->_time == aTime)
+ delete aTopElement;
+ else
+ aQueue.push(aTopElement);
+ //actDevice=aTopElement->_device;
+ //if (actDevice!=0) aTime = actDevice->getNextSignalChange(false, aSigString, aNoMoreTrans);
+ //delete aTopElement;
+ //aQueue.pop();
+ //if (actDevice!=0) aQueue.push(new SignalChangeData(aSigString, aTime, (aNoMoreTrans)?0:actDevice));
}
myfile << "#" << aCurrTime+1 << "\n";
std::cout << "Simulated cycles: " << aCurrTime << std::endl;
- for (TraceableDeviceList::const_iterator i=_simComp->getVCDIterator(false); i!= _simComp->getVCDIterator(true); ++i){
- myfile << VCD_PREFIX << "100 " << (*i)->toShortString() << "\n";
+ //for (TraceableDeviceList::const_iterator i=_simComp->getVCDIterator(false); i!= _simComp->getVCDIterator(true); ++i){
+ for (TraceableDeviceList::const_iterator i=_simComp->getVCDList().begin(); i!= _simComp->getVCDList().end(); ++i){
+ //myfile << VCD_PREFIX << "100 " << (*i)->toShortString() << "\n";
+ myfile << "0" << (*i)->toShortString() << "\n";
//std::cout << "Utilization of component " << (*i)->toString() << ": " << ((float)(*i)->getBusyCycles()) / ((float)aCurrTime) << std::endl;
}
@@ -378,7 +347,8 @@ bool Simulator::simulate(TMLTransaction*& oLastTrans){
#endif
_simComp->setStopFlag(false,"");
//std::cout << "before loop " << std::endl;
- for(TaskList::const_iterator i=_simComp->getTaskIterator(false); i!=_simComp->getTaskIterator(true);i++){
+ //for(TaskList::const_iterator i=_simComp->getTaskIterator(false); i!=_simComp->getTaskIterator(true);i++){
+ for(TaskList::const_iterator i=_simComp->getTaskList().begin(); i!=_simComp->getTaskList().end();i++){
//std::cout << "loop it " << (*i)->toString() << std::endl;
if ((*i)->getCurrCommand()!=0) (*i)->getCurrCommand()->prepare(true);
//std::cout << "loop it end" << (*i)->toString() << std::endl;
@@ -391,7 +361,8 @@ bool Simulator::simulate(TMLTransaction*& oLastTrans){
#endif
//std::cout << "after loop2" << std::endl;
//for_each(_simComp->getCPUIterator(false), _simComp->getCPUIterator(true),std::mem_fun(&CPU::setRescheduleFlag));
- for_each(_simComp->getCPUIterator(false), _simComp->getCPUIterator(true),std::mem_fun(&CPU::schedule));
+ //for_each(_simComp->getCPUIterator(false), _simComp->getCPUIterator(true),std::mem_fun(&CPU::schedule));
+ for_each(_simComp->getCPUList().begin(), _simComp->getCPUList().end(),std::mem_fun(&CPU::schedule));
//std::cout << "after schedule" << std::endl;
transLET=getTransLowestEndTime(cpuLET);
//std::cout << "after getTLET" << std::endl;
@@ -494,15 +465,18 @@ bool Simulator::simulate(TMLTransaction*& oLastTrans){
}
bool aSimCompleted = (transLET==0 && !_simComp->getStoppedOnAction());
-#ifdef LISTENERS_ENABLED
+
if (aSimCompleted){
+#ifdef LISTENERS_ENABLED
NOTIFY_SIM_STOPPED();
NOTIFY_EVALUATE();
- }
#endif
+ _longRunTime = max(_longRunTime, SchedulableDevice::getSimulatedTime());
+ _shortRunTime = min(_shortRunTime, SchedulableDevice::getSimulatedTime());
+ //_simComp->showTaskStates();
+ }
gettimeofday(&aEnd,NULL);
//std::cout << "The simulation took " << getTimeDiff(aBegin,aEnd) << "usec.\n";
- _simComp->showTaskStates();
return (aSimCompleted);
}
@@ -555,23 +529,36 @@ ServerIF* Simulator::run(int iLen, char ** iArgs){
//aTraceFileName =getArgs("-explore", "file", iLen, iArgs);
//if (!aTraceFileName.empty()) return new ServerExplore();
std::cout << "Running in command line mode.\n";
+ _replyToServer = false;
aTraceFileName =getArgs("-help", "help", iLen, iArgs);
if (aTraceFileName.empty()){
- TMLTransaction* oLastTrans;
- simulate(oLastTrans);
- aTraceFileName=getArgs("-ohtml", "scheduling.html", iLen, iArgs);
- if (!aTraceFileName.empty()) schedule2HTML(aTraceFileName);
- aTraceFileName=getArgs("-otxt", "scheduling.txt", iLen, iArgs);
- if (!aTraceFileName.empty()) schedule2TXT(aTraceFileName);
- aTraceFileName=getArgs("-ovcd", "scheduling.vcd", iLen, iArgs);
- if (!aTraceFileName.empty()) schedule2VCD(aTraceFileName);
- aTraceFileName=getArgs("-ograph", "scheduling.aut", iLen, iArgs);
- if (!aTraceFileName.empty()) schedule2Graph(aTraceFileName);
- _simComp->streamBenchmarks(std::cout);
- std::cout << "Simulated time: " << SchedulableDevice::getSimulatedTime() << " time units.\n";
+ aTraceFileName =getArgs("-explo", "explo", iLen, iArgs);
+ if (aTraceFileName.empty()){
+ TMLTransaction* oLastTrans;
+ simulate(oLastTrans);
+ aTraceFileName=getArgs("-ohtml", "scheduling.html", iLen, iArgs);
+ if (!aTraceFileName.empty()) schedule2HTML(aTraceFileName);
+ aTraceFileName=getArgs("-otxt", "scheduling.txt", iLen, iArgs);
+ if (!aTraceFileName.empty()) schedule2TXT(aTraceFileName);
+ aTraceFileName=getArgs("-ovcd", "scheduling.vcd", iLen, iArgs);
+ if (!aTraceFileName.empty()) schedule2VCD(aTraceFileName);
+ aTraceFileName=getArgs("-ograph", "scheduling.aut", iLen, iArgs);
+ if (!aTraceFileName.empty()) schedule2Graph(aTraceFileName);
+ _simComp->streamBenchmarks(std::cout);
+ std::cout << "Simulated time: " << SchedulableDevice::getSimulatedTime() << " time units.\n";
+ }else{
+ decodeCommand("1 7");
+ }
}
else
printHelp();
+ //clock_t tick =sysconf(_SC_CLK_TCK);
+ //tms test;
+ //times(&test);
+ //std::cout << "user time: " << test.tms_utime << " system time: " << test.tms_stime + test.tms_cstime << " tick: " << tick << "\n";
+ rusage res;
+ getrusage(RUSAGE_SELF, &res);
+ std::cerr << res.ru_utime.tv_sec << "," << res.ru_utime.tv_usec << "," << res.ru_stime.tv_sec << "," << res.ru_stime.tv_usec << "\n";
return 0;
}
@@ -598,7 +585,7 @@ void Simulator::decodeCommand(std::string iCmd){
case 1:{
_busy=true;
anAckMsg << TAG_HEADER << std::endl << TAG_STARTo << std::endl << TAG_GLOBALo << std::endl << /*TAG_REPLYo << anIssuedCmd << TAG_REPLYc << std::endl<< */ TAG_MSGo << "Command received" << TAG_MSGc << TAG_ERRNOo << 0 << TAG_ERRNOc << std::endl << TAG_STATUSo << SIM_BUSY << TAG_STATUSc << std::endl << TAG_GLOBALc << std::endl << TAG_STARTc << std::endl;
- _syncInfo->_server->sendReply(anAckMsg.str());
+ if (_replyToServer) _syncInfo->_server->sendReply(anAckMsg.str());
aInpStream >> aParam1;
TMLTransaction* oLastTrans;
switch (aParam1){
@@ -698,6 +685,7 @@ void Simulator::decodeCommand(std::string iCmd){
_simTerm=true;
//aGlobMsg << TAG_MSGo << MSG_CMDNIMPL << TAG_MSGc << std::endl;
//anErrorCode=1;
+ std::cout << "** Longest runtime: " << _longRunTime << ", shortest runtime: " << _shortRunTime << " **\n";
std::cout << "End Explore tree." << std::endl;
break;
}
@@ -837,7 +825,8 @@ void Simulator::decodeCommand(std::string iCmd){
std::cout << "Print variable x." << std::endl;
aInpStream >> aStrParam;
if (aStrParam=="all"){
- for(TaskList::const_iterator i=_simComp->getTaskIterator(false); i !=_simComp->getTaskIterator(true); ++i){
+ //for(TaskList::const_iterator i=_simComp->getTaskIterator(false); i !=_simComp->getTaskIterator(true); ++i){
+ for(TaskList::const_iterator i=_simComp->getTaskList().begin(); i !=_simComp->getTaskList().end(); ++i){
printVariablesOfTask(*i, anEntityMsg);
}
}else{
@@ -1177,18 +1166,21 @@ void Simulator::decodeCommand(std::string iCmd){
writeSimState(aGlobMsg);
aGlobMsg << std::endl << TAG_GLOBALc << std::endl << anEntityMsg.str() << TAG_STARTc << std::endl;
//std::cout << "Before reply." << std::endl;
- _syncInfo->_server->sendReply(aGlobMsg.str());
+ if (_replyToServer)_syncInfo->_server->sendReply(aGlobMsg.str());
//std::cout << "End of command decode procedure." << std::endl;
//std::cout << "Command: " << aCmd << " Param1: " << aParam1 << " Param2: " << aParam2 << std::endl;
}
void Simulator::printVariablesOfTask(TMLTask* iTask, std::ostream& ioMessage){
- if (iTask->getVariableIteratorID(false)==iTask->getVariableIteratorID(true)) return;
- ioMessage << TAG_TASKo << " id=\"" << iTask-> getID() << "\" name=\"" << iTask->toString() << "\">" << std::endl;
- for(VariableLookUpTableID::const_iterator i=iTask->getVariableIteratorID(false); i !=iTask->getVariableIteratorID(true); ++i){
- ioMessage << TAG_VARo << " id=\"" << i->first << "\">" << *(i->second) << TAG_VARc << std::endl;
+ //if (iTask->getVariableIteratorID(false)==iTask->getVariableIteratorID(true)) return;
+ if (iTask->getVariableLookUpTableID().size()>0){
+ ioMessage << TAG_TASKo << " id=\"" << iTask-> getID() << "\" name=\"" << iTask->toString() << "\">" << std::endl;
+ //for(VariableLookUpTableID::const_iterator i=iTask->getVariableIteratorID(false); i !=iTask->getVariableIteratorID(true); ++i){
+ for(VariableLookUpTableID::const_iterator i=iTask->getVariableLookUpTableID().begin(); i !=iTask->getVariableLookUpTableID().end(); ++i){
+ ioMessage << TAG_VARo << " id=\"" << i->first << "\">" << *(i->second) << TAG_VARc << std::endl;
+ }
+ ioMessage << TAG_TASKc << std::endl;
}
- ioMessage << TAG_TASKc << std::endl;
}
bool Simulator::runToNextBreakpoint(TMLTransaction*& oLastTrans){
@@ -1288,7 +1280,9 @@ void Simulator::exploreTree(unsigned int iDepth, ID iPrevID, std::ofstream& iDOT
aSimTerminated=runToNextRandomCommand(aLastTrans);
aRandomCmd = _simComp->getCurrentRandomCmd();
}while (!aSimTerminated && aRandomCmd==0 && _simComp->wasKnownStateReached()==0);
+#ifdef EXPLOGRAPH_ENABLED
aLastID = schedule2GraphDOT(iDOTFile, iAUTFile, iPrevID,oTransCounter);
+#endif
//if (_simComp->wasKnownStateReached()==0){
//if(aRandomCmd==0){
if(aSimTerminated){
@@ -1317,6 +1311,7 @@ void Simulator::exploreTree(unsigned int iDepth, ID iPrevID, std::ofstream& iDOT
for (unsigned int aBranch=0; aBranch<aNbNextCmds; aBranch++){
_simComp->reset();
aStreamBuffer.str(aStringBuffer);
+ //std::cout << "Read 1 in exploreTree\n";
_simComp->readObject(aStreamBuffer);
aRandomCmd->setRandomValue(aBranch);
exploreTree(iDepth+1, aLastID, iDOTFile, iAUTFile, oTransCounter);
@@ -1328,6 +1323,7 @@ void Simulator::exploreTree(unsigned int iDepth, ID iPrevID, std::ofstream& iDOT
if ((aNbNextCmds & 1)!=0){
_simComp->reset();
aStreamBuffer.str(aStringBuffer);
+ //std::cout << "Read 2 in exploreTree\n";
_simComp->readObject(aStreamBuffer);
aRandomCmd->setRandomValue(aBranch);
exploreTree(iDepth+1, aLastID, iDOTFile, iAUTFile, oTransCounter);
@@ -1380,7 +1376,8 @@ bool Simulator::execAsyncCmd(const std::string& iCmd){
aMessage << TAG_HEADER << std::endl << TAG_STARTo << std::endl;
aInpStream >> aStrParam;
if (aStrParam=="all"){
- for(TaskList::const_iterator i=_simComp->getTaskIterator(false); i !=_simComp->getTaskIterator(true); ++i){
+ //for(TaskList::const_iterator i=_simComp->getTaskIterator(false); i !=_simComp->getTaskIterator(true); ++i){
+ for(TaskList::const_iterator i=_simComp->getTaskList().begin(); i !=_simComp->getTaskList().end(); ++i){
printCommandsOfTask(*i, aMessage);
}
aMessage << TAG_GLOBALo << std::endl << TAG_MSGo << "Current command" << TAG_MSGc << TAG_ERRNOo << 0 << TAG_ERRNOc << std::endl;
diff --git a/simulators/c++2/src_simulator/sim/Simulator.h b/simulators/c++2/src_simulator/sim/Simulator.h
index 4251812caaa73ad63dc3ef0b17ab01eff091b75e..3ee76feba1f351f24a44bed283492d59f95dfb94 100644
--- a/simulators/c++2/src_simulator/sim/Simulator.h
+++ b/simulators/c++2/src_simulator/sim/Simulator.h
@@ -95,7 +95,6 @@ class SimServSyncInfo;
class ServerIF;
///Simulation engine and output capabilities
-//class Simulator: public ListenerSubject<KernelListener> {
class Simulator: public ListenerSubject<GeneralListener> {
public:
///Constructor
@@ -118,7 +117,6 @@ public:
/**
\param iCmd Command string
*/
- //bool execAsyncCmd(const char* iCmd);
bool execAsyncCmd(const std::string& iCmd);
///Sends simulator status information to client
void sendStatus();
@@ -237,13 +235,11 @@ public:
\return Busy flag
*/
bool isBusy();
- //void init();
protected:
///Runs the simulation
/**
\return returns true if the simulation is completed, false otherwise
*/
- //bool simulate();
bool simulate(TMLTransaction*& oLastTrans);
///Returns a pointer to the transaction with the lowest end time proposed by CPU schedulers
/**
@@ -256,7 +252,6 @@ protected:
\param iCmd Pointer to the command
\return Returns false if simulator should be terminated
*/
- //void decodeCommand(char* iCmd);
void decodeCommand(std::string iCmd);
///Searches for switches in the command line string
/**
@@ -309,5 +304,11 @@ protected:
bool _wasReset;
///Graph output path
std::string _graphOutPath;
+ ///Longest runtime
+ TMLTime _longRunTime;
+ ///Shortest runtime
+ TMLTime _shortRunTime;
+ ///Flag indicating whether replies should be sent back to the server, not set in command line mode
+ bool _replyToServer;
};
#endif