diff options
Diffstat (limited to 'runtime/thread.h')
| -rw-r--r-- | runtime/thread.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/runtime/thread.h b/runtime/thread.h index f869285..8c17082 100644 --- a/runtime/thread.h +++ b/runtime/thread.h @@ -29,6 +29,7 @@ #include "entrypoints/jni/jni_entrypoints.h" #include "entrypoints/portable/portable_entrypoints.h" #include "entrypoints/quick/quick_entrypoints.h" +#include "gc/allocator/rosalloc.h" #include "globals.h" #include "jvalue.h" #include "object_callbacks.h" @@ -783,9 +784,6 @@ class Thread { return tlsPtr_.thread_local_objects; } - // ROS alloc TLS. - static constexpr size_t kRosAllocNumOfSizeBrackets = 34; - void* GetRosAllocRun(size_t index) const { return tlsPtr_.rosalloc_runs[index]; } @@ -1060,12 +1058,8 @@ class Thread { byte* thread_local_end; size_t thread_local_objects; - // Thread-local rosalloc runs. There are 34 size brackets in rosalloc - // runs (RosAlloc::kNumOfSizeBrackets). We can't refer to the - // RosAlloc class due to a header file circular dependency issue. - // To compensate, we check that the two values match at RosAlloc - // initialization time. - void* rosalloc_runs[kRosAllocNumOfSizeBrackets]; + // There are RosAlloc::kNumThreadLocalSizeBrackets thread-local size brackets per thread. + void* rosalloc_runs[gc::allocator::RosAlloc::kNumThreadLocalSizeBrackets]; // Thread-local allocation stack data/routines. mirror::Object** thread_local_alloc_stack_top; |