From 49652b9e2882a1c3cd5203ea91f90cdd32a090e9 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 27 Jul 2013 14:21:46 +0200
Subject: Some changes in memory management

---
 mmss/protocol.cpp | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

(limited to 'mmss/protocol.cpp')

diff --git a/mmss/protocol.cpp b/mmss/protocol.cpp
index 3bbfeb1..246b136 100644
--- a/mmss/protocol.cpp
+++ b/mmss/protocol.cpp
@@ -32,11 +32,22 @@
 
 namespace MMSS {
 
-const protocol_t* load_protocol(const char *module) {
+class dlcloser {
+private:
+	void *handle;
+
+public:
+	dlcloser(void *handle0) : handle(handle0) {}
+	void operator()(const protocol_t *ptr) const {
+		::dlclose(handle);
+	}
+};
+
+std::shared_ptr<const protocol_t> load_protocol(const char *module) {
 	void *handle = ::dlopen(module, RTLD_NOW);
 	if (!handle) {
 		std::fprintf(stderr, "unable to load protocol from `%s': %s\n", module, dlerror());
-		return NULL;
+		return std::shared_ptr<const protocol_t>();
 	}
 
 	::dlerror();
@@ -44,12 +55,12 @@ const protocol_t* load_protocol(const char *module) {
 	if (!proto) {
 		std::fprintf(stderr, "unable to load protocol from `%s': %s\n", module, dlerror());
 		::dlclose(handle);
-		return NULL;
+		return std::shared_ptr<const protocol_t>();
 	}
 
 	std::fprintf(stderr, "loaded protocol `%s' version %s\n", proto->get_name(), proto->get_version());
 
-	return proto;
+	return std::shared_ptr<const protocol_t>(proto, dlcloser(handle));
 }
 
 }
-- 
cgit v1.2.3