Minor API efficiency improvements

ME1312 · Apr 8, 2021 · ff82fd5 · ff82fd5
1 parent eba5e6a
commit ff82fd5
Show file tree

Hide file tree

Showing 21 changed files with 83 additions and 67 deletions.
diff --git a/SubServers.Bungee/common/pom.xml b/SubServers.Bungee/common/pom.xml
@@ -28,13 +28,13 @@
         <dependency>
             <groupId>net.ME1312.Galaxi</groupId>
             <artifactId>GalaxiUtil</artifactId>
-            <version>21w15a</version>
+            <version>21w15b</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>net.ME1312.Galaxi</groupId>
             <artifactId>GalaxiEngine</artifactId>
-            <version>21w15a</version>
+            <version>21w15b</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

diff --git a/SubServers.Bungee/pom.xml b/SubServers.Bungee/pom.xml
@@ -28,14 +28,14 @@
         <dependency>
             <groupId>net.ME1312.Galaxi</groupId>
             <artifactId>GalaxiUtil</artifactId>
-            <version>21w15a</version>
+            <version>21w15b</version>
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>net.ME1312.Galaxi</groupId>
             <artifactId>GalaxiEngine</artifactId>
-            <version>21w15a</version>
+            <version>21w15b</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Executable.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Executable.java
@@ -12,6 +12,7 @@
  */
 public class Executable {
     private Executable() {}
+    private static final boolean USE_SESSION_TRACKING;
 
     /**
      * Format a command to be executed
@@ -30,14 +31,22 @@ public static String[] parse(String gitbash, String exec) {
                 exec = '"' + gitbash + ((gitbash.endsWith(File.separator))?"":File.separator) + "bin" + File.separatorChar + "sh.exe\" -lc \"" +
                         exec.replace("\\", "/\\").replace("\"", "\\\"").replace("^", "^^").replace("%", "^%").replace("&", "^&").replace("<", "^<").replace(">", "^>").replace("|", "^|") + '"';
             cmd = new String[]{"cmd.exe", "/q", "/c", '"'+exec+'"'};
-        } else if (Platform.getSystem() == Platform.LINUX) {
+        } else if (USE_SESSION_TRACKING) {
             cmd = new String[]{"setsid", "-w", "sh", "-lc", exec};
         } else {
             cmd = new String[]{"sh", "-lc", exec};
         }
         return cmd;
     }
 
+    static {
+        USE_SESSION_TRACKING = Platform.getSystem() != Platform.WINDOWS && Util.getDespiteException(() -> {
+            Process test = Runtime.getRuntime().exec(new String[]{"setsid", "-w", "bash", "-c", "exit 0"});
+            test.waitFor(); // The purpose of this block is to test for the 'setsid' command
+            return test.exitValue() == 0;
+        }, false);
+    }
+
     /**
      * Get the PID of a currently running process
      *
@@ -88,7 +97,7 @@ public static void terminate(Process process) {
             if (pid != null) try {
                 if (Platform.getSystem() == Platform.WINDOWS) {
                     Runtime.getRuntime().exec(new String[]{"taskkill.exe", "/T", "/F", "/PID", pid.toString()}).waitFor();
-                } else if (Platform.getSystem() == Platform.LINUX) {
+                } else if (USE_SESSION_TRACKING) {
                     Runtime.getRuntime().exec(new String[]{"bash", "-c", "kill -9 $(ps -o pid= --sid $(ps -o sid= --pid " + pid + "))"}).waitFor();
                 }
             } catch (IOException | InterruptedException e) {}

diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalHost.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalHost.java
@@ -70,11 +70,11 @@ public ExternalHost(SubProxy plugin, String name, boolean enabled, Range<Integer
 
     @Override
     public DataClient[] getSubData() {
-        LinkedList<Integer> keys = new LinkedList<Integer>(subdata.keySet());
-        LinkedList<SubDataClient> channels = new LinkedList<SubDataClient>();
-        Collections.sort(keys);
-        for (Integer channel : keys) channels.add(subdata.get(channel));
-        return channels.toArray(new DataClient[0]);
+        Integer[] keys = subdata.keySet().toArray(new Integer[0]);
+        DataClient[] channels = new DataClient[keys.length];
+        Arrays.sort(keys);
+        for (int i = 0; i < keys.length; ++i) channels[i] = subdata.get(keys[i]);
+        return channels;
     }
 
     public void setSubData(DataClient client, int channel) {

diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Proxy.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Proxy.java
@@ -44,11 +44,11 @@ public Proxy(String name, boolean persistent) throws IllegalArgumentException {
 
     @Override
     public DataClient[] getSubData() {
-        LinkedList<Integer> keys = new LinkedList<Integer>(subdata.keySet());
-        LinkedList<SubDataClient> channels = new LinkedList<SubDataClient>();
-        Collections.sort(keys);
-        for (Integer channel : keys) channels.add(subdata.get(channel));
-        return channels.toArray(new DataClient[0]);
+        Integer[] keys = subdata.keySet().toArray(new Integer[0]);
+        DataClient[] channels = new DataClient[keys.length];
+        Arrays.sort(keys);
+        for (int i = 0; i < keys.length; ++i) channels[i] = subdata.get(keys[i]);
+        return channels;
     }
 
     @SuppressWarnings("deprecation")

diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/ServerImpl.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/ServerImpl.java
@@ -82,11 +82,11 @@ private void init(String name, SocketAddress address, String motd, boolean hidde
 
     @Override
     public DataClient[] getSubData() {
-        LinkedList<Integer> keys = new LinkedList<Integer>(subdata.keySet());
-        LinkedList<SubDataClient> channels = new LinkedList<SubDataClient>();
-        Collections.sort(keys);
-        for (Integer channel : keys) channels.add(subdata.get(channel));
-        return channels.toArray(new DataClient[0]);
+        Integer[] keys = subdata.keySet().toArray(new Integer[0]);
+        DataClient[] channels = new DataClient[keys.length];
+        Arrays.sort(keys);
+        for (int i = 0; i < keys.length; ++i) channels[i] = subdata.get(keys[i]);
+        return channels;
     }
 
     public void setSubData(DataClient client, int channel) {

diff --git a/SubServers.Client/Bukkit/pom.xml b/SubServers.Client/Bukkit/pom.xml
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>net.ME1312.Galaxi</groupId>
             <artifactId>GalaxiUtil</artifactId>
-            <version>21w15a</version>
+            <version>21w15b</version>
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>

diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubAPI.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubAPI.java
@@ -71,11 +71,11 @@ public String getName() {
      * @return SubData Network Connections
      */
     public DataClient[] getSubDataNetwork() {
-        LinkedList<Integer> keys = new LinkedList<Integer>(plugin.subdata.keySet());
-        LinkedList<SubDataClient> channels = new LinkedList<SubDataClient>();
-        Collections.sort(keys);
-        for (Integer channel : keys) channels.add(plugin.subdata.get(channel));
-        return channels.toArray(new DataClient[0]);
+        Integer[] keys = plugin.subdata.keySet().toArray(new Integer[0]);
+        DataClient[] channels = new DataClient[keys.length];
+        Arrays.sort(keys);
+        for (int i = 0; i < keys.length; ++i) channels[i] = plugin.subdata.get(keys[i]);
+        return channels;
     }
 
     /**

diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubPlugin.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubPlugin.java
@@ -87,7 +87,6 @@ public void onEnable() {
             getServer().getMessenger().registerOutgoingPluginChannel(this, "BungeeCord");
             reload(false);
 
-            subdata.put(0, null);
             subprotocol = SubProtocol.get();
             subprotocol.registerCipher("DHE", DHE.get(128));
             subprotocol.registerCipher("DHE-128", DHE.get(128));

diff --git a/SubServers.Client/Common/pom.xml b/SubServers.Client/Common/pom.xml
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>net.ME1312.Galaxi</groupId>
             <artifactId>GalaxiUtil</artifactId>
-            <version>21w15a</version>
+            <version>21w15b</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/Host.java b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/Host.java
@@ -88,11 +88,11 @@ public void refresh() {
     public DataSender[] getSubData() {
         if (raw.contains("subdata")) {
             ObjectMap<Integer> subdata = new ObjectMap<Integer>((Map<Integer, ?>) raw.getObject("subdata"));
-            LinkedList<Integer> keys = new LinkedList<Integer>(subdata.getKeys());
-            LinkedList<SubDataSender> channels = new LinkedList<SubDataSender>();
-            Collections.sort(keys);
-            for (Integer channel : keys) channels.add((subdata.isNull(channel))?null:new ForwardedDataSender((SubDataClient) ClientAPI.getInstance().getSubDataNetwork()[0], subdata.getUUID(channel)));
-            return channels.toArray(new SubDataSender[0]);
+            Integer[] keys = subdata.getKeys().toArray(new Integer[0]);
+            DataSender[] channels = new DataSender[keys.length];
+            Arrays.sort(keys);
+            for (int i = 0; i < keys.length; ++i) channels[i] = (subdata.isNull(keys[i]))? null : new ForwardedDataSender((SubDataClient) ClientAPI.getInstance().getSubDataNetwork()[0], subdata.getUUID(keys[i]));
+            return channels;
         } else {
             return new SubDataSender[0];
         }

diff --git a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/Proxy.java b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/Proxy.java
@@ -78,11 +78,11 @@ public void refresh() {
     @SuppressWarnings("unchecked")
     public DataSender[] getSubData() {
         ObjectMap<Integer> subdata = new ObjectMap<Integer>((Map<Integer, ?>) raw.getObject("subdata"));
-        LinkedList<Integer> keys = new LinkedList<Integer>(subdata.getKeys());
-        LinkedList<SubDataSender> channels = new LinkedList<SubDataSender>();
-        Collections.sort(keys);
-        for (Integer channel : keys) channels.add((subdata.isNull(channel))?null:new ForwardedDataSender((SubDataClient) ClientAPI.getInstance().getSubDataNetwork()[0], subdata.getUUID(channel)));
-        return channels.toArray(new SubDataSender[0]);
+        Integer[] keys = subdata.getKeys().toArray(new Integer[0]);
+        DataSender[] channels = new DataSender[keys.length];
+        Arrays.sort(keys);
+        for (int i = 0; i < keys.length; ++i) channels[i] = (subdata.isNull(keys[i]))? null : new ForwardedDataSender((SubDataClient) ClientAPI.getInstance().getSubDataNetwork()[0], subdata.getUUID(keys[i]));
+        return channels;
     }
 
     /**

diff --git a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/Server.java b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/Server.java
@@ -78,11 +78,11 @@ public void refresh() {
     @SuppressWarnings("unchecked")
     public DataSender[] getSubData() {
         ObjectMap<Integer> subdata = new ObjectMap<Integer>((Map<Integer, ?>) raw.getObject("subdata"));
-        LinkedList<Integer> keys = new LinkedList<Integer>(subdata.getKeys());
-        LinkedList<SubDataSender> channels = new LinkedList<SubDataSender>();
-        Collections.sort(keys);
-        for (Integer channel : keys) channels.add((subdata.isNull(channel))?null:new ForwardedDataSender((SubDataClient) ClientAPI.getInstance().getSubDataNetwork()[0], subdata.getUUID(channel)));
-        return channels.toArray(new SubDataSender[0]);
+        Integer[] keys = subdata.getKeys().toArray(new Integer[0]);
+        DataSender[] channels = new DataSender[keys.length];
+        Arrays.sort(keys);
+        for (int i = 0; i < keys.length; ++i) channels[i] = (subdata.isNull(keys[i]))? null : new ForwardedDataSender((SubDataClient) ClientAPI.getInstance().getSubDataNetwork()[0], subdata.getUUID(keys[i]));
+        return channels;
     }
 
     /**

diff --git a/SubServers.Client/Sponge/pom.xml b/SubServers.Client/Sponge/pom.xml
@@ -28,7 +28,7 @@
         <dependency>
             <groupId>net.ME1312.Galaxi</groupId>
             <artifactId>GalaxiUtil</artifactId>
-            <version>21w15a</version>
+            <version>21w15b</version>
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>

diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/SubAPI.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/SubAPI.java
@@ -73,11 +73,11 @@ public String getName() {
      * @return SubData Network Connections
      */
     public DataClient[] getSubDataNetwork() {
-        LinkedList<Integer> keys = new LinkedList<Integer>(plugin.subdata.keySet());
-        LinkedList<SubDataClient> channels = new LinkedList<SubDataClient>();
-        Collections.sort(keys);
-        for (Integer channel : keys) channels.add(plugin.subdata.get(channel));
-        return channels.toArray(new DataClient[0]);
+        Integer[] keys = plugin.subdata.keySet().toArray(new Integer[0]);
+        DataClient[] channels = new DataClient[keys.length];
+        Arrays.sort(keys);
+        for (int i = 0; i < keys.length; ++i) channels[i] = plugin.subdata.get(keys[i]);
+        return channels;
     }
 
     /**

diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/SubPlugin.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/SubPlugin.java
@@ -106,7 +106,6 @@ public void enable(GameInitializationEvent event) {
             running = true;
             reload(false);
 
-            subdata.put(0, null);
             subprotocol = SubProtocol.get();
             subprotocol.registerCipher("DHE", DHE.get(128));
             subprotocol.registerCipher("DHE-128", DHE.get(128));

diff --git a/SubServers.Host/pom.xml b/SubServers.Host/pom.xml
@@ -31,14 +31,14 @@
         <dependency>
             <groupId>net.ME1312.Galaxi</groupId>
             <artifactId>GalaxiEngine</artifactId>
-            <version>21w15a</version>
+            <version>21w15b</version>
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>net.ME1312.Galaxi</groupId>
             <artifactId>GalaxiUI</artifactId>
-            <version>21w15a</version>
+            <version>21w15b</version>
             <scope>runtime</scope>
             <optional>true</optional>
         </dependency>

diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/Executable.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/Executable.java
@@ -12,6 +12,7 @@
  */
 public class Executable {
     private Executable() {}
+    private static final boolean USE_SESSION_TRACKING;
 
     /**
      * Format a command to be executed
@@ -30,14 +31,22 @@ public static String[] parse(String gitbash, String exec) {
                 exec = '"' + gitbash + ((gitbash.endsWith(File.separator))?"":File.separator) + "bin" + File.separatorChar + "sh.exe\" -lc \"" +
                         exec.replace("\\", "/\\").replace("\"", "\\\"").replace("^", "^^").replace("%", "^%").replace("&", "^&").replace("<", "^<").replace(">", "^>").replace("|", "^|") + '"';
             cmd = new String[]{"cmd.exe", "/q", "/c", '"'+exec+'"'};
-        } else if (Platform.getSystem() == Platform.LINUX) {
+        } else if (USE_SESSION_TRACKING) {
             cmd = new String[]{"setsid", "-w", "sh", "-lc", exec};
         } else {
             cmd = new String[]{"sh", "-lc", exec};
         }
         return cmd;
     }
 
+    static {
+        USE_SESSION_TRACKING = Platform.getSystem() != Platform.WINDOWS && Util.getDespiteException(() -> {
+            Process test = Runtime.getRuntime().exec(new String[]{"setsid", "-w", "bash", "-c", "exit 0"});
+            test.waitFor(); // The purpose of this block is to test for the 'setsid' command
+            return test.exitValue() == 0;
+        }, false);
+    }
+
     /**
      * Get the PID of a currently running process
      *
@@ -88,7 +97,7 @@ public static void terminate(Process process) {
             if (pid != null) try {
                 if (Platform.getSystem() == Platform.WINDOWS) {
                     Runtime.getRuntime().exec(new String[]{"taskkill.exe", "/T", "/F", "/PID", pid.toString()}).waitFor();
-                } else if (Platform.getSystem() == Platform.LINUX) {
+                } else if (USE_SESSION_TRACKING) {
                     Runtime.getRuntime().exec(new String[]{"bash", "-c", "kill -9 $(ps -o pid= --sid $(ps -o sid= --pid " + pid + "))"}).waitFor();
                 }
             } catch (IOException | InterruptedException e) {}

diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/SubAPI.java b/SubServers.Host/src/net/ME1312/SubServers/Host/SubAPI.java
@@ -57,11 +57,11 @@ public String getName() {
      * @return SubData Network Connections
      */
     public DataClient[] getSubDataNetwork() {
-        LinkedList<Integer> keys = new LinkedList<Integer>(host.subdata.keySet());
-        LinkedList<SubDataClient> channels = new LinkedList<SubDataClient>();
-        Collections.sort(keys);
-        for (Integer channel : keys) channels.add(host.subdata.get(channel));
-        return channels.toArray(new DataClient[0]);
+        Integer[] keys = host.subdata.keySet().toArray(new Integer[0]);
+        DataClient[] channels = new DataClient[keys.length];
+        Arrays.sort(keys);
+        for (int i = 0; i < keys.length; ++i) channels[i] = host.subdata.get(keys[i]);
+        return channels;
     }
 
     /**

diff --git a/SubServers.Sync/pom.xml b/SubServers.Sync/pom.xml
@@ -28,14 +28,14 @@
         <dependency>
             <groupId>net.ME1312.Galaxi</groupId>
             <artifactId>GalaxiUtil</artifactId>
-            <version>21w15a</version>
+            <version>21w15b</version>
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>net.ME1312.Galaxi</groupId>
             <artifactId>GalaxiEngine</artifactId>
-            <version>21w15a</version>
+            <version>21w15b</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Server/ServerImpl.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Server/ServerImpl.java
@@ -67,11 +67,11 @@ private void init(String name, String display, SocketAddress address, Map<Intege
      * @return SubData Client Channel ID Array
      */
     public DataSender[] getSubData() {
-        LinkedList<Integer> keys = new LinkedList<Integer>(subdata.keySet());
-        LinkedList<SubDataSender> channels = new LinkedList<SubDataSender>();
-        Collections.sort(keys);
-        for (Integer channel : keys) channels.add((subdata.getOrDefault(channel, null) == null)?null:new ForwardedDataSender((SubDataClient) SubAPI.getInstance().getSubDataNetwork()[0], subdata.get(channel)));
-        return channels.toArray(new SubDataSender[0]);
+        Integer[] keys = subdata.keySet().toArray(new Integer[0]);
+        DataSender[] channels = new DataSender[keys.length];
+        Arrays.sort(keys);
+        for (int i = 0; i < keys.length; ++i) channels[i] = (subdata.getOrDefault(keys[i], null) == null)? null : new ForwardedDataSender((SubDataClient) SubAPI.getInstance().getSubDataNetwork()[0], subdata.get(keys[i]));
+        return channels;
     }
 
     /**