summaryrefslogtreecommitdiff
path: root/src/class_linker.h
diff options
context:
space:
mode:
author Elliott Hughes <enh@google.com> 2011-09-11 13:46:25 -0700
committer Elliott Hughes <enh@google.com> 2011-09-11 14:01:57 -0700
commit8daa0929f08a3080ea64dbd4e997e72f411e6fc9 (patch)
treececee23131d5e0357c17c44bcccc7ddcfb31b925 /src/class_linker.h
parent4b620ffb1b4d0c96a94bb3afe314f35d53990ec6 (diff)
More threads work.
Adds stubs (and sometimes implementations) for dalvik.system.VMStack and java.lang.Thread native methods. There was a bug in the dalvik thread priority setting code, where the current thread and the passed-in thread were confused. I've also pulled Mutex and ThreadList out into their own files, and moved some functionality around (with the aim of having more stuff private, especially locks). Change-Id: Ieb0f22669cac3df44ca34f7868f8e7d4dfa09ab6
Diffstat (limited to 'src/class_linker.h')
-rw-r--r--src/class_linker.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/class_linker.h b/src/class_linker.h
index e9606a7e42..fa0c789f7c 100644
--- a/src/class_linker.h
+++ b/src/class_linker.h
@@ -10,8 +10,8 @@
#include "dex_file.h"
#include "heap.h"
#include "macros.h"
+#include "mutex.h"
#include "object.h"
-#include "thread.h"
#include "unordered_map.h"
#include "unordered_set.h"
@@ -264,9 +264,9 @@ class ClassLinker {
// multimap from a StringPiece hash code of a class descriptor to
// Class* instances. Results should be compared for a matching
// Class::descriptor_ and Class::class_loader_.
+ mutable Mutex classes_lock_;
typedef std::tr1::unordered_multimap<size_t, Class*> Table;
Table classes_;
- Mutex* classes_lock_;
// indexes into class_roots_.
// needs to be kept in sync with class_roots_descriptors_.