Changeset 471 for trunk/LogicMail/src/org/logicprobe/LogicMail/util/Connection.java

Timestamp:

07/27/09 16:53:20 (3 years ago)

Author:

octorian

Message:

Granular progress indication of time consuming network operations

File:

• trunk/LogicMail/src/org/logicprobe/LogicMail/util/Connection.java (modified) (10 diffs)

trunk/LogicMail/src/org/logicprobe/LogicMail/util/Connection.java

@@ -119 +119 @@
     private boolean useWiFi;
     private int fakeAvailable = -1;
-
+    private int bytesSent = 0;
+    private int bytesReceived = 0;
+    
     /**
      * Provides a buffer used for incoming data.
@@ -193 +195 @@
         output = socket.openDataOutputStream();
         localAddress = ((SocketConnection) socket).getLocalAddress();
-
+        bytesSent = 0;
+        bytesReceived = 0;
+        
         if (EventLogger.getMinimumLevel() >= EventLogger.INFORMATION) {
             String msg = "Connection established:\r\n" + "Socket: " +
@@ -305 +309 @@
     }
 
+    /**
+     * Gets the number of bytes that have been sent since the
+     * connection was opened.
+     * <p>
+     * The counter is not synchronized, so it should only be
+     * called from the same thread as the send and receive
+     * methods.
+     * </p>
+     * @return bytes sent
+     */
+    public int getBytesSent() {
+        return bytesSent;
+    }
+    
+    /**
+     * Gets the number of bytes that have been received since the
+     * connection was opened.
+     * <p>
+     * The counter is not synchronized, so it should only be
+     * called from the same thread as the send and receive
+     * methods.
+     * </p>
+     * @return bytes received
+     */
+    public int getBytesReceived() {
+        return bytesReceived;
+    }
+    
     /**
      * Sends a string to the server. This method is used internally for
@@ -328 +360 @@
 
             output.write(CRLF, 0, 2);
+            bytesSent += 2;
         }
         /**
@@ -356 +389 @@
                  * Write the string up to there and terminate it properly.
                  */
-                output.write((s.substring(i, j) + "\r\n").getBytes());
+                byte[] buf = (s.substring(i, j) + "\r\n").getBytes();
+                output.write(buf);
+                bytesSent += buf.length;
 
                 /**
@@ -386 +421 @@
         if (s == null) {
             output.write(CRLF, 0, 2);
+            bytesSent += 2;
         } else {
-            output.write((s + "\r\n").getBytes());
+                byte[] buf = (s + "\r\n").getBytes();
+            output.write(buf);
+            bytesSent += buf.length;
         }
 
@@ -402 +440 @@
      */
     public synchronized void sendRaw(String s) throws IOException {
-        byte[] bytes = s.getBytes();
+        byte[] buf = s.getBytes();
 
         if (globalConfig.getConnDebug()) {
@@ -409 +447 @@
         }
 
-        output.write(bytes, 0, bytes.length);
-
+        output.write(buf, 0, buf.length);
+        bytesSent += buf.length;
+        
         output.flush();
     }
@@ -487 +526 @@
             while (true) {
                 int actual = input.read(buffer, count, 1);
-
+                
                 /**
                  * If -1 is returned, the InputStream is already closed,
@@ -524 +563 @@
                 // approach which screws up on mid-line LFs. (DK)
                 else {
+                        bytesReceived += actual;
+                        
                     byte b = buffer[count];
                     readBytes++;