From 459db2415fe292ebf73c46748c88df0ed68cd345 Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Thu, 16 Jun 2016 11:00:52 +0200 Subject: [PATCH] remove some smells in Java --- examples/java/app/pingpong/Main.java | 4 ++++ examples/java/app/pingpong/Receiver.java | 5 ++--- examples/java/app/pingpong/Sender.java | 5 ++--- examples/java/async/dsend/Main.java | 4 ++++ examples/java/cloud/masterworker/Main.java | 17 +++++++++++------ examples/java/cloud/masterworker/Master.java | 4 ++-- .../cloud/masterworker/cloud_masterworker.tesh | 2 +- examples/java/energy/vm/EnergyVMRunner.java | 1 - examples/java/energy/vm/Main.java | 5 ++++- 9 files changed, 30 insertions(+), 17 deletions(-) diff --git a/examples/java/app/pingpong/Main.java b/examples/java/app/pingpong/Main.java index 9a049c2e06..d69dcec784 100644 --- a/examples/java/app/pingpong/Main.java +++ b/examples/java/app/pingpong/Main.java @@ -10,6 +10,10 @@ import org.simgrid.msg.HostNotFoundException; import org.simgrid.msg.NativeException; class Main { + private Main() { + throw new IllegalAccessError("Utility class"); + } + public static void main(String[] args) throws HostNotFoundException, NativeException{ Msg.init(args); if(args.length < 1) { diff --git a/examples/java/app/pingpong/Receiver.java b/examples/java/app/pingpong/Receiver.java index 4e59a48674..80d832e156 100644 --- a/examples/java/app/pingpong/Receiver.java +++ b/examples/java/app/pingpong/Receiver.java @@ -13,8 +13,7 @@ import org.simgrid.msg.NativeException; import org.simgrid.msg.HostNotFoundException; public class Receiver extends Process { - static final double COMM_SIZE_LAT = 1; - static final double COMM_SIZE_BW = 100000000; + private static final double COMM_SIZE_BW = 100000000; public Receiver(String hostname, String name, String[]args) throws HostNotFoundException, NativeException{ super(hostname,name,args); } @@ -32,7 +31,7 @@ public class Receiver extends Process { Msg.info("Got at time "+ timeGot); Msg.info("Was sent at time "+timeSent); - time=timeSent; + time = timeSent; double communicationTime = timeGot - time; Msg.info("Communication time : " + communicationTime); diff --git a/examples/java/app/pingpong/Sender.java b/examples/java/app/pingpong/Sender.java index 03782b2e61..ab23c66c13 100644 --- a/examples/java/app/pingpong/Sender.java +++ b/examples/java/app/pingpong/Sender.java @@ -13,8 +13,7 @@ import org.simgrid.msg.NativeException; import org.simgrid.msg.HostNotFoundException; public class Sender extends Process { - private final double commSizeLat = 1; - final double commSizeBw = 100000000; + private static final double COMM_SIZE_LAT = 1; public Sender(String hostname, String name, String[] args) throws HostNotFoundException, NativeException { super(hostname,name,args); @@ -45,7 +44,7 @@ public class Sender extends Process { Msg.info("sender time: " + time); - task = new PingPongTask("no name",computeDuration,commSizeLat); + task = new PingPongTask("no name",computeDuration,COMM_SIZE_LAT); task.setTime(time); task.send(mailboxes[pos]); diff --git a/examples/java/async/dsend/Main.java b/examples/java/async/dsend/Main.java index 17cc8d2fba..02955ab5c0 100644 --- a/examples/java/async/dsend/Main.java +++ b/examples/java/async/dsend/Main.java @@ -12,6 +12,10 @@ import org.simgrid.msg.NativeException; import org.simgrid.msg.HostNotFoundException; class Main { + private Main() { + throw new IllegalAccessError("Utility class"); + } + public static void main(String[] args) throws NativeException, HostNotFoundException { Msg.init(args); diff --git a/examples/java/cloud/masterworker/Main.java b/examples/java/cloud/masterworker/Main.java index 9b678b9c26..fb36463d99 100644 --- a/examples/java/cloud/masterworker/Main.java +++ b/examples/java/cloud/masterworker/Main.java @@ -11,9 +11,14 @@ import org.simgrid.msg.Host; import org.simgrid.msg.MsgException; class Main { - public static final double task_comp_size = 10; - public static final double task_comm_size = 10; - public static final int hostNB = 2 ; + public static final double TASK_COMP_SIZE = 10; + public static final double TASK_COMM_SIZE = 10; + public static final int NHOSTS = 2 ; + + private Main() { + throw new IllegalAccessError("Utility class"); + } + public static void main(String[] args) throws MsgException { Msg.init(args); @@ -26,12 +31,12 @@ class Main { /* Construct the platform */ Msg.createEnvironment(args[0]); Host[] hosts = Host.all(); - if (hosts.length < hostNB+1) { - Msg.info("I need at least "+ (hostNB+1) +" hosts in the platform file, but " + args[0] + " contains only " + if (hosts.length < NHOSTS+1) { + Msg.info("I need at least "+ (NHOSTS+1) +" hosts in the platform file, but " + args[0] + " contains only " + hosts.length + " hosts"); System.exit(42); } - Msg.info("Start"+ hostNB +" hosts"); + Msg.info("Start "+ NHOSTS +" hosts"); new Master(hosts[0],"Master",hosts).start(); /* Execute the simulation */ Msg.run(); diff --git a/examples/java/cloud/masterworker/Master.java b/examples/java/cloud/masterworker/Master.java index 586c910fd2..c2b95d9ffc 100644 --- a/examples/java/cloud/masterworker/Master.java +++ b/examples/java/cloud/masterworker/Master.java @@ -24,7 +24,7 @@ public class Master extends Process { } public void main(String[] args) throws MsgException { - int workersCount = Main.hostNB; + int workersCount = Main.NHOSTS; ArrayList vms = new ArrayList<>(); // Create one VM per host and bind a process inside each one. @@ -86,7 +86,7 @@ public class Master extends Process { public void workBatch(int workersCount) throws MsgException { for (int i = 0; i < workersCount; i++) { - Task task = new Task("Task0" + i, Main.task_comp_size, Main.task_comm_size); + Task task = new Task("Task0" + i, Main.TASK_COMP_SIZE, Main.TASK_COMM_SIZE); Msg.info("Sending to WRK0" + i); task.send("MBOX:WRK0" + i); } diff --git a/examples/java/cloud/masterworker/cloud_masterworker.tesh b/examples/java/cloud/masterworker/cloud_masterworker.tesh index 2b38e95daa..acecc006a1 100644 --- a/examples/java/cloud/masterworker/cloud_masterworker.tesh +++ b/examples/java/cloud/masterworker/cloud_masterworker.tesh @@ -4,7 +4,7 @@ $ java -classpath ${classpath:=.} cloud/masterworker/Main ${srcdir:=.}/../platforms/platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:maestro@) Using regular java threads. -> [ 0.000000] (0:maestro@) Start2 hosts +> [ 0.000000] (0:maestro@) Start 2 hosts > [ 0.000000] (1:Master@Jacquelin) create VM00 > [ 0.000000] (1:Master@Jacquelin) Put Worker WRK00 on VM00 > [ 0.000000] (1:Master@Jacquelin) create VM01 diff --git a/examples/java/energy/vm/EnergyVMRunner.java b/examples/java/energy/vm/EnergyVMRunner.java index d8ecb21de3..09e0a735b1 100644 --- a/examples/java/energy/vm/EnergyVMRunner.java +++ b/examples/java/energy/vm/EnergyVMRunner.java @@ -10,7 +10,6 @@ import org.simgrid.msg.VM; import org.simgrid.msg.Host; import org.simgrid.msg.Task; import org.simgrid.msg.Process; -import org.simgrid.msg.MsgException; import org.simgrid.msg.HostFailureException; import org.simgrid.msg.HostNotFoundException; import org.simgrid.msg.TaskCancelledException; diff --git a/examples/java/energy/vm/Main.java b/examples/java/energy/vm/Main.java index e4efa3e3a7..385fe40a39 100644 --- a/examples/java/energy/vm/Main.java +++ b/examples/java/energy/vm/Main.java @@ -10,7 +10,10 @@ import org.simgrid.msg.Host; import org.simgrid.msg.HostNotFoundException; import org.simgrid.msg.NativeException; -public class Main { +class Main { + private Main() { + throw new IllegalAccessError("Utility class"); + } public static void main(String[] args) throws NativeException, HostNotFoundException { Msg.energyInit(); -- 2.20.1