From: Michael Starzinger <michi@complang.tuwien.ac.at>
Date: Tue, 12 May 2009 08:21:16 +0000 (+0200)
Subject: * src/toolbox/list.hpp (List): Added new list class without a mutex.
X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=cacao.git;a=commitdiff_plain;h=a8d45af29fc8dbb5fdc664befabbf27bdcbff090

* src/toolbox/list.hpp (List): Added new list class without a mutex.
(LockedList): Renamed list class with mutex to make mutex obvious.
* src/threads/threadlist.hpp (ThreadList): Use above class.
* src/threads/threadlist.cpp: Likewise.
* src/vm/jit/code.hpp (codeinfo): Patcher list uses above class.
* src/vm/jit/patcher-common.cpp (patcher_list_create): Likewise.
---

diff --git a/src/threads/threadlist.cpp b/src/threads/threadlist.cpp
index 9284bdb84..546aa0682 100644
--- a/src/threads/threadlist.cpp
+++ b/src/threads/threadlist.cpp
@@ -43,9 +43,9 @@
 
 Mutex               ThreadList::_mutex;                // a mutex for all thread lists
 
-list<threadobject*> ThreadList::_active_thread_list;   // list of active threads
-list<threadobject*> ThreadList::_free_thread_list;     // list of free threads
-list<int32_t>       ThreadList::_free_index_list;      // list of free thread indexes
+List<threadobject*> ThreadList::_active_thread_list;   // list of active threads
+List<threadobject*> ThreadList::_free_thread_list;     // list of free threads
+List<int32_t>       ThreadList::_free_index_list;      // list of free thread indexes
 
 int32_t             ThreadList::_number_of_non_daemon_threads;
 
@@ -108,7 +108,7 @@ void ThreadList::dump_threads()
  *
  * @param list list class to be filled
  */
-void ThreadList::get_active_threads(list<threadobject*> &list)
+void ThreadList::get_active_threads(List<threadobject*> &list)
 {
 	// Lock the thread lists.
 	lock();
diff --git a/src/threads/threadlist.hpp b/src/threads/threadlist.hpp
index b7f701d03..40e33171d 100644
--- a/src/threads/threadlist.hpp
+++ b/src/threads/threadlist.hpp
@@ -39,15 +39,13 @@
 
 #ifdef __cplusplus
 
-using std::list;
-
 class ThreadList {
 private:
 	static Mutex               _mutex;              // a mutex for all thread lists
 
-	static list<threadobject*> _active_thread_list; // list of active threads
-	static list<threadobject*> _free_thread_list;   // list of free threads
-	static list<int32_t>       _free_index_list;    // list of free thread indexes
+	static List<threadobject*> _active_thread_list; // list of active threads
+	static List<threadobject*> _free_thread_list;   // list of free threads
+	static List<int32_t>       _free_index_list;    // list of free thread indexes
 
 	static int32_t             _number_of_non_daemon_threads;
 
@@ -73,7 +71,7 @@ public:
 	static void                 add_to_active_thread_list(threadobject* t);
 
 	static void                 dump_threads();
-	static void                 get_active_threads(list<threadobject*> &list);
+	static void                 get_active_threads(List<threadobject*> &list);
 	static threadobject*        get_main_thread();
 	static threadobject*        get_free_thread();
 	static int32_t              get_free_thread_index();
diff --git a/src/toolbox/list.hpp b/src/toolbox/list.hpp
index 0ca05c82e..1509f1ba0 100644
--- a/src/toolbox/list.hpp
+++ b/src/toolbox/list.hpp
@@ -31,27 +31,14 @@
 #include <stdint.h>
 
 #ifdef __cplusplus
-#include <list>
-#endif
-
-#include "threads/mutex.hpp"
 
-
-#ifdef __cplusplus
+#include <list>
 
 /**
- * List implementation with a Mutex.
+ * List implementation.
  */
 template<class T> class List : protected std::list<T> {
-private:
-	Mutex _mutex;
-
 public:
-	virtual ~List() {}
-
-	void lock  () { _mutex.lock(); }
-	void unlock() { _mutex.unlock(); }
-
 	// make iterator of std::list visible
 	using std::list<T>::iterator;
 	using std::list<T>::reverse_iterator;
@@ -72,6 +59,25 @@ public:
 };
 
 
+// Required by LockedList.
+#include "threads/mutex.hpp"
+
+
+/**
+ * List implementation with a Mutex.
+ */
+template<class T> class LockedList : public List<T> {
+private:
+	Mutex _mutex;
+
+public:
+	virtual ~LockedList() {}
+
+	void lock  () { _mutex.lock(); }
+	void unlock() { _mutex.unlock(); }
+};
+
+
 // Required by DumpList.
 #include "mm/dumpmemory.hpp"
 
@@ -111,6 +117,7 @@ public:
 #else
 
 typedef struct List List;
+typedef struct LockedList LockedList;
 typedef struct DumpList DumpList;
 
 #endif
diff --git a/src/vm/jit/code.hpp b/src/vm/jit/code.hpp
index 0cbf0a2a8..9a940457e 100644
--- a/src/vm/jit/code.hpp
+++ b/src/vm/jit/code.hpp
@@ -85,9 +85,9 @@ struct codeinfo {
 
 	/* patcher list */
 #ifdef __cplusplus
-	List<patchref_t>* patchers;
+	LockedList<patchref_t>* patchers;
 #else
-	List*         patchers;
+	LockedList*   patchers;
 #endif
 
 	/* replacement */				    
diff --git a/src/vm/jit/patcher-common.cpp b/src/vm/jit/patcher-common.cpp
index b36e68dad..8d3e6dcef 100644
--- a/src/vm/jit/patcher-common.cpp
+++ b/src/vm/jit/patcher-common.cpp
@@ -90,7 +90,7 @@ static patcher_function_list_t patcher_function_list[] = {
 
 void patcher_list_create(codeinfo *code)
 {
-	code->patchers = new List<patchref_t>();
+	code->patchers = new LockedList<patchref_t>();
 }