stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Serguei Spitsyn 2017-10-17 23:05:35 +00:00
commit 4073e46a77
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/hotspot/jtreg/serviceability/jvmti/ModuleAwareAgents/ClassFileLoadHook/libMAAClassFileLoadHook.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -137,6 +137,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
jvmtiEventCallbacks callbacks; jvmtiEventCallbacks callbacks;
jvmtiError err; jvmtiError err;
printf("agent options: %s\n", options);
if (options != NULL) { if (options != NULL) {
if (strstr(options, "with_early_vmstart") != NULL) { if (strstr(options, "with_early_vmstart") != NULL) {
with_early_vm_start_capability = JNI_TRUE; with_early_vm_start_capability = JNI_TRUE;
@ -205,9 +206,9 @@ Java_MAAClassFileLoadHook_check(JNIEnv *env, jclass cls) {
} }
/* /*
* Expecting that we always get ClassFileLoadHook events in the VM Start phase. * Expecting ClassFileLoadHook events in the VM Start phase if early_vm_start is enabled.
*/ */
if (cflh_events_vm_start_count == 0) { if (with_early_vm_start_capability == JNI_TRUE && cflh_events_vm_start_count == 0) {
throw_exc(env, "Didn't get ClassFileLoadHook events in start phase!\n"); throw_exc(env, "Didn't get ClassFileLoadHook events in start phase!\n");
return FAILED; return FAILED;
} }