jdk-sandbox: comparison jdk/src/java.base/share/native/libjli/java.c

equal deleted inserted replaced

-:015dea372cb3
+:bac52fa6e617
 /*
-* Copyright (c) 1995, 2015, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 1995, 2016, 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
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.  Oracle designates this
 static const char *_launcher_name;
 static jboolean _is_java_args = JNI_FALSE;
 static jboolean _have_classpath = JNI_FALSE;
 static const char *_fVersion;
 static jboolean _wc_enabled = JNI_FALSE;
-static jint _ergo_policy = DEFAULT_POLICY;
 /*
 * Entries for splash screen environment variables.
 * putenv is performed in SelectVersion. We need
 * them in memory until UnsetEnv, so they are made static
 const char* pname,                      /* program name */
 const char* lname,                      /* launcher name */
 jboolean javaargs,                      /* JAVA_ARGS */
 jboolean cpwildcard,                    /* classpath wildcard*/
 jboolean javaw,                         /* windows-only javaw */
-jint ergo                               /* ergonomics class policy */
+jint ergo                               /* unused */
 )
 {
 int mode = LM_UNKNOWN;
 char *what = NULL;
 char *main_class = NULL;
 _fVersion = fullversion;
 _launcher_name = lname;
 _program_name = pname;
 _is_java_args = javaargs;
 _wc_enabled = cpwildcard;
-_ergo_policy = ergo;
 InitLauncher(javaw);
 DumpState();
 if (JLI_IsTraceLauncher()) {
 int i;
 PrintUsage(env, printXUsage);
 CHECK_EXCEPTION_LEAVE(1);
 LEAVE();
 }
-FreeKnownVMs();  /* after last possible PrintUsage() */
+FreeKnownVMs(); /* after last possible PrintUsage */
 if (JLI_IsTraceLauncher()) {
 end = CounterGet();
 JLI_TraceLauncher("%ld micro seconds to InitializeJVM\n",
 (long)(jint)Counter2Micros(end-start));
 *pargc = newArgvIdx;
 /* use the default VM type if not specified (no alias processing) */
 if (jvmtype == NULL) {
 char* result = knownVMs[0].name+1;
-/* Use a different VM type if we are on a server class machine? */
-if ((knownVMs[0].flag == VM_IF_SERVER_CLASS) &&
-(ServerClassMachine() == JNI_TRUE)) {
-result = knownVMs[0].server_class+1;
-}
 JLI_TraceLauncher("Default VM: %s\n", result);
 return result;
 }
 /* if using an alternate VM, no alias processing */
 jmethodID showSettingsID;
 jstring joptString;
 jclass cls = GetLauncherHelperClass(env);
 NULL_CHECK(cls);
 NULL_CHECK(showSettingsID = (*env)->GetStaticMethodID(env, cls,
-"showSettings", "(ZLjava/lang/String;JJJZ)V"));
+"showSettings", "(ZLjava/lang/String;JJJ)V"));
 NULL_CHECK(joptString = (*env)->NewStringUTF(env, optString));
 (*env)->CallStaticVoidMethod(env, cls, showSettingsID,
 USE_STDERR,
 joptString,
 (jlong)initialHeapSize,
 (jlong)maxHeapSize,
-(jlong)threadStackSize,
+(jlong)threadStackSize);
-ServerClassMachine());
 }
 /**
 * List modules supported by the runtime
 */
 * Prints default usage or the Xusage message, see sun.launcher.LauncherHelper.java
 */
 static void
 PrintUsage(JNIEnv* env, jboolean doXUsage)
 {
-jmethodID initHelp, vmSelect, vmSynonym, vmErgo, printHelp, printXUsageMessage;
+jmethodID initHelp, vmSelect, vmSynonym, printHelp, printXUsageMessage;
 jstring jprogname, vm1, vm2;
 int i;
 jclass cls = GetLauncherHelperClass(env);
 NULL_CHECK(cls);
 if (doXUsage) {
 "(Ljava/lang/String;Ljava/lang/String;)V"));
 NULL_CHECK(vmSynonym = (*env)->GetStaticMethodID(env, cls,
 "appendVmSynonymMessage",
 "(Ljava/lang/String;Ljava/lang/String;)V"));
-NULL_CHECK(vmErgo = (*env)->GetStaticMethodID(env, cls,
-"appendVmErgoMessage", "(ZLjava/lang/String;)V"));
 NULL_CHECK(printHelp = (*env)->GetStaticMethodID(env, cls,
 "printHelpMessage", "(Z)V"));
 NULL_CHECK(jprogname = (*env)->NewStringUTF(env, _program_name));
 (*env)->CallStaticVoidMethod(env, cls, initHelp, jprogname);
 CHECK_EXCEPTION_RETURN();
 /* Assemble the other variant part of the usage */
-if ((knownVMs[0].flag == VM_KNOWN) ||
-(knownVMs[0].flag == VM_IF_SERVER_CLASS)) {
-NULL_CHECK(vm1 = (*env)->NewStringUTF(env, knownVMs[0].name));
-NULL_CHECK(vm2 =  (*env)->NewStringUTF(env, knownVMs[0].name+1));
-(*env)->CallStaticVoidMethod(env, cls, vmSelect, vm1, vm2);
-CHECK_EXCEPTION_RETURN();
-}
 for (i=1; i<knownVMsCount; i++) {
 if (knownVMs[i].flag == VM_KNOWN) {
 NULL_CHECK(vm1 =  (*env)->NewStringUTF(env, knownVMs[i].name));
 NULL_CHECK(vm2 =  (*env)->NewStringUTF(env, knownVMs[i].name+1));
 (*env)->CallStaticVoidMethod(env, cls, vmSelect, vm1, vm2);
 NULL_CHECK(vm1 =  (*env)->NewStringUTF(env, knownVMs[i].name));
 NULL_CHECK(vm2 =  (*env)->NewStringUTF(env, knownVMs[i].alias+1));
 (*env)->CallStaticVoidMethod(env, cls, vmSynonym, vm1, vm2);
 CHECK_EXCEPTION_RETURN();
 }
-}
-/* The first known VM is the default */
-{
-jboolean isServerClassMachine = ServerClassMachine();
-const char* defaultVM  =  knownVMs[0].name+1;
-if ((knownVMs[0].flag == VM_IF_SERVER_CLASS) && isServerClassMachine) {
-defaultVM = knownVMs[0].server_class+1;
-}
-NULL_CHECK(vm1 =  (*env)->NewStringUTF(env, defaultVM));
-(*env)->CallStaticVoidMethod(env, cls, vmErgo, isServerClassMachine,  vm1);
-CHECK_EXCEPTION_RETURN();
 }
 /* Complete the usage message and print to stderr*/
 (*env)->CallStaticVoidMethod(env, cls, printHelp, USE_STDERR);
 }
 } else if (!JLI_StrCCmp(tmpPtr, "IGNORE")) {
 vmType = VM_IGNORE;
 } else if (!JLI_StrCCmp(tmpPtr, "ERROR")) {
 vmType = VM_ERROR;
 } else if (!JLI_StrCCmp(tmpPtr, "IF_SERVER_CLASS")) {
-tmpPtr += JLI_StrCSpn(tmpPtr, whiteSpace);
+/* ignored */
-if (*tmpPtr != 0) {
-tmpPtr += JLI_StrSpn(tmpPtr, whiteSpace);
-}
-if (*tmpPtr == 0) {
-JLI_ReportErrorMessage(CFG_WARN4, lineno, jvmCfgName);
-} else {
-/* Null terminate server class VM name */
-serverClassVMName = tmpPtr;
-tmpPtr += JLI_StrCSpn(tmpPtr, whiteSpace);
-*tmpPtr = 0;
-vmType = VM_IF_SERVER_CLASS;
-}
 } else {
 JLI_ReportErrorMessage(CFG_WARN5, lineno, &jvmCfgName[0]);
 vmType = VM_KNOWN;
 }
 }
 case VM_ALIASED_TO:
 knownVMs[cnt].alias = JLI_StringDup(altVMName);
 JLI_TraceLauncher("    name: %s  vmType: %s  alias: %s\n",
 knownVMs[cnt].name, "VM_ALIASED_TO", knownVMs[cnt].alias);
 break;
-case VM_IF_SERVER_CLASS:
-knownVMs[cnt].server_class = JLI_StringDup(serverClassVMName);
-JLI_TraceLauncher("    name: %s  vmType: %s  server_class: %s\n",
-knownVMs[cnt].name, "VM_IF_SERVER_CLASS", knownVMs[cnt].server_class);
-break;
 }
 cnt++;
 }
 }
 fclose(jvmCfg);
 const char*
 GetLauncherName()
 {
 return _launcher_name;
-}
-jint
-GetErgoPolicy()
-{
-return _ergo_policy;
 }
 jboolean
 IsJavaArgs()
 {
 printf("\tjavargs:%s\n", (_is_java_args == JNI_TRUE) ? "on" : "off");
 printf("\tprogram name:%s\n", GetProgramName());
 printf("\tlauncher name:%s\n", GetLauncherName());
 printf("\tjavaw:%s\n", (IsJavaw() == JNI_TRUE) ? "on" : "off");
 printf("\tfullversion:%s\n", GetFullVersion());
-printf("\tergo_policy:");
-switch(GetErgoPolicy()) {
-case NEVER_SERVER_CLASS:
-printf("NEVER_ACT_AS_A_SERVER_CLASS_MACHINE\n");
-break;
-case ALWAYS_SERVER_CLASS:
-printf("ALWAYS_ACT_AS_A_SERVER_CLASS_MACHINE\n");
-break;
-default:
-printf("DEFAULT_ERGONOMICS_POLICY\n");
-}
 }
 /*
 * Return JNI_TRUE for an option string that has no effect but should
 * _not_ be passed on to the vm; return JNI_FALSE otherwise.  On

changeset 41966	bac52fa6e617
parent 41814	a0333150713e
child 42338	a60f280f803c