jdk-sandbox: comparison src/jdk.packager/share/native/library/common/JavaVirtualMachine.cpp

equal deleted inserted replaced

-:eaca4369b068
+:e094d5483bd6
 #include "JavaVirtualMachine.h"
 #include "Platform.h"
 #include "PlatformString.h"
 #include "FilePath.h"
 #include "Package.h"
-#include "Java.h"
+#include "JavaTypes.h"
 #include "Helpers.h"
 #include "Messages.h"
 #include "Macros.h"
 #include "PlatformThread.h"
 }
 if (FCreateProc == NULL) {
 Platform& platform = Platform::GetInstance();
 Messages& messages = Messages::GetInstance();
-platform.ShowMessage(messages.GetMessage(FAILED_LOCATING_JVM_ENTRY_POINT));
+platform.ShowMessage(
+messages.GetMessage(FAILED_LOCATING_JVM_ENTRY_POINT));
 return false;
 }
 return FCreateProc((int)argc, argv,
 0, NULL,
 false,
 false,
 0) == 0;
 }
-//--------------------------------------------------------------------------------------------------
+//----------------------------------------------------------------------------
 JavaOptions::JavaOptions(): FOptions(NULL) {
 }
 JavaOptions::~JavaOptions() {
 size_t JavaOptions::GetCount() {
 return FItems.size();
 }
-// jvmuserargs can have a trailing equals in the key. This needs to be removed to use
+// jvmuserargs can have a trailing equals in the key. This needs to be
-// other parts of the launcher.
+// removed to use other parts of the launcher.
-OrderedMap<TString, TString> RemoveTrailingEquals(OrderedMap<TString, TString> Map) {
+OrderedMap<TString, TString> RemoveTrailingEquals(
+OrderedMap<TString, TString> Map) {
 OrderedMap<TString, TString> result;
 std::vector<TString> keys = Map.GetKeys();
 for (size_t index = 0; index < keys.size(); index++) {
 TString name = keys[index];
 TString value;
 if (Map.GetValue(name, value) == true) {
-// If the last character of the key is an equals, then remove it. If there is no
+// If the last character of the key is an equals, then remove it.
-// equals then combine the two as a key.
+// If there is no equals then combine the two as a key.
 TString::iterator i = name.end();
 i--;
 if (*i == '=') {
 name = name.substr(0, name.size() - 1);
 }
 return result;
 }
-//--------------------------------------------------------------------------------------------------
+//----------------------------------------------------------------------------
 JavaVirtualMachine::JavaVirtualMachine() {
 }
 JavaVirtualMachine::~JavaVirtualMachine(void) {
 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.library.path"),
-options.AppendValue(_T("-Djava.launcher.path"), package.GetPackageLauncherDirectory());
+package.GetPackageAppDirectory() + FilePath::PathSeparator()
++ package.GetPackageLauncherDirectory());
+options.AppendValue(
+_T("-Djava.launcher.path"), package.GetPackageLauncherDirectory());
 options.AppendValue(_T("-Dapp.preferences.id"), package.GetAppID());
 options.AppendValues(package.GetJVMArgs());
 options.AppendValues(RemoveTrailingEquals(package.GetJVMUserArgs()));
 #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(""));
+options.AppendValue(
+_T("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=localhost:5005"),
+_T(""));
 platform.ShowMessage(_T("localhost:5005"));
 }
-#endif //DEBUG
+#endif // DEBUG
 TString maxHeapSizeOption;
 TString minHeapSizeOption;
 if (package.GetMemoryState() == PackageBootFields::msAuto) {
 TPlatformNumber memorySize = package.GetMemorySize();
-TString memory = PlatformString((size_t)memorySize).toString() + _T("m");
+TString memory =
+PlatformString((size_t)memorySize).toString() + _T("m");
 maxHeapSizeOption = TString(_T("-Xmx")) + memory;
 options.AppendValue(maxHeapSizeOption, _T(""));
 if (memorySize > 256)
 minHeapSizeOption = _T("-Xms256m");
 configureLibrary();
 // Initialize the arguments to JLI_Launch()
 //
-// On Mac OS X JLI_Launch spawns a new thread that actually starts the JVM. This
+// On Mac OS X JLI_Launch spawns a new thread that actually starts the JVM.
-// new thread simply re-runs main(argc, argv). Therefore we do not want
+// This new thread simply re-runs main(argc, argv). Therefore we do not
-// to add new args if we are still in the original main thread so we
+// 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(""));
+options.AppendValue(TString(_T("-splash:"))
++ package.GetSplashScreenFileName(), _T(""));
 }
 if (mainModule.empty() == true) {
-options.AppendValue(Helpers::ConvertJavaPathToId(mainClassName), _T(""));
+options.AppendValue(Helpers::ConvertJavaPathToId(mainClassName),
-}
+_T(""));
-else {
+} else {
 options.AppendValue(_T("-m"));
 options.AppendValue(mainModule);
 }
 return launchVM(options, vmargs, false);
 std::list<TString> vmargs;
 vmargs.push_back(package.GetCommandName());
 JavaOptions options;
-options.AppendValue(_T("-Djava.library.path"), package.GetPackageAppDirectory()
+options.AppendValue(_T("-Djava.library.path"),
-+ FilePath::PathSeparator() + package.GetPackageLauncherDirectory());
+package.GetPackageAppDirectory() + FilePath::PathSeparator()
-options.AppendValue(_T("-Djava.launcher.path"), package.GetPackageLauncherDirectory());
++ package.GetPackageLauncherDirectory());
-// launch SingleInstanceNewActivation.main() to pass arguments to another instance
+options.AppendValue(_T("-Djava.launcher.path"),
+package.GetPackageLauncherDirectory());
+// launch SingleInstanceNewActivation.main() to pass arguments to
+// another instance
 options.AppendValue(_T("-m"));
-options.AppendValue(_T("jdk.packager.services/jdk.packager.services.singleton.SingleInstanceNewActivation"));
+options.AppendValue(
+_T("jdk.packager.services/jdk.packager.services.singleton.SingleInstanceNewActivation"));
 configureLibrary();
 return launchVM(options, vmargs, true);
 }
 void JavaVirtualMachine::configureLibrary() {
 Platform& platform = Platform::GetInstance();
 Package& package = Package::GetInstance();
-// TODO: Clean this up. Because of bug JDK-8131321 the opening of the PE file
+// TODO: Clean this up. Because of bug JDK-8131321 the opening of the
-// fails in WindowsPlatform.cpp on the check to
+// PE file ails in WindowsPlatform.cpp on the check to
 // if (pNTHeader->Signature == IMAGE_NT_SIGNATURE)
 TString libName = package.GetJVMLibraryFileName();
 #ifdef _WIN64
 if (FilePath::FileExists(_T("msvcr100.dll")) == true) {
 javaLibrary.AddDependency(_T("msvcr100.dll"));
 }
 #else
 javaLibrary.AddDependencies(
-platform.FilterOutRuntimeDependenciesForPlatform(platform.GetLibraryImports(libName)));
+platform.FilterOutRuntimeDependenciesForPlatform(
+platform.GetLibraryImports(libName)));
 #endif
 javaLibrary.Load(libName);
 }
-bool JavaVirtualMachine::launchVM(JavaOptions& options, std::list<TString>& vmargs, bool addSiProcessId) {
+bool JavaVirtualMachine::launchVM(JavaOptions& options,
+std::list<TString>& vmargs, bool addSiProcessId) {
 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());
+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
 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
+#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.
+// 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
+#endif // MAC
 if (javaLibrary.JavaVMCreate(argc, argv.GetData()) == true) {
 return true;
 }

branch	JDK-8200758-branch
changeset 56982	e094d5483bd6
parent 56854	aedce3eaaf17
child 56983	01decb67d4f0