Started Java datamodel and fixed memory leaks

2 files changed, 36 insertions, 2 deletions

diff --git a/src/uscxml/plugins/invoker/filesystem/dirmon/DirMonInvoker.cpp b/src/uscxml/plugins/invoker/filesystem/dirmon/DirMonInvoker.cpp
index 5900cc8..0f6b776 100644
--- a/src/uscxml/plugins/invoker/filesystem/dirmon/DirMonInvoker.cpp
+++ b/src/uscxml/plugins/invoker/filesystem/dirmon/DirMonInvoker.cpp
@@ -28,13 +28,18 @@ DirMonInvoker::DirMonInvoker() :
 	_reportExisting(true),
 	_reportHidden(false),
 	_recurse(false),
-	_thread(NULL) {
+	_thread(NULL),
+	_watcher(NULL) {
 }
 
 DirMonInvoker::~DirMonInvoker() {
 	_isRunning = false;
-	if (_thread)
+	if (_thread) {
 		_thread->join();
+		delete _thread;
+	}
+	if (_watcher)
+		delete(_watcher);
 };
 
 boost::shared_ptr<InvokerImpl> DirMonInvoker::create(InterpreterImpl* interpreter) {
@@ -218,6 +223,15 @@ void DirMonInvoker::handleChanges(DirectoryWatch::Action action, const std::stri
 	returnEvent(event);
 }
 
+DirectoryWatch::~DirectoryWatch() {
+	std::map<std::string, DirectoryWatch*>::iterator dirIter = _knownDirs.begin();
+	while(dirIter != _knownDirs.end()) {
+		delete(dirIter->second);
+		dirIter++;
+	}
+
+}
+
 void DirectoryWatch::reportAsDeleted() {
 	std::map<std::string, struct stat>::iterator fileIter = _knownEntries.begin();
 	while(fileIter != _knownEntries.end()) {
diff --git a/src/uscxml/plugins/invoker/filesystem/dirmon/DirMonInvoker.h b/src/uscxml/plugins/invoker/filesystem/dirmon/DirMonInvoker.h
index 611106b..59eee81 100644
--- a/src/uscxml/plugins/invoker/filesystem/dirmon/DirMonInvoker.h
+++ b/src/uscxml/plugins/invoker/filesystem/dirmon/DirMonInvoker.h
@@ -1,6 +1,7 @@
 #ifndef DIRMONINVOKER_H_W09J90F0
 #define DIRMONINVOKER_H_W09J90F0
 
+#include <uscxml/config.h>
 #include <uscxml/Interpreter.h>
 #include <map>
 #include <sys/stat.h>
@@ -23,6 +24,7 @@ public:
 	};
 
 	DirectoryWatch(const std::string& dir, bool recurse = false) : _dir(dir), _recurse(recurse), _lastChecked(0) {}
+	~DirectoryWatch();
 
 	void addMonitor(DirectoryWatchMonitor* monitor) {
 		_monitors.insert(monitor);
@@ -33,6 +35,24 @@ public:
 	void updateEntries(bool reportAsExisting = false);
 	void reportAsDeleted();
 
+	std::map<std::string, struct stat> getAllEntries() {
+		std::map<std::string, struct stat> entries;
+		entries.insert(_knownEntries.begin(), _knownEntries.end());
+
+		std::map<std::string, DirectoryWatch*>::iterator dirIter = _knownDirs.begin();
+		while(dirIter != _knownDirs.end()) {
+			std::map<std::string, struct stat> dirEntries = dirIter->second->getAllEntries();
+			std::map<std::string, struct stat>::iterator dirEntryIter = dirEntries.begin();
+			while(dirEntryIter != dirEntries.end()) {
+				entries[dirIter->first + PATH_SEPERATOR + dirEntryIter->first] = dirEntryIter->second;
+				dirEntryIter++;
+			}
+			dirIter++;
+		}
+
+		return entries;
+	}
+
 protected:
 	DirectoryWatch(const std::string& dir, const std::string& relDir) : _dir(dir), _relDir(relDir), _recurse(true), _lastChecked(0) {}