[metrics] Move metrics code to runtime
The background reporting thread is going to need tighter ties to the
Runtime object, so it makes sense to bring the rest of the metrics code
under runtime. Since these are mostly runtime metrics, this is a more
logical place for them anyway.
Test: m test-art-host-gtest-art_runtime_tests
Bug: 170149255
Change-Id: Ib425041c41a5283237af8dd9978582e605a89a31
diff --git a/libartbase/Android.bp b/libartbase/Android.bp
index 884989e..82064bd 100644
--- a/libartbase/Android.bp
+++ b/libartbase/Android.bp
@@ -42,7 +42,6 @@
"base/scoped_arena_allocator.cc",
"base/scoped_flock.cc",
"base/socket_peer_is_trusted.cc",
- "base/metrics.cc",
"base/time_utils.cc",
"base/unix_file/fd_file.cc",
"base/unix_file/random_access_file_utils.cc",
@@ -256,7 +255,6 @@
"base/membarrier_test.cc",
"base/memory_region_test.cc",
"base/mem_map_test.cc",
- "base/metrics_test.cc",
"base/safe_copy_test.cc",
"base/scoped_flock_test.cc",
"base/time_utils_test.cc",
diff --git a/runtime/Android.bp b/runtime/Android.bp
index 4b8022a..3b04177 100644
--- a/runtime/Android.bp
+++ b/runtime/Android.bp
@@ -155,6 +155,7 @@
"linear_alloc.cc",
"managed_stack.cc",
"method_handles.cc",
+ "metrics/metrics.cc",
"mirror/array.cc",
"mirror/class.cc",
"mirror/class_ext.cc",
@@ -693,6 +694,7 @@
"jni/java_vm_ext_test.cc",
"jni/jni_internal_test.cc",
"method_handles_test.cc",
+ "metrics/metrics_test.cc",
"mirror/dex_cache_test.cc",
"mirror/method_type_test.cc",
"mirror/object_test.cc",
diff --git a/libartbase/base/metrics.cc b/runtime/metrics/metrics.cc
similarity index 100%
rename from libartbase/base/metrics.cc
rename to runtime/metrics/metrics.cc
diff --git a/libartbase/base/metrics.h b/runtime/metrics/metrics.h
similarity index 98%
rename from libartbase/base/metrics.h
rename to runtime/metrics/metrics.h
index 24469c1..7156d57 100644
--- a/libartbase/base/metrics.h
+++ b/runtime/metrics/metrics.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_LIBARTBASE_BASE_METRICS_H_
-#define ART_LIBARTBASE_BASE_METRICS_H_
+#ifndef ART_RUNTIME_METRICS_METRICS_H_
+#define ART_RUNTIME_METRICS_METRICS_H_
#include <stdint.h>
@@ -366,4 +366,4 @@
#pragma clang diagnostic pop // -Wconversion
-#endif // ART_LIBARTBASE_BASE_METRICS_H_
+#endif // ART_RUNTIME_METRICS_METRICS_H_
diff --git a/libartbase/base/metrics_test.cc b/runtime/metrics/metrics_test.cc
similarity index 100%
rename from libartbase/base/metrics_test.cc
rename to runtime/metrics/metrics_test.cc
diff --git a/libartbase/base/metrics_test.h b/runtime/metrics/metrics_test.h
similarity index 95%
rename from libartbase/base/metrics_test.h
rename to runtime/metrics/metrics_test.h
index 0c6e99f..e074a50 100644
--- a/libartbase/base/metrics_test.h
+++ b/runtime/metrics/metrics_test.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_LIBARTBASE_BASE_METRICS_TEST_H_
-#define ART_LIBARTBASE_BASE_METRICS_TEST_H_
+#ifndef ART_RUNTIME_METRICS_METRICS_TEST_H_
+#define ART_RUNTIME_METRICS_METRICS_TEST_H_
#include "metrics.h"
@@ -82,4 +82,4 @@
#pragma clang diagnostic pop // -Wconversion
-#endif // ART_LIBARTBASE_BASE_METRICS_TEST_H_
+#endif // ART_RUNTIME_METRICS_METRICS_TEST_H_
diff --git a/runtime/runtime.h b/runtime/runtime.h
index e1f3909..7fd731e 100644
--- a/runtime/runtime.h
+++ b/runtime/runtime.h
@@ -30,7 +30,6 @@
#include "base/locks.h"
#include "base/macros.h"
#include "base/mem_map.h"
-#include "base/metrics.h"
#include "base/string_view_cpp20.h"
#include "compat_framework.h"
#include "deoptimization_kind.h"
@@ -41,6 +40,7 @@
#include "jdwp_provider.h"
#include "jni/jni_id_manager.h"
#include "jni_id_type.h"
+#include "metrics/metrics.h"
#include "obj_ptr.h"
#include "offsets.h"
#include "process_state.h"
diff --git a/runtime/verifier/method_verifier_test.cc b/runtime/verifier/method_verifier_test.cc
index 2e69b35..4234715 100644
--- a/runtime/verifier/method_verifier_test.cc
+++ b/runtime/verifier/method_verifier_test.cc
@@ -21,12 +21,12 @@
#include <memory>
#include "android-base/strings.h"
-#include "base/metrics_test.h"
#include "base/utils.h"
#include "class_linker-inl.h"
#include "class_verifier.h"
#include "common_runtime_test.h"
#include "dex/dex_file-inl.h"
+#include "metrics/metrics_test.h"
#include "scoped_thread_state_change-inl.h"
#include "verifier_enums.h"