X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbin%2FLauncher.java;h=6bf35551a5f826f5bba5ba70d21920e83d4a940e;hb=8d55494f762adc45e799ea38ebb33ec2e3f73b10;hp=9957a40dfb33759c4da94f5a9b3f6a49bbf9ec3d;hpb=8988e5070bf882959c09e325789c84f5ef4e1832;p=jalview.git
diff --git a/src/jalview/bin/Launcher.java b/src/jalview/bin/Launcher.java
index 9957a40..6bf3555 100644
--- a/src/jalview/bin/Launcher.java
+++ b/src/jalview/bin/Launcher.java
@@ -1,27 +1,73 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ *
+ * This file is part of Jalview.
+ *
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * Jalview 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 for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
package jalview.bin;
import java.io.File;
import java.io.IOException;
import java.lang.management.ManagementFactory;
import java.util.ArrayList;
-
+import java.util.List;
+
+import jalview.util.ChannelProperties;
+
+/**
+ * A Launcher class for Jalview. This class is used to launch Jalview from the
+ * shadowJar when Getdown is not used or available. It attempts to take all the
+ * command line arguments to pass on to the jalview.bin.Jalview class, but to
+ * insert a -Xmx memory setting to a sensible default, using the -jvmmempc and
+ * -jvmmemmax application arguments if specified. If not specified then system
+ * properties will be looked for by jalview.bin.MemorySetting. If the user has
+ * provided the JVM with a -Xmx setting directly and not set -jvmmempc or
+ * -jvmmemmax then this setting will be used and system properties ignored. If
+ * -Xmx is set as well as -jvmmempc or -jvmmemmax as argument(s) then the -Xmx
+ * argument will NOT be passed on to the main application launch.
+ *
+ * @author bsoares
+ *
+ */
public class Launcher
{
-
private final static String startClass = "jalview.bin.Jalview";
- private final static int maxHeapSizePerCent = 90;
-
- private final static String dockIconPath = "JalviewLogo_Huge.png";
-
+ private final static String dockIconPath = ChannelProperties
+ .getProperty("logo.512");
+
+ /**
+ * main method for jalview.bin.Launcher. This restarts the same JRE's JVM with
+ * the same arguments but with memory adjusted based on extracted -jvmmempc
+ * and -jvmmemmax application arguments. If on a Mac then extra dock:icon and
+ * dock:name arguments are also set.
+ *
+ * @param args
+ */
public static void main(String[] args)
{
final String javaBin = System.getProperty("java.home") + File.separator
+ "bin" + File.separator + "java";
- ArrayList command = new ArrayList<>();
+ List command = new ArrayList<>();
command.add(javaBin);
+ String memSetting = null;
+
boolean isAMac = System.getProperty("os.name").indexOf("Mac") > -1;
for (String jvmArg : ManagementFactory.getRuntimeMXBean()
@@ -31,22 +77,48 @@ public class Launcher
}
command.add("-cp");
command.add(ManagementFactory.getRuntimeMXBean().getClassPath());
+
+ String jvmmempc = null;
+ String jvmmemmax = null;
ArrayList arguments = new ArrayList<>();
for (String arg : args)
{
- arguments.add(arg);
+ // jvmmempc and jvmmemmax args used to set memory and are not passed on to
+ // startClass
+ if (arg.startsWith(
+ "-" + MemorySetting.MAX_HEAPSIZE_PERCENT_PROPERTY_NAME + "="))
+ {
+ jvmmempc = arg.substring(
+ MemorySetting.MAX_HEAPSIZE_PERCENT_PROPERTY_NAME.length()
+ + 2);
+ }
+ else if (arg.startsWith(
+ "-" + MemorySetting.MAX_HEAPSIZE_PROPERTY_NAME + "="))
+ {
+ jvmmemmax = arg.substring(
+ MemorySetting.MAX_HEAPSIZE_PROPERTY_NAME.length() + 2);
+ }
+ else
+ {
+ arguments.add(arg);
+ }
}
// add memory setting if not specified
boolean memSet = false;
boolean dockIcon = false;
boolean dockName = false;
- ARG: for (int i = 0; i < command.size(); i++)
+ for (int i = 0; i < command.size(); i++)
{
String arg = command.get(i);
if (arg.startsWith("-Xmx"))
{
- memSet = true;
+ // only use -Xmx if jvmmemmax and jvmmempc have not been set
+ if (jvmmempc == null && jvmmemmax == null)
+ {
+ memSetting = arg;
+ memSet = true;
+ }
}
else if (arg.startsWith("-Xdock:icon"))
{
@@ -60,22 +132,13 @@ public class Launcher
if (!memSet)
{
- long maxMemLong = -1;
-
- try
- {
- maxMemLong = MemorySetting.memPercent(maxHeapSizePerCent);
- } catch (Exception e)
- {
- e.printStackTrace();
- } catch (Throwable t)
- {
- t.printStackTrace();
- }
+ long maxMemLong = MemorySetting.getMemorySetting(jvmmemmax, jvmmempc);
if (maxMemLong > 0)
{
- command.add("-Xmx" + Long.toString(maxMemLong));
+ memSetting = "-Xmx" + Long.toString(maxMemLong);
+ memSet = true;
+ command.add(memSetting);
}
}
@@ -89,17 +152,30 @@ public class Launcher
{
// -Xdock:name=... doesn't actually work :(
// Leaving it in in case it gets fixed
- command.add("-Xdock:name=" + "Jalview");
+ command.add(
+ "-Xdock:name=" + ChannelProperties.getProperty("app_name"));
}
}
+ String scalePropertyArg = HiDPISetting.getScalePropertyArg();
+ if (scalePropertyArg != null)
+ {
+ command.add(scalePropertyArg);
+ }
+
command.add(startClass);
command.addAll(arguments);
final ProcessBuilder builder = new ProcessBuilder(command);
- System.out.println("COMMAND: " + String.join(" ", builder.command()));
+ // System.out.println("COMMAND: " + String.join(" ", builder.command()));
+ System.out.println("Running " + startClass + " with "
+ + (memSetting == null ? "no memory setting" : memSetting));
+ if (Boolean.parseBoolean(System.getProperty("launcherstop")))
+ {
+ System.exit(0);
+ }
try
{
builder.inheritIO();
@@ -110,7 +186,8 @@ public class Launcher
if (e.getMessage().toLowerCase().contains("memory"))
{
System.out.println("Caught a memory exception: " + e.getMessage());
- // Probably the "Cannot allocate memory" error, try without the memory setting
+ // Probably the "Cannot allocate memory" error, try without the memory
+ // setting
ArrayList commandNoMem = new ArrayList<>();
for (int i = 0; i < command.size(); i++)
{
@@ -121,7 +198,7 @@ public class Launcher
}
final ProcessBuilder builderNoMem = new ProcessBuilder(
commandNoMem);
- System.out.println("NO MEM COMMAND: "
+ System.out.println("Command without memory setting: "
+ String.join(" ", builderNoMem.command()));
try
{