--- a/src/jdk.jpackage/share/native/libapplauncher/JavaVirtualMachine.cpp Wed Nov 06 07:20:07 2019 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,318 +0,0 @@
-/*
- * Copyright (c) 2014, 2019, 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
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-#include "JavaVirtualMachine.h"
-#include "Platform.h"
-#include "PlatformString.h"
-#include "FilePath.h"
-#include "Package.h"
-#include "Helpers.h"
-#include "Messages.h"
-#include "Macros.h"
-
-#include "jni.h"
-
-#include <map>
-#include <list>
-#include <sstream>
-
-
-bool RunVM() {
- JavaVirtualMachine javavm;
-
- bool result = javavm.StartJVM();
-
- if (!result) {
- Platform& platform = Platform::GetInstance();
- platform.ShowMessage(_T("Failed to launch JVM\n"));
- }
-
- return result;
-}
-
-//----------------------------------------------------------------------------
-
-JavaOptions::JavaOptions(): FOptions(NULL) {
-}
-
-JavaOptions::~JavaOptions() {
- if (FOptions != NULL) {
- for (unsigned int index = 0; index < GetCount(); index++) {
- delete[] FOptions[index].optionString;
- }
-
- delete[] FOptions;
- }
-}
-
-void JavaOptions::AppendValue(const TString Key, TString Value, void* Extra) {
- JavaOptionItem item;
- item.name = Key;
- item.value = Value;
- item.extraInfo = Extra;
- FItems.push_back(item);
-}
-
-void JavaOptions::AppendValue(const TString Key, TString Value) {
- AppendValue(Key, Value, NULL);
-}
-
-void JavaOptions::AppendValue(const TString Key) {
- AppendValue(Key, _T(""), NULL);
-}
-
-void JavaOptions::AppendValues(OrderedMap<TString, TString> Values) {
- if (Values.GetAllowDuplicates()) {
- for (int i = 0; i < (int)Values.Count(); i++) {
- TString name, value;
-
- bool bResult = Values.GetKey(i, name);
- bResult &= Values.GetValue(i, value);
-
- if (bResult) {
- AppendValue(name, value);
- }
- }
- } else { // In case we asked to add values from OrderedMap with allow
- // duplicates set to false. Not used now, but should avoid possible
- // bugs.
- std::vector<TString> orderedKeys = Values.GetKeys();
-
- for (std::vector<TString>::const_iterator iterator = orderedKeys.begin();
- iterator != orderedKeys.end(); iterator++) {
- TString name = *iterator;
- TString value;
-
- if (Values.GetValue(name, value) == true) {
- AppendValue(name, value);
- }
- }
- }
-}
-
-void JavaOptions::ReplaceValue(const TString Key, TString Value) {
- for (std::list<JavaOptionItem>::iterator iterator = FItems.begin();
- iterator != FItems.end(); iterator++) {
-
- TString lkey = iterator->name;
-
- if (lkey == Key) {
- JavaOptionItem item = *iterator;
- item.value = Value;
- iterator = FItems.erase(iterator);
- FItems.insert(iterator, item);
- break;
- }
- }
-}
-
-std::list<TString> JavaOptions::ToList() {
- std::list<TString> result;
- Macros& macros = Macros::GetInstance();
-
- for (std::list<JavaOptionItem>::const_iterator iterator = FItems.begin();
- iterator != FItems.end(); iterator++) {
- TString key = iterator->name;
- TString value = iterator->value;
- TString option = Helpers::NameValueToString(key, value);
- option = macros.ExpandMacros(option);
- result.push_back(option);
- }
-
- return result;
-}
-
-size_t JavaOptions::GetCount() {
- return FItems.size();
-}
-
-//----------------------------------------------------------------------------
-
-JavaVirtualMachine::JavaVirtualMachine() {
-}
-
-JavaVirtualMachine::~JavaVirtualMachine(void) {
-}
-
-bool JavaVirtualMachine::StartJVM() {
- Platform& platform = Platform::GetInstance();
- Package& package = Package::GetInstance();
-
- TString classpath = package.GetClassPath();
- TString modulepath = package.GetModulePath();
- JavaOptions options;
-
- if (modulepath.empty() == false) {
- options.AppendValue(_T("-Djava.module.path"), modulepath);
- }
-
- options.AppendValue(_T("-Djava.library.path"),
- package.GetPackageAppDirectory() + FilePath::PathSeparator()
- + package.GetPackageLauncherDirectory());
- options.AppendValue(
- _T("-Djava.launcher.path"), package.GetPackageLauncherDirectory());
- options.AppendValues(package.GetJavaOptions());
-
-#ifdef DEBUG
- if (package.Debugging() == dsJava) {
- options.AppendValue(_T("-Xdebug"), _T(""));
- options.AppendValue(
- _T("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=localhost:5005"),
- _T(""));
- platform.ShowMessage(_T("localhost:5005"));
- }
-#endif // DEBUG
-
- TString maxHeapSizeOption;
- TString minHeapSizeOption;
-
-
- if (package.GetMemoryState() == PackageBootFields::msAuto) {
- TPlatformNumber memorySize = package.GetMemorySize();
- TString memory =
- PlatformString((size_t)memorySize).toString() + _T("m");
- maxHeapSizeOption = TString(_T("-Xmx")) + memory;
- options.AppendValue(maxHeapSizeOption, _T(""));
-
- if (memorySize > 256)
- minHeapSizeOption = _T("-Xms256m");
- else
- minHeapSizeOption = _T("-Xms") + memory;
-
- options.AppendValue(minHeapSizeOption, _T(""));
- }
-
- TString mainClassName = package.GetMainClassName();
- TString mainModule = package.GetMainModule();
-
- if (mainClassName.empty() == true && mainModule.empty() == true) {
- Messages& messages = Messages::GetInstance();
- platform.ShowMessage(messages.GetMessage(NO_MAIN_CLASS_SPECIFIED));
- return false;
- }
-
- configureLibrary();
-
- // Initialize the arguments to JLI_Launch()
- //
- // On Mac OS X JLI_Launch spawns a new thread that actually starts the JVM.
- // This new thread simply re-runs main(argc, argv). Therefore we do not
- // want to add new args if we are still in the original main thread so we
- // will treat them as command line args provided by the user ...
- // Only propagate original set of args first time.
-
- options.AppendValue(_T("-classpath"));
- options.AppendValue(classpath);
-
- std::list<TString> vmargs;
- vmargs.push_back(package.GetCommandName());
-
- if (package.HasSplashScreen() == true) {
- options.AppendValue(TString(_T("-splash:"))
- + package.GetSplashScreenFileName(), _T(""));
- }
-
- if (mainModule.empty() == true) {
- options.AppendValue(Helpers::ConvertJavaPathToId(mainClassName),
- _T(""));
- } else {
- options.AppendValue(_T("-m"));
- options.AppendValue(mainModule);
- }
-
- return launchVM(options, vmargs);
-}
-
-void JavaVirtualMachine::configureLibrary() {
- Platform& platform = Platform::GetInstance();
- Package& package = Package::GetInstance();
- TString libName = package.GetJavaLibraryFileName();
- platform.addPlatformDependencies(&javaLibrary);
- javaLibrary.Load(libName);
-}
-
-bool JavaVirtualMachine::launchVM(JavaOptions& options,
- std::list<TString>& vmargs) {
- Platform& platform = Platform::GetInstance();
- Package& package = Package::GetInstance();
-
-#ifdef MAC
- // Mac adds a ProcessSerialNumber to args when launched from .app
- // filter out the psn since they it's not expected in the app
- if (platform.IsMainThread() == false) {
- std::list<TString> loptions = options.ToList();
- vmargs.splice(vmargs.end(), loptions,
- loptions.begin(), loptions.end());
- }
-#else
- std::list<TString> loptions = options.ToList();
- vmargs.splice(vmargs.end(), loptions, loptions.begin(), loptions.end());
-#endif
-
- std::list<TString> largs = package.GetArgs();
- vmargs.splice(vmargs.end(), largs, largs.begin(), largs.end());
-
- size_t argc = vmargs.size();
- DynamicBuffer<char*> argv(argc + 1);
- if (argv.GetData() == NULL) {
- return false;
- }
-
- unsigned int index = 0;
- for (std::list<TString>::const_iterator iterator = vmargs.begin();
- iterator != vmargs.end(); iterator++) {
- TString item = *iterator;
- std::string arg = PlatformString(item).toStdString();
-#ifdef DEBUG
- printf("%i %s\n", index, arg.c_str());
-#endif // DEBUG
- argv[index] = PlatformString::duplicate(arg.c_str());
- index++;
- }
-
- argv[argc] = NULL;
-
-// On Mac we can only free the boot fields if the calling thread is
-// not the main thread.
-#ifdef MAC
- if (platform.IsMainThread() == false) {
- package.FreeBootFields();
- }
-#else
- package.FreeBootFields();
-#endif // MAC
-
- if (javaLibrary.JavaVMCreate(argc, argv.GetData()) == true) {
- return true;
- }
-
- for (index = 0; index < argc; index++) {
- if (argv[index] != NULL) {
- delete[] argv[index];
- }
- }
-
- return false;
-}