Revert^2 "Make sure all runtime threads are in the System thread group."
This reverts commit 9ca8b2bf46978e3a5698f8a27b48aa7eff3514df.
The test 2005 exposed an ABA race which could cause the test to
sometimes fail with CHECK failures or GC corruption.
Reason for revert: Fixed issue causing ABA race in PreObjectAlloc with
test.
Test: ./test.py --host --debug-gc
Bug: 146178357
Change-Id: If265f765e0c1e692755904b4c40bbc718d98f065
diff --git a/test/2005-pause-all-redefine-multithreaded/pause-all.cc b/test/2005-pause-all-redefine-multithreaded/pause-all.cc
new file mode 100644
index 0000000..77df6e4
--- /dev/null
+++ b/test/2005-pause-all-redefine-multithreaded/pause-all.cc
@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <stdio.h>
+
+#include <vector>
+
+#include "android-base/logging.h"
+#include "android-base/macros.h"
+#include "jni.h"
+#include "jvmti.h"
+
+// Test infrastructure
+#include "jvmti_helper.h"
+#include "scoped_local_ref.h"
+#include "test_env.h"
+
+namespace art {
+namespace Test2005PauseAllRedefineMultithreaded {
+
+static constexpr jlong kRedefinedObjectTag = 0xDEADBEEF;
+
+extern "C" JNIEXPORT void JNICALL
+Java_art_Test2005_UpdateFieldValuesAndResumeThreads(JNIEnv* env,
+ jclass klass ATTRIBUTE_UNUSED,
+ jobjectArray threads_arr,
+ jclass redefined_class,
+ jobjectArray new_fields,
+ jstring default_val) {
+ std::vector<jthread> threads;
+ for (jint i = 0; i < env->GetArrayLength(threads_arr); i++) {
+ threads.push_back(env->GetObjectArrayElement(threads_arr, i));
+ }
+ std::vector<jfieldID> fields;
+ for (jint i = 0; i < env->GetArrayLength(new_fields); i++) {
+ fields.push_back(env->FromReflectedField(env->GetObjectArrayElement(new_fields, i)));
+ }
+ // Tag every instance of the redefined class with kRedefinedObjectTag
+ CHECK_EQ(jvmti_env->IterateOverInstancesOfClass(
+ redefined_class,
+ JVMTI_HEAP_OBJECT_EITHER,
+ [](jlong class_tag ATTRIBUTE_UNUSED,
+ jlong size ATTRIBUTE_UNUSED,
+ jlong* tag_ptr,
+ void* user_data ATTRIBUTE_UNUSED) -> jvmtiIterationControl {
+ *tag_ptr = kRedefinedObjectTag;
+ return JVMTI_ITERATION_CONTINUE;
+ },
+ nullptr),
+ JVMTI_ERROR_NONE);
+ jobject* objs;
+ jint cnt;
+ // Get the objects.
+ CHECK_EQ(jvmti_env->GetObjectsWithTags(1, &kRedefinedObjectTag, &cnt, &objs, nullptr),
+ JVMTI_ERROR_NONE);
+ // Set every field that's null
+ for (jint i = 0; i < cnt; i++) {
+ jobject obj = objs[i];
+ for (jfieldID field : fields) {
+ if (ScopedLocalRef<jobject>(env, env->GetObjectField(obj, field)).get() == nullptr) {
+ env->SetObjectField(obj, field, default_val);
+ }
+ }
+ }
+ LOG(INFO) << "Setting " << cnt << " objects with default values";
+ if (!threads.empty()) {
+ std::vector<jvmtiError> errs(threads.size(), JVMTI_ERROR_NONE);
+ CHECK_EQ(jvmti_env->ResumeThreadList(threads.size(), threads.data(), errs.data()),
+ JVMTI_ERROR_NONE);
+ }
+ jvmti_env->Deallocate(reinterpret_cast<unsigned char*>(objs));
+}
+
+} // namespace Test2005PauseAllRedefineMultithreaded
+} // namespace art