Print

---

Author: [log in to unmask]
Date: Mon Mar 16 14:55:49 2015
New Revision: 2468

Log:
Cleanup SystemStatistics method and variable names.

Modified:
    java/trunk/monitoring-util/src/main/java/org/hps/monitoring/subsys/SystemStatistics.java
    java/trunk/monitoring-util/src/main/java/org/hps/monitoring/subsys/SystemStatisticsImpl.java

Modified: java/trunk/monitoring-util/src/main/java/org/hps/monitoring/subsys/SystemStatistics.java
 =============================================================================
--- java/trunk/monitoring-util/src/main/java/org/hps/monitoring/subsys/SystemStatistics.java	(original)
+++ java/trunk/monitoring-util/src/main/java/org/hps/monitoring/subsys/SystemStatistics.java	Mon Mar 16 14:55:49 2015
@@ -47,7 +47,7 @@
      * Get the number of millis since the session started.
      * @return The number of millis since session start.
      */
-    long getElapsedMillis();
+    long getTotalElapsedMillis();
 
     /**
      * Get the Unix start time of the session.

Modified: java/trunk/monitoring-util/src/main/java/org/hps/monitoring/subsys/SystemStatisticsImpl.java
 =============================================================================
--- java/trunk/monitoring-util/src/main/java/org/hps/monitoring/subsys/SystemStatisticsImpl.java	(original)
+++ java/trunk/monitoring-util/src/main/java/org/hps/monitoring/subsys/SystemStatisticsImpl.java	Mon Mar 16 14:55:49 2015
@@ -21,7 +21,6 @@
     long eventsInTick;
     long bytesInTick;
     
-    long elapsedMillis;
     long startTimeMillis;
     long stopTimeMillis;
     
@@ -40,7 +39,6 @@
     public void update(int size) {
         addEvent();
         addData(size);
-        updateElapsedTime();
     }
 
     @Override
@@ -54,7 +52,7 @@
     }
 
     @Override
-    public long getElapsedMillis() {
+    public long getTotalElapsedMillis() {
         return System.currentTimeMillis() - startTimeMillis;
     }
 
@@ -104,7 +102,7 @@
     @Override
     public double getAverageEventsPerSecond() {
         try {
-            return Double.parseDouble(decimalFormat.format(totalEvents / millisToSeconds(getElapsedMillis())));
+            return Double.parseDouble(decimalFormat.format(totalEvents / millisToSeconds(getTotalElapsedMillis())));
         } catch (NumberFormatException e) {
             return 0;
         }
@@ -127,7 +125,7 @@
     @Override
     public double getAverageMegabytesPerSecond() {
         try {
-            return Double.parseDouble(decimalFormat.format(bytesToMb(totalBytes) / millisToSeconds(getElapsedMillis())));
+            return Double.parseDouble(decimalFormat.format(bytesToMb(totalBytes) / millisToSeconds(getTotalElapsedMillis())));
         } catch (NumberFormatException e) {
             return Double.NaN;
         }
@@ -214,7 +212,7 @@
     @Override
     public void printSession(PrintStream ps) {
         ps.println("session statistics ...");
-        ps.println("  timeElapsedMillis = " + this.getElapsedMillis());
+        ps.println("  timeElapsedMillis = " + this.getTotalElapsedMillis());
         ps.println("  cumulativeEvents = " + this.getTotalEvents());
         ps.println("  averageEventsPerSecond = " + this.getAverageEventsPerSecond());
         ps.println("  averageMegaBytesPerSecond = " + this.getAverageMegabytesPerSecond());
@@ -239,10 +237,6 @@
         totalBytes += size;
     }
 
-    void updateElapsedTime() {
-        elapsedMillis = System.currentTimeMillis() - startTimeMillis;
-    }
-
     // Bytes to megabytes to 2 decimal places.
     static final double bytesToMb(long size) {
         return Double.parseDouble(decimalFormat.format((double) size / Mb));