archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-21 19:44:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8231171: remove remaining sun.java.launcher.pid references

Browse source 
Reviewed-by: alanb, dholmes
This commit is contained in:
Matthias Baesken 2019-09-20 10:28:48 +02:00
parent bb56c020f4
commit e2ebf7b822
9 changed files with 6 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/java.base/macosx/native/libjli/java_md_macosx.m
View file

@ -757,10 +757,6 @@ CallJavaMainInNewThread(jlong stack_size, void* args) {
return rslt;
}
void SetJavaLauncherPlatformProps() {
/* Linux only */
}
static JavaVM* jvmInstance = NULL;
static jboolean sameThread = JNI_FALSE; /* start VM in current thread */

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

@ -338,9 +338,6 @@ JLI_Launch(int argc, char ** argv, /* main argc, argv */
/* Set the -Dsun.java.launcher pseudo property */
SetJavaLauncherProp();
/* set the -Dsun.java.launcher.* platform properties */
SetJavaLauncherPlatformProps();
return JVMInit(&ifn, threadStackSize, argc, argv, mode, what, ret);
}
/*

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

@ -161,7 +161,6 @@ void PrintMachineDependentOptions();
int CallJavaMainInNewThread(jlong stack_size, void* args);
/* sun.java.launcher.* platform properties. */
void SetJavaLauncherPlatformProps(void);
void SetJavaCommandLineProp(char* what, int argc, char** argv);
void SetJavaLauncherProp(void);

10
src/java.base/unix/native/libjli/java_md_solinux.c
View file

@ -790,16 +790,6 @@ CallJavaMainInNewThread(jlong stack_size, void* args) {
/* Coarse estimation of number of digits assuming the worst case is a 64-bit pid. */
#define MAX_PID_STR_SZ 20
void SetJavaLauncherPlatformProps() {
/* Linux only */
#ifdef __linux__
const char *substr = "-Dsun.java.launcher.pid=";
char *pid_prop_str = (char *)JLI_MemAlloc(JLI_StrLen(substr) + MAX_PID_STR_SZ + 1);
sprintf(pid_prop_str, "%s%d", substr, getpid());
AddOption(pid_prop_str, NULL);
#endif /* __linux__ */
}
int
JVMInit(InvocationFunctions* ifn, jlong threadStackSize,
int argc, char **argv,

3
src/java.base/windows/native/libjli/java_md.c
View file

@ -803,9 +803,6 @@ CallJavaMainInNewThread(jlong stack_size, void* args) {
return rslt;
}
/* Unix only, empty on windows. */
void SetJavaLauncherPlatformProps() {}
/*
* The implementation for finding classes from the bootstrap
* class loader, refer to java.h