diff options
author | 2017-07-05 10:34:49 -0700 | |
---|---|---|
committer | 2017-07-05 10:49:16 -0700 | |
commit | bf64a57227b8001adc4840ccda9c3f4122ff9ac5 (patch) | |
tree | 757e968da8a4d7d56b6900c5d7143a895794e637 | |
parent | fe9a4f061841a3c597aac6817a47c799c54fcad7 (diff) |
Move jvmti allocation functions to own file.
This matches the style of most other jvmti functions and makes it
simpler to extend and tweak these functions later.
Bug: 62065509
Test: ./test.py --host -j40
Change-Id: I7080bf0fc211faaa0e481f6d401172fbdf6d36d6
-rw-r--r-- | runtime/openjdkjvmti/Android.bp | 1 | ||||
-rw-r--r-- | runtime/openjdkjvmti/OpenjdkJvmTi.cc | 15 | ||||
-rw-r--r-- | runtime/openjdkjvmti/ti_allocator.cc | 71 | ||||
-rw-r--r-- | runtime/openjdkjvmti/ti_allocator.h | 49 |
4 files changed, 124 insertions, 12 deletions
diff --git a/runtime/openjdkjvmti/Android.bp b/runtime/openjdkjvmti/Android.bp index 619a49aa71..aec1bd0f37 100644 --- a/runtime/openjdkjvmti/Android.bp +++ b/runtime/openjdkjvmti/Android.bp @@ -27,6 +27,7 @@ cc_defaults { "fixed_up_dex_file.cc", "object_tagging.cc", "OpenjdkJvmTi.cc", + "ti_allocator.cc", "ti_breakpoint.cc", "ti_class.cc", "ti_class_definition.cc", diff --git a/runtime/openjdkjvmti/OpenjdkJvmTi.cc b/runtime/openjdkjvmti/OpenjdkJvmTi.cc index e3768b358f..21239fe3de 100644 --- a/runtime/openjdkjvmti/OpenjdkJvmTi.cc +++ b/runtime/openjdkjvmti/OpenjdkJvmTi.cc @@ -48,6 +48,7 @@ #include "scoped_thread_state_change-inl.h" #include "thread-current-inl.h" #include "thread_list.h" +#include "ti_allocator.h" #include "ti_breakpoint.h" #include "ti_class.h" #include "ti_dump.h" @@ -109,22 +110,12 @@ class JvmtiFunctions { static jvmtiError Allocate(jvmtiEnv* env, jlong size, unsigned char** mem_ptr) { ENSURE_VALID_ENV(env); ENSURE_NON_NULL(mem_ptr); - if (size < 0) { - return ERR(ILLEGAL_ARGUMENT); - } else if (size == 0) { - *mem_ptr = nullptr; - return OK; - } - *mem_ptr = static_cast<unsigned char*>(malloc(size)); - return (*mem_ptr != nullptr) ? OK : ERR(OUT_OF_MEMORY); + return AllocUtil::Allocate(env, size, mem_ptr); } static jvmtiError Deallocate(jvmtiEnv* env, unsigned char* mem) { ENSURE_VALID_ENV(env); - if (mem != nullptr) { - free(mem); - } - return OK; + return AllocUtil::Deallocate(env, mem); } static jvmtiError GetThreadState(jvmtiEnv* env, jthread thread, jint* thread_state_ptr) { diff --git a/runtime/openjdkjvmti/ti_allocator.cc b/runtime/openjdkjvmti/ti_allocator.cc new file mode 100644 index 0000000000..603a43ffd2 --- /dev/null +++ b/runtime/openjdkjvmti/ti_allocator.cc @@ -0,0 +1,71 @@ +/* Copyright (C) 2016 The Android Open Source Project + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This file implements interfaces from the file jvmti.h. This implementation + * is licensed under the same terms as the file jvmti.h. The + * copyright and license information for the file jvmti.h follows. + * + * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code 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 + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +#include "ti_allocator.h" + +#include "art_jvmti.h" +#include "art_method-inl.h" +#include "base/enums.h" +#include "dex_file_annotations.h" +#include "events-inl.h" +#include "jni_internal.h" +#include "mirror/object_array-inl.h" +#include "modifiers.h" +#include "runtime_callbacks.h" +#include "scoped_thread_state_change-inl.h" +#include "ScopedLocalRef.h" +#include "thread-current-inl.h" +#include "thread_list.h" +#include "ti_phase.h" + +namespace openjdkjvmti { + +jvmtiError AllocUtil::Allocate(jvmtiEnv* env ATTRIBUTE_UNUSED, + jlong size, + unsigned char** mem_ptr) { + if (size < 0) { + return ERR(ILLEGAL_ARGUMENT); + } else if (size == 0) { + *mem_ptr = nullptr; + return OK; + } + *mem_ptr = static_cast<unsigned char*>(malloc(size)); + return (*mem_ptr != nullptr) ? OK : ERR(OUT_OF_MEMORY); +} + +jvmtiError AllocUtil::Deallocate(jvmtiEnv* env ATTRIBUTE_UNUSED, unsigned char* mem) { + if (mem != nullptr) { + free(mem); + } + return OK; +} + +} // namespace openjdkjvmti diff --git a/runtime/openjdkjvmti/ti_allocator.h b/runtime/openjdkjvmti/ti_allocator.h new file mode 100644 index 0000000000..7f1aa6d9c0 --- /dev/null +++ b/runtime/openjdkjvmti/ti_allocator.h @@ -0,0 +1,49 @@ +/* Copyright (C) 2016 The Android Open Source Project + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This file implements interfaces from the file jvmti.h. This implementation + * is licensed under the same terms as the file jvmti.h. The + * copyright and license information for the file jvmti.h follows. + * + * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code 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 + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +#ifndef ART_RUNTIME_OPENJDKJVMTI_TI_ALLOCATOR_H_ +#define ART_RUNTIME_OPENJDKJVMTI_TI_ALLOCATOR_H_ + +#include "jni.h" +#include "jvmti.h" + +namespace openjdkjvmti { + +class AllocUtil { + public: + static jvmtiError Allocate(jvmtiEnv* env, jlong size, unsigned char** mem_ptr); + static jvmtiError Deallocate(jvmtiEnv* env, unsigned char* mem); +}; + +} // namespace openjdkjvmti + +#endif // ART_RUNTIME_OPENJDKJVMTI_TI_ALLOCATOR_H_ + |