From 886b7085ea26ae9500f57e065cd6c1cbc2b5a4ec Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Fri, 27 May 2016 12:14:10 +0200 Subject: [PATCH] Smelly code, smelly code, how are they writing you Smelly code, smelly code it's not your fault... --- examples/java/app/bittorrent/Common.java | 2 +- examples/java/app/centralizedmutex/Coordinator.java | 13 +++++++------ examples/java/app/centralizedmutex/Main.java | 2 +- examples/java/app/centralizedmutex/Node.java | 3 ++- examples/java/app/masterworker/Main.java | 2 +- examples/java/app/masterworker/Master.java | 10 +++++----- examples/java/app/masterworker/Worker.java | 8 +++++--- examples/java/app/pingpong/Main.java | 6 +++--- examples/java/app/pingpong/Receiver.java | 8 +++----- examples/java/app/pingpong/Sender.java | 4 ++-- examples/java/async/dsend/Main.java | 2 +- examples/java/cloud/masterworker/Main.java | 2 +- src/bindings/java/org/simgrid/msg/Process.java | 2 +- 13 files changed, 33 insertions(+), 31 deletions(-) diff --git a/examples/java/app/bittorrent/Common.java b/examples/java/app/bittorrent/Common.java index 3f2f3ad43a..9a1cb29732 100644 --- a/examples/java/app/bittorrent/Common.java +++ b/examples/java/app/bittorrent/Common.java @@ -7,7 +7,7 @@ package app.bittorrent; /* Common constants for use in the simulation */ -public class Common { +class Common { public static final String TRACKER_MAILBOX = "tracker_mailbox"; public static final int FILE_SIZE = 5120; public static final int FILE_PIECE_SIZE = 512; diff --git a/examples/java/app/centralizedmutex/Coordinator.java b/examples/java/app/centralizedmutex/Coordinator.java index f89fef94f4..193129305b 100644 --- a/examples/java/app/centralizedmutex/Coordinator.java +++ b/examples/java/app/centralizedmutex/Coordinator.java @@ -14,16 +14,17 @@ import org.simgrid.msg.Process; import org.simgrid.msg.MsgException; public class Coordinator extends Process { + LinkedList waitingQueue=new LinkedList<>(); + int csToServe; + public Coordinator(Host host, String name, String[]args) { super(host,name,args); } - LinkedList waitingQueue=new LinkedList(); - int CsToServe; public void main(String[] args) throws MsgException { - CsToServe = Integer.parseInt(args[0]); + csToServe = Integer.parseInt(args[0]); Task task; - while (CsToServe >0) { + while (csToServe >0) { task = Task.receive("coordinator"); if (task instanceof RequestTask) { RequestTask t = (RequestTask) task; @@ -40,8 +41,8 @@ public class Coordinator extends Process { GrantTask tosend = new GrantTask(); tosend.send(req.from); } - CsToServe--; - if (waitingQueue.isEmpty() && CsToServe==0) { + csToServe--; + if (waitingQueue.isEmpty() && csToServe==0) { Msg.info("we should shutdown the simulation now"); } } diff --git a/examples/java/app/centralizedmutex/Main.java b/examples/java/app/centralizedmutex/Main.java index 7a8a7ac2eb..6d8c6d1653 100644 --- a/examples/java/app/centralizedmutex/Main.java +++ b/examples/java/app/centralizedmutex/Main.java @@ -9,7 +9,7 @@ package app.centralizedmutex; import org.simgrid.msg.Msg; import org.simgrid.msg.NativeException; -public class Main { +class Main { public static void main(String[] args) throws NativeException { Msg.init(args); diff --git a/examples/java/app/centralizedmutex/Node.java b/examples/java/app/centralizedmutex/Node.java index b8fd1d1f95..511a95d96a 100644 --- a/examples/java/app/centralizedmutex/Node.java +++ b/examples/java/app/centralizedmutex/Node.java @@ -18,10 +18,11 @@ public class Node extends Process { } public void request(double CStime) throws MsgException { RequestTask req = new RequestTask(getName()); + GrantTask grant= new GrantTask();; Msg.info("Send a request to the coordinator"); req.send("coordinator"); Msg.info("Wait for a grant from the coordinator"); - Task.receive(getName()); // FIXME: ensure that this is a grant + grant.receive(getName()); Task compute = new Task("CS", CStime, 0); compute.execute(); ReleaseTask release = new ReleaseTask(); diff --git a/examples/java/app/masterworker/Main.java b/examples/java/app/masterworker/Main.java index acca06ab53..cc24eed70f 100644 --- a/examples/java/app/masterworker/Main.java +++ b/examples/java/app/masterworker/Main.java @@ -11,7 +11,7 @@ import java.io.File; import org.simgrid.msg.Msg; import org.simgrid.msg.NativeException; -public class Main { +class Main { public static final int TASK_COMP_SIZE = 10000000; public static final int TASK_COMM_SIZE = 10000000; /* This only contains the launcher. If you do nothing more than than you can run java simgrid.msg.Msg diff --git a/examples/java/app/masterworker/Master.java b/examples/java/app/masterworker/Master.java index 6c2b872c70..08abb74a34 100644 --- a/examples/java/app/masterworker/Master.java +++ b/examples/java/app/masterworker/Master.java @@ -23,17 +23,17 @@ public class Master extends Process { System.exit(1); } - int tasksCount = Integer.valueOf(args[0]).intValue(); - double taskComputeSize = Double.valueOf(args[1]).doubleValue(); - double taskCommunicateSize = Double.valueOf(args[2]).doubleValue(); + int tasksCount = Integer.parseInt(args[0]); + double taskComputeSize = Double.parseDouble(args[1]); + double taskCommunicateSize = Double.parseDouble(args[2]); - int workersCount = Integer.valueOf(args[3]).intValue(); + int workersCount = Integer.parseInt(args[3]); Msg.info("Hello! Got "+ workersCount + " workers and "+tasksCount+" tasks to process"); for (int i = 0; i < tasksCount; i++) { Task task = new Task("Task_" + i, taskComputeSize, taskCommunicateSize); - //Msg.info("Sending \"" + task.getName()+ "\" to \"worker_" + i % workersCount + "\""); + Msg.debug("Sending \"" + task.getName()+ "\" to \"worker_" + i % workersCount + "\""); task.send("worker_"+(i%workersCount)); } diff --git a/examples/java/app/masterworker/Worker.java b/examples/java/app/masterworker/Worker.java index ff68aacd6f..4236ebdb55 100644 --- a/examples/java/app/masterworker/Worker.java +++ b/examples/java/app/masterworker/Worker.java @@ -25,8 +25,8 @@ public class Worker extends Process { System.exit(1); } - int num = Integer.valueOf(args[0]).intValue(); - //Msg.info("Receiving on 'worker_"+num+"'"); + int num = Integer.parseInt(args[0]); + Msg.debug("Receiving on 'worker_"+num+"'"); while(true) { Task task = Task.receive("worker_"+num); @@ -37,7 +37,9 @@ public class Worker extends Process { Msg.info("Received \"" + task.getName() + "\". Processing it."); try { task.execute(); - } catch (TaskCancelledException e) {} + } catch (TaskCancelledException e) { + e.printStackTrace(); + } } Msg.info("Received Finalize. I'm done. See you!"); diff --git a/examples/java/app/pingpong/Main.java b/examples/java/app/pingpong/Main.java index cce0555d35..3352474d6b 100644 --- a/examples/java/app/pingpong/Main.java +++ b/examples/java/app/pingpong/Main.java @@ -6,11 +6,11 @@ package app.pingpong; import org.simgrid.msg.Msg; -import org.simgrid.msg.MsgException; +import org.simgrid.msg.HostNotFoundException; import org.simgrid.msg.NativeException; -public class Main { - public static void main(String[] args) throws MsgException, NativeException{ +class Main { + public static void main(String[] args) throws HostNotFoundException,NativeException{ Msg.init(args); if(args.length < 1) { Msg.info("Usage : Main platform_file"); diff --git a/examples/java/app/pingpong/Receiver.java b/examples/java/app/pingpong/Receiver.java index 7bb0d29d4f..e4469b3c23 100644 --- a/examples/java/app/pingpong/Receiver.java +++ b/examples/java/app/pingpong/Receiver.java @@ -6,7 +6,6 @@ package app.pingpong; import org.simgrid.msg.Msg; -import org.simgrid.msg.Host; import org.simgrid.msg.Task; import org.simgrid.msg.Process; import org.simgrid.msg.MsgException; @@ -14,15 +13,14 @@ import org.simgrid.msg.NativeException; import org.simgrid.msg.HostNotFoundException; public class Receiver extends Process { - final double commSizeLat = 1; - final double commSizeBw = 100000000; + static final double commSizeLat = 1; + static final double commSizeBw = 100000000; public Receiver(String hostname, String name, String[]args) throws HostNotFoundException, NativeException{ super(hostname,name,args); } public void main(String[] args) throws MsgException { Msg.info("hello!"); - double communicationTime=0; double time = Msg.getClock(); @@ -36,7 +34,7 @@ public class Receiver extends Process { Msg.info("Was sent at time "+timeSent); time=timeSent; - communicationTime=timeGot - time; + double communicationTime = timeGot - time; Msg.info("Communication time : " + communicationTime); Msg.info(" --- bw "+ commSizeBw/communicationTime + " ----"); Msg.info("goodbye!"); diff --git a/examples/java/app/pingpong/Sender.java b/examples/java/app/pingpong/Sender.java index 9644b4de1d..03782b2e61 100644 --- a/examples/java/app/pingpong/Sender.java +++ b/examples/java/app/pingpong/Sender.java @@ -1,4 +1,4 @@ -/* Copyright (c) 2006-2014, 2016. The SimGrid Team. + /* Copyright (c) 2006-2014, 2016. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -35,8 +35,8 @@ public class Sender extends Process { try { mailboxes[pos] = Host.getByName(args[pos]).getName(); } catch (HostNotFoundException e) { + e.printStackTrace(); Msg.info("Invalid deployment file: " + e.toString()); - System.exit(1); } } diff --git a/examples/java/async/dsend/Main.java b/examples/java/async/dsend/Main.java index 09d441af23..17cc8d2fba 100644 --- a/examples/java/async/dsend/Main.java +++ b/examples/java/async/dsend/Main.java @@ -11,7 +11,7 @@ import org.simgrid.msg.Host; import org.simgrid.msg.NativeException; import org.simgrid.msg.HostNotFoundException; -public class Main { +class Main { 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 c241c7896a..9b678b9c26 100644 --- a/examples/java/cloud/masterworker/Main.java +++ b/examples/java/cloud/masterworker/Main.java @@ -10,7 +10,7 @@ import org.simgrid.msg.Msg; import org.simgrid.msg.Host; import org.simgrid.msg.MsgException; -public class Main { +class Main { public static final double task_comp_size = 10; public static final double task_comm_size = 10; public static final int hostNB = 2 ; diff --git a/src/bindings/java/org/simgrid/msg/Process.java b/src/bindings/java/org/simgrid/msg/Process.java index 42d1276671..291ab60818 100644 --- a/src/bindings/java/org/simgrid/msg/Process.java +++ b/src/bindings/java/org/simgrid/msg/Process.java @@ -354,7 +354,7 @@ public abstract class Process implements Runnable { */ public abstract void main(String[]args) throws MsgException; - public native void exit(); + public native void exit(); /** * Class initializer, to initialize various JNI stuff */ -- 2.20.1