svn commit: r1412435 - in /hama/trunk/core/src/main/java/org/apache/hama/bsp: BSPJobClient.java BSPPeerImpl.java JobInProgress.java

[edwardyoon]

Author: edwardyoon
Date: Thu Nov 22 06:42:06 2012
New Revision: 1412435

URL: http://svn.apache.org/viewvc?rev=1412435&view=rev
Log:
Move superstep counter to JobCounter from PeerCounter.

Modified:
    hama/trunk/core/src/main/java/org/apache/hama/bsp/BSPJobClient.java
    hama/trunk/core/src/main/java/org/apache/hama/bsp/BSPPeerImpl.java
    hama/trunk/core/src/main/java/org/apache/hama/bsp/JobInProgress.java

Modified: hama/trunk/core/src/main/java/org/apache/hama/bsp/BSPJobClient.java
URL: 
http://svn.apache.org/viewvc/hama/trunk/core/src/main/java/org/apache/hama/bsp/BSPJobClient.java?rev=1412435&r1=1412434&r2=1412435&view=diff
==============================================================================
--- hama/trunk/core/src/main/java/org/apache/hama/bsp/BSPJobClient.java 
(original)
+++ hama/trunk/core/src/main/java/org/apache/hama/bsp/BSPJobClient.java Thu Nov 
22 06:42:06 2012
@@ -646,7 +646,7 @@ public class BSPJobClient extends Config
       LOG.info("The total number of supersteps: " + info.getSuperstepCount());
       info.getStatus()
           .getCounter()
-          .incrCounter(BSPPeerImpl.PeerCounter.SUPERSTEPS,
+          .incrCounter(JobInProgress.JobCounter.SUPERSTEPS,
               info.getSuperstepCount());
       info.getStatus().getCounter().log(LOG);
     } else {

Modified: hama/trunk/core/src/main/java/org/apache/hama/bsp/BSPPeerImpl.java
URL: 
http://svn.apache.org/viewvc/hama/trunk/core/src/main/java/org/apache/hama/bsp/BSPPeerImpl.java?rev=1412435&r1=1412434&r2=1412435&view=diff
==============================================================================
--- hama/trunk/core/src/main/java/org/apache/hama/bsp/BSPPeerImpl.java 
(original)
+++ hama/trunk/core/src/main/java/org/apache/hama/bsp/BSPPeerImpl.java Thu Nov 
22 06:42:06 2012
@@ -58,7 +58,7 @@ public final class BSPPeerImpl<K1, V1, K
   private static final Log LOG = LogFactory.getLog(BSPPeerImpl.class);
 
   public static enum PeerCounter {
-    SUPERSTEP_SUM, SUPERSTEPS, TASK_INPUT_RECORDS, TASK_OUTPUT_RECORDS,
+    SUPERSTEP_SUM, TASK_INPUT_RECORDS, TASK_OUTPUT_RECORDS,
     IO_BYTES_READ, MESSAGE_BYTES_TRANSFERED, MESSAGE_BYTES_RECEIVED,
     TOTAL_MESSAGES_SENT, TOTAL_MESSAGES_RECEIVED, COMPRESSED_BYTES_SENT,
     COMPRESSED_BYTES_RECEIVED, TIME_IN_SYNC_MS

Modified: hama/trunk/core/src/main/java/org/apache/hama/bsp/JobInProgress.java
URL: 
http://svn.apache.org/viewvc/hama/trunk/core/src/main/java/org/apache/hama/bsp/JobInProgress.java?rev=1412435&r1=1412434&r2=1412435&view=diff
==============================================================================
--- hama/trunk/core/src/main/java/org/apache/hama/bsp/JobInProgress.java 
(original)
+++ hama/trunk/core/src/main/java/org/apache/hama/bsp/JobInProgress.java Thu 
Nov 22 06:42:06 2012
@@ -62,7 +62,7 @@ public class JobInProgress {
   }
 
   public static enum JobCounter {
-    LAUNCHED_TASKS
+    LAUNCHED_TASKS, SUPERSTEPS
   }
 
   static final Log LOG = LogFactory.getLog(JobInProgress.class);