changed time measurement, added benchmark boolean

Sandy W · Sandy W · commit ab18ea63b997 · 2011-10-13T14:23:55.000-04:00
diff --git a/client/Client.java b/client/Client.java
@@ -25,6 +25,7 @@ public class Client {
 
 	// this AtomicLong is used to keep track of the current # of running threads
 	private static AtomicLong runningThreads = new AtomicLong(0);
+	private static boolean benchmark = false;
 
 	public static void main(String[] args) {
 		int menuSelection = 0;
@@ -50,6 +51,7 @@ else while (menuSelection != 8) {
 			// if 7, ask which command should be run in the benchmark mode
 			// and how many connections to create
 			if (menuSelection == 7) {
+				benchmark = true;
 				menuSelection = benchmarkMenu();
 				numProcesses = numProcessesMenu();
 			}
@@ -62,7 +64,7 @@ else while (menuSelection != 8) {
 				// make a new thread, tell it the hostname to connect to
 				// and the command to run. It is also passed the totalTime object,
 				// so it can record how much time its command took to complete
-				thrd = new Thread(new ClientThread(args[0], menuSelection, totalTime, (numProcesses == 1), runningThreads));
+				thrd = new Thread(new ClientThread(args[0], menuSelection, totalTime, benchmark, runningThreads));
 				thrd.start(); // start the thread
 				list.add(thrd); // add the thread to the end of the linked list
 
diff --git a/client/ClientThread.java b/client/ClientThread.java
@@ -48,9 +48,6 @@ public void run() {
 		PrintWriter out = null;
 		BufferedReader input = null;
 		try {
-			// get the current time (before connecting to the server)
-			startTime = System.currentTimeMillis();
-
 			//creates a new Socket object and names it socket.
 			//Establishes the socket connection between the client & server
 			//name of the machine & the port number to which we want to connect
@@ -64,6 +61,9 @@ public void run() {
 			//opens a BufferedReader on the socket
 			input = new BufferedReader(new InputStreamReader(socket.getInputStream()));
 			if (printOutput) System.out.println("\nRequesting output for the '" + menuSelection + "' command from " + hostName);
+			
+			// get the current time (before sending the request to the server)
+			startTime = System.currentTimeMillis();
 
 			// send the command to the server
 			out.println(Integer.toString(menuSelection));
