summaryrefslogtreecommitdiffstats
path: root/runtime/mirror/array.h
diff options
context:
space:
mode:
authorIan Rogers <irogers@google.com>2014-02-25 17:01:10 -0800
committerIan Rogers <irogers@google.com>2014-02-26 16:38:22 -0800
commit6fac447555dc94a935b78198479cce645c837b89 (patch)
treebcf1449999084b1e1dec3dac287f6f3670d7eda0 /runtime/mirror/array.h
parent7f0ff7e7fff82566bca5f9353eaa2c4f81f0671a (diff)
downloadart-6fac447555dc94a935b78198479cce645c837b89.zip
art-6fac447555dc94a935b78198479cce645c837b89.tar.gz
art-6fac447555dc94a935b78198479cce645c837b89.tar.bz2
Make allocations report usable size.
Work-in-progress to allow arrays to fill usable size. Bug: 13028925. Use C++11's override keyword on GCC >= 2.7 to ensure that we override GC and allocator methods. Move initial mirror::Class set up into a Functor so that all allocated objects have non-zero sizes. Use this property to assert that all objects are never larger than their usable size. Other bits of GC related clean-up, missing initialization, missing use of const, hot methods in .cc files, "unimplemented" functions that fail at runtime in header files, reducing header file includes, move valgrind's space into its own files, reduce number of array allocation routines. Change-Id: Id5760041a2d7f94dcaf17ec760f6095ec75dadaa
Diffstat (limited to 'runtime/mirror/array.h')
-rw-r--r--runtime/mirror/array.h22
1 files changed, 5 insertions, 17 deletions
diff --git a/runtime/mirror/array.h b/runtime/mirror/array.h
index c4f9a75..772d303 100644
--- a/runtime/mirror/array.h
+++ b/runtime/mirror/array.h
@@ -28,25 +28,13 @@ namespace mirror {
class MANAGED Array : public Object {
public:
- // A convenience for code that doesn't know the component size, and doesn't want to have to work
- // it out itself.
+ // Allocates an array with the given properties, if fill_usable is true the array will be of at
+ // least component_count size, however, if there's usable space at the end of the allocation the
+ // array will fill it.
template <bool kIsInstrumented>
static Array* Alloc(Thread* self, Class* array_class, int32_t component_count,
- gc::AllocatorType allocator_type)
- SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
-
- template <bool kIsInstrumented>
- static Array* Alloc(Thread* self, Class* array_class, int32_t component_count,
- size_t component_size, gc::AllocatorType allocator_type)
- SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
-
- template <bool kIsInstrumented>
- static Array* Alloc(Thread* self, Class* array_class, int32_t component_count)
- SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
-
- template <bool kIsInstrumented>
- static Array* Alloc(Thread* self, Class* array_class, int32_t component_count,
- size_t component_size)
+ size_t component_size, gc::AllocatorType allocator_type,
+ bool fill_usable = false)
SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
static Array* CreateMultiArray(Thread* self, const SirtRef<Class>& element_class,