Remove Thread context stuff and add a thread-specific variable class, ThreadVar, which can be used for this and many other things.

ClientBroadcaster => Broadcaster.


git-svn-id: http://svn.drobilla.net/lad/trunk/raul@4405 a436a847-0d15-0410-975c-d299462d15a1

2 files changed, 75 insertions, 10 deletions

diff --git a/raul/Thread.hpp b/raul/Thread.hpp
index 9e184d8..9b61048 100644
--- a/raul/Thread.hpp
+++ b/raul/Thread.hpp
@@ -17,7 +17,6 @@
 #ifndef RAUL_THREAD_HPP
 #define RAUL_THREAD_HPP
 
-#include <set>
 #include <string>
 
 #include "raul/Noncopyable.hpp"
@@ -50,7 +49,7 @@ public:
 	 * If the calling thread does not yet have a Thread object associated with
 	 * it, one will be created.
 	 */
-	static Thread& get();
+	static Thread& get(const std::string& name="");
 
 	virtual void start();
 	virtual void stop();
@@ -62,9 +61,6 @@ public:
 	const std::string& name() const { return _name; }
 	void set_name(const std::string& name) { _name = name; }
 
-	bool is_context(unsigned context) const { return _contexts.find(context) != _contexts.end(); }
-	void set_context(unsigned context) { _contexts.insert(context); }
-
 protected:
 	explicit Thread(const std::string& name="");
 	Thread(pthread_t thread, const std::string& name="");
@@ -84,11 +80,10 @@ protected:
 private:
 	static void* _static_run(void* me);
 
-	ThreadImpl*        _impl;
-	std::set<unsigned> _contexts;
-	std::string        _name;
-	bool               _thread_exists;
-	bool               _own_thread;
+	ThreadImpl* _impl;
+	std::string _name;
+	bool        _thread_exists;
+	bool        _own_thread;
 };
 
 } // namespace Raul
diff --git a/raul/ThreadVar.hpp b/raul/ThreadVar.hpp
new file mode 100644
index 0000000..54e0d4e
--- /dev/null
+++ b/raul/ThreadVar.hpp
@@ -0,0 +1,70 @@
+/*
+  This file is part of Raul.
+  Copyright 2007-2012 David Robillard <http://drobilla.net>
+
+  Raul is free software: you can redistribute it and/or modify it under the
+  terms of the GNU General Public License as published by the Free Software
+  Foundation, either version 3 of the License, or any later version.
+
+  Raul is distributed in the hope that it will be useful, but WITHOUT ANY
+  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+  A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with Raul.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef RAUL_THREADVAR_HPP
+#define RAUL_THREADVAR_HPP
+
+#include <stdlib.h>
+#include <pthread.h>
+
+namespace Raul {
+
+struct ThreadVarImpl;
+
+/** Thread-specific variable.
+ */
+template<typename T>
+class ThreadVar
+{
+public:
+	ThreadVar(const T& default_value)
+		: _default_value(default_value)
+	{
+		pthread_key_create(&_key, free);
+	}
+
+	~ThreadVar() {
+		pthread_key_delete(_key);
+	}
+
+	ThreadVar& operator=(const T& value) {
+		T* val = (T*)pthread_getspecific(_key);
+		if (val) {
+			*val = value;
+		} else {
+			val  = (T*)malloc(sizeof(value));
+			*val = value;
+			pthread_setspecific(_key, val);
+		}
+		return *this;
+	}
+	
+	operator T() const {
+		T* val = (T*)pthread_getspecific(_key);
+		return val ? *val : _default_value;
+	}
+
+private:
+	ThreadVar(const ThreadVar& noncopyable);
+	ThreadVar& operator=(const ThreadVar& noncopyable);
+
+	const T       _default_value;
+	pthread_key_t _key;
+};
+
+} // namespace Raul
+
+#endif // RAUL_THREADVAR_HPP