minor changes/cleaning up

Author: mfcripps

interop-testing/src/test/java/io/grpc/testing/integration/TrafficControlProxy.java

@@ -53,8 +53,8 @@ public final class TrafficControlProxy {
   private static final int DEFAULT_DELAY_NANOS = 200 * 1000 * 1000;
   private static final Logger logger = Logger.getLogger(TrafficControlProxy.class.getName());
 
-  // TODO: make ports arguments (and probably loopback/ip as well)
-  private String loopback = "127.0.0.1";
+  // TODO: make host and ports arguments
+  private String localhost = "127.0.0.1";
   private int proxyPort = 5050;
   private int serverPort = 5001;
   private int queueLength;
@@ -90,7 +90,7 @@ public TrafficControlProxy(int targetBps, int targetLatency, TimeUnit latencyUni
   }
 
   /**
-   * Starts a thread that waits for client and server and start reader/writer threads.
+   * Starts a new thread that waits for client and server and start reader/writer threads.
    */
   public void start() throws IOException {
     // ClientAcceptor uses a ServerSocket server so that the client can connect to the proxy as it
@@ -99,14 +99,14 @@ public void start() throws IOException {
     logger.info("Starting new proxy on port " + proxyPort + " with Queue Length " + queueLength);
     clientAcceptor = new ServerSocket();
     clientAcceptor.setReuseAddress(true);
-    clientAcceptor.bind(new InetSocketAddress(loopback, proxyPort));
+    clientAcceptor.bind(new InetSocketAddress(localhost, proxyPort));
     executor.submit(new Runnable() {
       @Override
       public void run() {
         try {
           clientSock = clientAcceptor.accept();
           serverSock = new Socket();
-          serverSock.connect(new InetSocketAddress(loopback, serverPort));
+          serverSock.connect(new InetSocketAddress(localhost, serverPort));
           startWorkers();
         } catch (IOException e) {
           throw new RuntimeException(e);
@@ -187,7 +187,9 @@ public void run() {
     }
   }
 
-  // A Delay Queue that counts by number of bytes instead of the number of elements.
+  /**
+   * A Delay Queue that counts by number of bytes instead of the number of elements.
+   */
   private class MessageQueue {
     DataInputStream inStream;
     DataOutputStream outStream;
@@ -221,6 +223,10 @@ void readIn() throws InterruptedException, IOException {
       incrementBytes(readableBytes);
     }
 
+    /**
+     * Block until space on the queue becomes available. Returns how many bytes can be read on to
+     * the queue
+     */
     synchronized int getNextChunk() throws InterruptedException {
       while (bytesQueued == queueLength) {
         wait();