proc: Monitor cloning behaviour change to let cloned monitors to update

themselves with parent monitor.
etime: update casued by Monitor change.

include/otawa/etime/AbstractTimeBuilder.h

@@ -70,9 +70,9 @@ public:
 class XGraphBuilder: public Monitor {
 	friend class AbstractTimeBuilder;
 public:
-	static XGraphBuilder *make(const Monitor& mon);
-	XGraphBuilder(const Monitor& mon);
-	virtual ~XGraphBuilder(void);
+	static XGraphBuilder *make(Monitor& mon);
+	XGraphBuilder(Monitor& mon);
+	virtual ~XGraphBuilder();
 
 	virtual ParExeGraph *build(ParExeSequence *seq) = 0;
 
@@ -92,8 +92,8 @@ private:
 class XGraphSolver: public Monitor {
 	friend class AbstractTimeBuilder;
 public:
-	static XGraphSolver *make(const Monitor& mon);
-	XGraphSolver(const Monitor& mon);
+	static XGraphSolver *make(Monitor& mon);
+	XGraphSolver(Monitor& mon);
 	virtual ~XGraphSolver(void);
 	sys::Path dumpDir(void) const;
 
@@ -117,8 +117,8 @@ class ILPGenerator: public Monitor {
 	friend class AbstractTimeBuilder;
 	friend class XGraphSolver;
 public:
-	static ILPGenerator *make(const Monitor& mon);
-	ILPGenerator(const Monitor& mon);
+	static ILPGenerator *make(Monitor& mon);
+	ILPGenerator(Monitor& mon);
 	virtual ~ILPGenerator(void);
 
 	virtual void process(WorkSpace *ws) = 0;

include/otawa/etime/StandardILPGenerator.h

@@ -55,7 +55,7 @@ class StandardILPGenerator: public ILPGenerator {
 	};
 
 public:
-	StandardILPGenerator(const Monitor& mon);
+	StandardILPGenerator(Monitor& mon);
 	void process(WorkSpace *ws) override;
 
 protected:

include/otawa/etime/StepGraphBuilder.h

@@ -28,7 +28,7 @@ namespace otawa { namespace etime {
 
 class StepGraphBuilder: public XGraphBuilder {
 public:
-	StepGraphBuilder(const Monitor& mon);
+	StepGraphBuilder(Monitor& mon);
 	~StepGraphBuilder();
 	ParExeGraph *build(ParExeSequence *seq);
 

include/otawa/proc/Monitor.h

@@ -35,8 +35,9 @@ class Monitor {
 public:
 	static Monitor& null;
 
-	Monitor(void);
-	Monitor(const Monitor& mon);
+	Monitor();
+	Monitor(Monitor& mon);
+	~Monitor();
 
 	typedef enum log_level_t {
 		LOG_NONE = 0,
@@ -62,7 +63,7 @@ public:
 	void configure(const PropList& props);
 
 protected:
-	inline void setWorkspace(WorkSpace *workspace) { ws = workspace; }
+	void setWorkspace(WorkSpace *workspace);
 	static const t::uint32
 		IS_VERBOSE		= 0x01,
 		CUSTOM_SHIFT	= 16;
@@ -71,6 +72,8 @@ protected:
 private:
 	log_level_t log_level;
 	WorkSpace *ws;
+	Monitor *parent;
+	List<Monitor *> refs;
 };
 
 // configuration

src/etime/StandardILPGenerator.cpp

@@ -43,7 +43,7 @@ namespace otawa { namespace etime {
 
 /**
  */
-ILPGenerator::ILPGenerator(const Monitor& mon): Monitor(mon), _atb(nullptr) {
+ILPGenerator::ILPGenerator(Monitor& mon): Monitor(mon), _atb(nullptr) {
 }
 
 
@@ -335,7 +335,7 @@ void StandardILPGenerator::EventCollector::make(ilp::System *sys) {
 
 /**
  */
-StandardILPGenerator::StandardILPGenerator(const Monitor& mon):
+StandardILPGenerator::StandardILPGenerator(Monitor& mon):
 	ILPGenerator(mon),
 	_edge(nullptr),
 	_t_lts(-1),
@@ -530,7 +530,7 @@ StandardILPGenerator::EventCollector *StandardILPGenerator::get(Event *event) {
 /**
  * Build the default ILP generator instance.
  */
-ILPGenerator *ILPGenerator::make(const Monitor& mon) {
+ILPGenerator *ILPGenerator::make(Monitor& mon) {
 	return new StandardILPGenerator(mon);
 }
 

src/etime/StandardXGraphBuilder.cpp

@@ -30,7 +30,7 @@ namespace otawa { namespace etime {
  */
 
 
-XGraphBuilder::XGraphBuilder(const Monitor& mon): Monitor(mon), _atb(nullptr) {
+XGraphBuilder::XGraphBuilder(Monitor& mon): Monitor(mon), _atb(nullptr) {
 }
 
 
@@ -108,7 +108,7 @@ void XGraphBuilder::configure(const PropList& props) {
 class StandardXGraphBuilder: public XGraphBuilder {
 public:
 
-	StandardXGraphBuilder(const Monitor& mon): XGraphBuilder(mon) {
+	StandardXGraphBuilder(Monitor& mon): XGraphBuilder(mon) {
 	}
 
 	ParExeGraph *build(ParExeSequence *seq) override {
@@ -451,7 +451,7 @@ private:
 /**
  * TODO
  */
-XGraphBuilder *XGraphBuilder::make(const Monitor& mon) {
+XGraphBuilder *XGraphBuilder::make(Monitor& mon) {
 	return new StandardXGraphBuilder(mon);
 }
 

src/etime/StandardXGraphSolver.cpp

@@ -51,7 +51,7 @@ namespace otawa { namespace etime {
 
 /**
  */
-XGraphSolver::XGraphSolver(const Monitor& mon): Monitor(mon), _atb(nullptr) {
+XGraphSolver::XGraphSolver(Monitor& mon): Monitor(mon), _atb(nullptr) {
 
 }
 
@@ -118,7 +118,7 @@ class StandardXGraphSolver: public XGraphSolver {
 public:
 	typedef t::uint32 mask_t;
 
-	StandardXGraphSolver(const Monitor& mon): XGraphSolver(mon), bedge(nullptr) {
+	StandardXGraphSolver(Monitor& mon): XGraphSolver(mon), bedge(nullptr) {
 	}
 
 	/**
@@ -873,7 +873,7 @@ void XGraphSolver::contributeNegative(EventCase event, bool prec) {
  * @param mon	Monitor to use.
  * @return		Default graph solver.
  */
-XGraphSolver *XGraphSolver::make(const Monitor& mon) {
+XGraphSolver *XGraphSolver::make(Monitor& mon) {
 	return new StandardXGraphSolver(mon);
 }
 

src/etime/StepGraphBuilder.cpp

@@ -40,7 +40,7 @@ StepGraphBuilder::~StepGraphBuilder() {
 
 
 ///
-StepGraphBuilder::StepGraphBuilder(const Monitor& mon): XGraphBuilder(mon) {
+StepGraphBuilder::StepGraphBuilder(Monitor& mon): XGraphBuilder(mon) {
 }
 
 

src/etime/TimeUnitTimer.cpp

@@ -48,7 +48,7 @@ class TimeUnitGenerator: public ILPGenerator {
 
 public:
 
-	TimeUnitGenerator(const Monitor& mon):
+	TimeUnitGenerator(Monitor& mon):
 		ILPGenerator(mon),
 		tu(nullptr),
 		_t_lts(0),

src/prog/proc_Monitor.cpp

@@ -50,7 +50,7 @@ extern cstring VERBOSE_ENV;
 
 /**
  */
-Monitor::Monitor(void): flags(0), log_level(LOG_NONE), ws(0) {
+Monitor::Monitor(void): flags(0), log_level(LOG_NONE), ws(nullptr), parent(nullptr) {
 }
 
 
@@ -58,13 +58,35 @@ Monitor::Monitor(void): flags(0), log_level(LOG_NONE), ws(0) {
  * Build a monitor by copy.
  * @param mon	Monitor to copy.
  */
-Monitor::Monitor(const Monitor& mon)
+Monitor::Monitor(Monitor& mon)
 :	out(mon.out.stream()),
 	log(mon.log.stream()),
 	flags(mon.flags),
 	log_level(mon.log_level),
-	ws(mon.ws)
+	ws(mon.ws),
+	parent(&mon)
 {
+	mon.refs.add(&mon);
+}
+
+
+///
+Monitor::~Monitor() {
+	if(parent != nullptr)
+		parent->refs.remove(this);
+	for(auto r: refs)
+		r->parent = nullptr;
+}
+
+
+/**
+ * Update the workspace in the monitor.
+ * @param workspace	New workspace.
+ */
+void Monitor::setWorkspace(WorkSpace *workspace) {
+	ws = workspace;
+	for(auto r: refs)
+		r->ws = ws;
 }
 
 
@@ -123,8 +145,18 @@ void Monitor::configure(const PropList& props) {
 		if(level >= LOG_BLOCK)
 			flags |= IS_VERBOSE;
 	}
-}
 
+	// record in the children
+	for(auto r: refs) {
+		r->out.setStream(out.stream());
+		r->log.setStream(log.stream());
+		r->log_level = log_level;
+		if(flags & IS_VERBOSE)
+			r->flags |= IS_VERBOSE;
+		else
+			r->flags &= ~IS_VERBOSE;
+	}
+}
 
 
 /**