More adhoc extensions for interpreters

5 files changed, 54 insertions, 14 deletions

diff --git a/src/uscxml/Interpreter.cpp b/src/uscxml/Interpreter.cpp
index 5fcc3f7..b8e4bfe 100644
--- a/src/uscxml/Interpreter.cpp
+++ b/src/uscxml/Interpreter.cpp
@@ -1385,19 +1385,29 @@ void InterpreterImpl::invoke(const Arabica::DOM::Node<std::string>& element) {
 			invokeReq.type = "http://www.w3.org/TR/scxml/";
 
 		Invoker invoker;
-		try {
-			invoker = _factory->createInvoker(invokeReq.type, this);
-		} catch (Event e) {
-			receiveInternal(e);
-		}
-		if (invoker) {
-			tthread::lock_guard<tthread::recursive_mutex> lock(_pluginMutex);
+		// is there such an invoker already?
+		if (_invokers.find(invokeReq.invokeid) != _invokers.end()) {
+			invoker = _invokers[invokeReq.invokeid];
+		} else {
 			try {
+				invoker = _factory->createInvoker(invokeReq.type, this);
 				invoker.setInvokeId(invokeReq.invokeid);
-				invoker.setType(invokeReq.type);
 				invoker.setInterpreter(this);
-				invoker.setElement(Element<std::string>(element));
 				_invokers[invokeReq.invokeid] = invoker;
+			} catch (Event e) {
+				receiveInternal(e);
+			}
+		}
+		if (invoker) {
+			tthread::lock_guard<tthread::recursive_mutex> lock(_pluginMutex);
+			try {
+				
+				if (!invoker.getElement())
+					invoker.setElement(Element<std::string>(element));
+
+				if (invoker.getType().size() == 0)
+					invoker.setType(invokeReq.type);
+
 				try {
 
 					USCXML_MONITOR_CALLBACK3(beforeInvoking, Arabica::DOM::Element<std::string>(element), invokeReq.invokeid);
@@ -1453,7 +1463,13 @@ void InterpreterImpl::cancelInvoke(const Arabica::DOM::Node<std::string>& elemen
 
 		USCXML_MONITOR_CALLBACK3(beforeUninvoking, Element<std::string>(element), invokeId)
 		_invokers[invokeId].uninvoke();
-		_invokers.erase(invokeId);
+		
+		/**
+		 * This should not be necessary. Most invokers have their "clean-up" code in their
+		 * destructor and not their uninvoke method - we need to refactor them all!
+		 */
+		if (_dontDestructOnUninvoke.find(invokeId) == _dontDestructOnUninvoke.end())
+			_invokers.erase(invokeId);
 
 		USCXML_MONITOR_CALLBACK3(beforeUninvoking, Element<std::string>(element), invokeId)
 
diff --git a/src/uscxml/Interpreter.h b/src/uscxml/Interpreter.h
index 8a2b282..dc889e3 100644
--- a/src/uscxml/Interpreter.h
+++ b/src/uscxml/Interpreter.h
@@ -364,7 +364,7 @@ public:
 			nameIter++;
 		}
 	}
-
+	
 	const std::map<std::string, IOProcessor>& getIOProcessors() {
 		return _ioProcessors;
 	}
@@ -377,6 +377,13 @@ public:
 		return _dataModel;
 	}
 
+	void setInvoker(const std::string& invokeId, Invoker invoker) {
+		_dontDestructOnUninvoke.insert(invokeId);
+		_invokers[invokeId] = invoker;
+		_invokers[invokeId].setInterpreter(this);
+		_invokers[invokeId].setInvokeId(invokeId);
+	}
+	
 	const std::map<std::string, Invoker>& getInvokers() {
 		return _invokers;
 	}
@@ -466,7 +473,8 @@ protected:
 	bool _isInitialized;
 	bool _domIsSetup;
 	bool _userSuppliedDataModel;
-
+	std::set<std::string> _dontDestructOnUninvoke;
+	
 	bool _isStarted;
 	bool _isRunning;
 
@@ -657,6 +665,9 @@ public:
 		return _impl->getIOProcessors();
 	}
 
+	void setInvoker(const std::string& invokeId, Invoker invoker) {
+		_impl->setInvoker(invokeId, invoker);
+	}
 	const std::map<std::string, Invoker>& getInvokers() {
 		return _impl->getInvokers();
 	}
diff --git a/src/uscxml/plugins/EventHandler.h b/src/uscxml/plugins/EventHandler.h
index 7b38575..4078cfe 100644
--- a/src/uscxml/plugins/EventHandler.h
+++ b/src/uscxml/plugins/EventHandler.h
@@ -49,7 +49,10 @@ public:
 	void setType(const std::string& type) {
 		_type = type;
 	}
-
+	std::string getType() {
+		return _type;
+	}
+	
 	void setElement(const Arabica::DOM::Element<std::string>& element) {
 		_element = element;
 	}
@@ -101,9 +104,13 @@ public:
 	void setInvokeId(const std::string& invokeId) {
 		_impl->setInvokeId(invokeId);
 	}
+	
 	void setType(const std::string& type) {
 		_impl->setType(type);
 	}
+	std::string getType() {
+		return _impl->getType();
+	}
 
 	void setElement(const Arabica::DOM::Element<std::string>& element) {
 		_impl->setElement(element);
diff --git a/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.cpp b/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.cpp
index f232e52..9506867 100644
--- a/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.cpp
+++ b/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.cpp
@@ -40,12 +40,16 @@ USCXMLInvoker::USCXMLInvoker() : _cancelled(false) {
 
 
 USCXMLInvoker::~USCXMLInvoker() {
+};
+
+void USCXMLInvoker::uninvoke() {
 	_cancelled = true;
 	Event event;
 	event.name = "unblock.and.die";
 	if (_invokedInterpreter)
 		_invokedInterpreter.receive(event);
-};
+
+}
 
 boost::shared_ptr<InvokerImpl> USCXMLInvoker::create(InterpreterImpl* interpreter) {
 	boost::shared_ptr<USCXMLInvoker> invoker = boost::shared_ptr<USCXMLInvoker>(new USCXMLInvoker());
@@ -67,6 +71,7 @@ void USCXMLInvoker::cancel(const std::string sendId) {
 }
 
 void USCXMLInvoker::invoke(const InvokeRequest& req) {
+	_cancelled = false;
 	if (req.src.length() > 0) {
 		_invokedInterpreter = Interpreter::fromURI(req.src);
 	} else if (req.dom) {
diff --git a/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.h b/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.h
index 7d10bf1..f6aa77a 100644
--- a/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.h
+++ b/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.h
@@ -60,6 +60,7 @@ public:
 	virtual void send(const SendRequest& req);
 	virtual void cancel(const std::string sendId);
 	virtual void invoke(const InvokeRequest& req);
+	virtual void uninvoke();
 
 protected:
 	bool _cancelled;