archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 07:14:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8245600: Clean up libjli

Browse source 
Reviewed-by: dholmes, alanb
This commit is contained in:
Mikael Vidstedt 2020-05-26 10:18:32 -07:00
parent 6aa15ad7ab
commit 44a0a08991
11 changed files with 47 additions and 161 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/java.base/share/native/libjli/java.c
View file

@ -292,7 +292,7 @@ JLI_Launch(int argc, char ** argv, /* main argc, argv */
ifn.GetDefaultJavaVMInitArgs = 0;
if (JLI_IsTraceLauncher()) {
start = CounterGet();
start = CurrentTimeMicros();
}
if (!LoadJavaVM(jvmpath, &ifn)) {
@ -300,11 +300,10 @@ JLI_Launch(int argc, char ** argv, /* main argc, argv */
}
if (JLI_IsTraceLauncher()) {
end = CounterGet();
end = CurrentTimeMicros();
}
JLI_TraceLauncher("%ld micro seconds to LoadJavaVM\n",
(long)(jint)Counter2Micros(end-start));
JLI_TraceLauncher("%ld micro seconds to LoadJavaVM\n", (long)(end-start));
++argv;
--argc;
@ -413,7 +412,7 @@ JavaMain(void* _args)
RegisterThread();
/* Initialize the virtual machine */
start = CounterGet();
start = CurrentTimeMicros();
if (!InitializeJVM(&vm, &env, &ifn)) {
JLI_ReportErrorMessage(JVM_ERROR1);
exit(1);
@ -467,9 +466,8 @@ JavaMain(void* _args)
FreeKnownVMs(); /* after last possible PrintUsage */
if (JLI_IsTraceLauncher()) {
end = CounterGet();
JLI_TraceLauncher("%ld micro seconds to InitializeJVM\n",
(long)(jint)Counter2Micros(end-start));
end = CurrentTimeMicros();
JLI_TraceLauncher("%ld micro seconds to InitializeJVM\n", (long)(end-start));
}
/* At this stage, argc/argv have the application's arguments */
@ -1622,7 +1620,7 @@ LoadMainClass(JNIEnv *env, int mode, char *name)
jclass cls = GetLauncherHelperClass(env);
NULL_CHECK0(cls);
if (JLI_IsTraceLauncher()) {
start = CounterGet();
start = CurrentTimeMicros();
}
NULL_CHECK0(mid = (*env)->GetStaticMethodID(env, cls,
"checkAndLoadMain",
@ -1633,9 +1631,8 @@ LoadMainClass(JNIEnv *env, int mode, char *name)
USE_STDERR, mode, str));
if (JLI_IsTraceLauncher()) {
end = CounterGet();
printf("%ld micro seconds to load main class\n",
(long)(jint)Counter2Micros(end-start));
end = CurrentTimeMicros();
printf("%ld micro seconds to load main class\n", (long)(end-start));
printf("----%s----\n", JLDEBUG_ENV_ENTRY);
}
@ -2087,7 +2084,7 @@ ReadKnownVMs(const char *jvmCfgName, jboolean speculative)
char *serverClassVMName = NULL;
static char *whiteSpace = " \t";
if (JLI_IsTraceLauncher()) {
start = CounterGet();
start = CurrentTimeMicros();
}
jvmCfg = fopen(jvmCfgName, "r");
@ -2172,9 +2169,8 @@ ReadKnownVMs(const char *jvmCfgName, jboolean speculative)
knownVMsCount = cnt;
if (JLI_IsTraceLauncher()) {
end = CounterGet();
printf("%ld micro seconds to parse jvm.cfg\n",
(long)(jint)Counter2Micros(end-start));
end = CurrentTimeMicros();
printf("%ld micro seconds to parse jvm.cfg\n", (long)(end-start));
}
return cnt;

3
src/java.base/share/native/libjli/java.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2020, 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
@ -170,6 +170,7 @@ jint ReadKnownVMs(const char *jvmcfg, jboolean speculative);
char *CheckJvmType(int *argc, char ***argv, jboolean speculative);
void AddOption(char *str, void *info);
jboolean IsWhiteSpaceOption(const char* name);
jlong CurrentTimeMicros();
// Utility function defined in args.c
int isTerminalOpt(char *arg);