Create superclass to hold utility ThreadedFileReader functions

Both Communication Over Time and Communication Per PE need to determine
if two PEs are on the same node, this new superclass allows that utility
function to be shared, along with other future shared functionality.

Author: rbuch

src/projections/Tools/CommunicationOverTime/ThreadedFileReader.java

@@ -2,6 +2,7 @@
 
 import java.io.IOException;
 
+import projections.Tools.ThreadedFileReaderBase;
 import projections.analysis.EndOfLogSuccess;
 import projections.analysis.GenericLogReader;
 import projections.analysis.ProjDefs;
@@ -15,16 +16,13 @@
  *  Written by Samir Mirza, Isaac Dooley, and possibly others
  * 
  */
-class ThreadedFileReader implements Runnable  {
+class ThreadedFileReader extends ThreadedFileReaderBase implements Runnable  {
 
 	private int pe;
 	private long startInterval;
 	private long endInterval;
 	private long intervalSize;
 
-	private int myRun = 0;
-
-	private int PesPerNode;
 	// Global data that must be safely accumulated into:
 	private double[][] globalMessagesSend;
 	private double[][] globalMessagesRecv;
@@ -55,9 +53,6 @@ protected ThreadedFileReader(int pe, long intervalSize, long startInterval, long
 		this.globalExternalBytesRecv = globalExternalBytesRecv;
 		this.globalExternalNodeMessageRecv = globalExternalNodeMessageRecv;
 		this.globalExternalNodeBytesRecv = globalExternalNodeBytesRecv;
-
-		StsReader sts = MainWindow.runObject[myRun].getSts();
-		this.PesPerNode = sts.getNodeSize(); // 1 for non-SMP, value of ++ppn argument for SMP
 	}
 
 
@@ -119,7 +114,7 @@ public void run() {
 							localExternalMessageRecv[timeInterval][currEPindex]++;
 							localExternalBytesRecv[timeInterval][currEPindex]+=logdata.msglen;
 						}
-                        if(pe/PesPerNode != srcPe/PesPerNode)
+                        if(!isSameNode(pe, srcPe))
                         {
                             // Update message and byte received external arrays
 							localExternalNodeMessageRecv[timeInterval][currEPindex]++;

src/projections/Tools/CommunicationPerPE/ThreadedFileReader.java

@@ -5,6 +5,7 @@
 import java.io.IOException;
 import java.util.ArrayList;
 
+import projections.Tools.ThreadedFileReaderBase;
 import projections.analysis.EndOfLogSuccess;
 import projections.analysis.GenericLogReader;
 import projections.analysis.ProjDefs;
@@ -13,13 +14,12 @@
 import projections.analysis.StsReader;
 
 /** The reader threads for Communication Per PE Tool. */
-class ThreadedFileReader implements Runnable  {
+class ThreadedFileReader extends ThreadedFileReaderBase implements Runnable  {
 
 	private int pe;
 	private int pIdx;
 	private long startTime;
 	private long endTime;
-	private int myRun = 0;
 	private double[][] sentMsgCount;
 	private double[][] sentByteCount;
 	private double[][] receivedMsgCount;
@@ -127,7 +127,7 @@ public void run() {
 						//trace. So we have to subtract those msgs that are sent to external
 						//charm smp nodes. -Chao Mei
 						int pcreation = logdata.pe;						
-						if(pcreation!=pe && isSameNode(pcreation)){
+						if(pcreation!=pe && isSameNode(pe, pcreation)){
 							receivedMsgCount[pIdx][EPid]--;
 							receivedByteCount[pIdx][EPid] -= logdata.msglen;
 						}						
@@ -161,18 +161,7 @@ public void run() {
 			System.err.println("Error: could not close log file reader for processor " + pe );
 		}
 	}
-	
-	private boolean isSameNode(int p1){
-		StsReader sts = MainWindow.runObject[myRun].getSts();
-		int totalPes = sts.getProcessorCount();
-		int totalNodes = sts.getSMPNodeCount();
-		int nodesize = sts.getNodeSize();
-		int n1 = p1/nodesize;
-		if(p1>=totalNodes*nodesize && p1<totalPes) n1 = p1- totalNodes*nodesize;
-		int selfN = pe/nodesize;
-		if(pe>=totalNodes*nodesize && pe<totalPes) selfN = pe - totalNodes*nodesize;
-		return n1==selfN;
-	}
+
 }
 
 

src/projections/Tools/ThreadedFileReaderBase.java

@@ -0,0 +1,20 @@
+package projections.Tools;
+
+import projections.analysis.StsReader;
+import projections.gui.MainWindow;
+
+public class ThreadedFileReaderBase {
+    protected int myRun = 0;
+    StsReader sts = MainWindow.runObject[myRun].getSts();
+    final int totalPes = sts.getProcessorCount();
+    final int totalNodes = sts.getSMPNodeCount();
+    final int nodesize = sts.getNodeSize();
+
+    protected boolean isSameNode(int pe1, int pe2) {
+        int n1 = pe1 / nodesize;
+        if (pe1 >= totalNodes * nodesize && pe1 < totalPes) n1 = pe1 - totalNodes * nodesize;
+        int n2 = pe2 / nodesize;
+        if (pe2 >= totalNodes * nodesize && pe2 < totalPes) n2 = pe2 - totalNodes * nodesize;
+        return n1 == n2;
+    }
+}