Skip to content

8342860: Fix more NULL usage backsliding #21826

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

8342860: Fix more NULL usage backsliding #21826

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
baa31f7
8342860: Fix more NULL usage backsliding
theoweidmannoracle Nov 1, 2024
afb592f
Fix copyright year
theoweidmannoracle Nov 5, 2024
9754145
Merge branch 'openjdk:master' into JDK-8342860
theoweidmannoracle Nov 5, 2024
e79b7bd
Fix backslides in test
theoweidmannoracle Nov 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions test/hotspot/jtreg/serviceability/jvmti/GetMethodDeclaringClass/libTestUnloadedClass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,24 +39,24 @@ static std::atomic<jmethodID> ring_buffer[BUFFER_SIZE];

void get_method_details(jmethodID method) {
jclass method_class;
char *class_name = NULL;
char *class_name = nullptr;
if (_jvmti->GetMethodDeclaringClass(method, &method_class) == JVMTI_ERROR_NONE) {
if (_jvmti->GetClassSignature(method_class, &class_name, NULL) == JVMTI_ERROR_NONE) {
if (_jvmti->GetClassSignature(method_class, &class_name, nullptr) == JVMTI_ERROR_NONE) {
_jvmti->Deallocate((unsigned char *)class_name);
}
}
}

void* read_ringbuffer(void* arg) {
JNIEnv *env;
_jvm->AttachCurrentThreadAsDaemon((void **)&env, NULL);
_jvm->AttachCurrentThreadAsDaemon((void **)&env, nullptr);
for (;;) {
jmethodID id = ring_buffer[rand() % BUFFER_SIZE].load(std::memory_order_relaxed);
if (id != (jmethodID)0) {
get_method_details(id);
}
}
return NULL;
return nullptr;
}

static void JNICALL ClassPrepareCallback(jvmtiEnv *jvmti_env,
Expand All @@ -66,8 +66,8 @@ static void JNICALL ClassPrepareCallback(jvmtiEnv *jvmti_env,
static bool reader_created = false;
static int ring_buffer_idx = 0;

char *class_name = NULL;
if (jvmti_env->GetClassSignature(klass, &class_name, NULL) != JVMTI_ERROR_NONE) {
char *class_name = nullptr;
if (jvmti_env->GetClassSignature(klass, &class_name, nullptr) != JVMTI_ERROR_NONE) {
return;
}
// We only care MyClass and only one thread loads it
Expand All @@ -79,7 +79,7 @@ static void JNICALL ClassPrepareCallback(jvmtiEnv *jvmti_env,

if (!reader_created) {
pthread_t tid;
pthread_create(&tid, NULL, read_ringbuffer, NULL);
pthread_create(&tid, nullptr, read_ringbuffer, nullptr);
reader_created = true;
}

Expand Down Expand Up @@ -119,7 +119,7 @@ JNIEXPORT jint JNICALL Agent_OnLoad(JavaVM *jvm, char *options, void *reserved)
}

// Enable the ClassPrepare event
error = _jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_CLASS_PREPARE, NULL);
error = _jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_CLASS_PREPARE, nullptr);
if (error != JVMTI_ERROR_NONE) {
fprintf(stderr, "Error enabling ClassPrepare event: %d\n", error);
return JNI_ERR;
Expand Down
4 changes: 2 additions & 2 deletions test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadEventTest/libVThreadEventTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,13 +118,13 @@ Agent_OnAttach(JavaVM *vm, char *options, void *reserved) {
}

clazz = env->FindClass("VThreadEventTest");
if (clazz == NULL) {
if (clazz == nullptr) {
LOG("FindClass failed\n");
return JNI_ERR;
}

mid = env->GetStaticMethodID(clazz, "agentStarted", "()V");
if (mid == NULL) {
if (mid == nullptr) {
LOG("GetStaticMethodID failed\n");
return JNI_ERR;
}
Expand Down