Merge branch 'master' into review/anirudh_manoj/2869

Author: rbuch

.travis.yml

@@ -0,0 +1 @@
+language: java

build.gradle

@@ -26,7 +26,7 @@ version = '6.8.0'
 sourceSets {
   main {
     java {
-      srcDir 'src/projections'
+      srcDir 'src'
     }
   }
 }

src/projections/Tools/Timeline/Data.java

@@ -395,7 +395,7 @@ private void storeRangeToPersistantStorage(){
 
 
 	/** Use the new set of PEs. The PEs will be stored internally in a Linked List */
-	public void setProcessorList(SortedSet<Integer> processorList){
+	public void setProcessorList(Collection<Integer> processorList){
 		peToLine.clear();
 
 		if(isSMPRun()){
@@ -428,16 +428,18 @@ public void setProcessorList(SortedSet<Integer> processorList){
 					if(curNID != prevNID){
 						//encounter a new set of PEs of a node, add the comm thd
 						//of the previous node
-						peToLine.add(prevCommPE);
-						commPEs.add(prevCommPE);
+						if (!commPEs.contains(prevCommPE)) {
+							peToLine.add(prevCommPE);
+							commPEs.add(prevCommPE);
+						}
 
 						prevNID = curNID;
 						prevCommPE = getCommThdPE(pe);
 					}
 					peToLine.add(pe);
 				}
 			}
-			if(!isLastAdded) peToLine.add(prevCommPE);
+			if(!commPEs.contains(prevCommPE) && !isLastAdded) peToLine.add(prevCommPE);
 		}else{
 			peToLine.addAll(processorList);
 		}		

src/projections/Tools/Timeline/EntryMethodObject.java

@@ -763,10 +763,11 @@ public boolean isDisplayed() {
 	}
 
 
-	public int paintMe(Graphics2D g2d, int actualDisplayWidth, int maxFilledX){
+	public boolean paintMe(Graphics2D g2d, int actualDisplayWidth, MainPanel.MaxFilledX maxFilledX){
+		boolean paintedEP = false;
 		// If it is hidden, we may not display it
 		if(!isDisplayed()){
-			return -1;
+			return paintedEP;
 		}
 
 		int leftCoord = data.timeToScreenPixel(beginTime, actualDisplayWidth);
@@ -798,7 +799,9 @@ public int paintMe(Graphics2D g2d, int actualDisplayWidth, int maxFilledX){
 		}
 
 		// Only draw this EMO if it covers some pixel that hasn't been filled yet
-		if (right > maxFilledX) {
+		if (right > maxFilledX.ep) {
+			maxFilledX.ep = right;
+			paintedEP = true;
 
 			// Determine the base color
 			Paint c = determineColor();
@@ -878,7 +881,10 @@ public int paintMe(Graphics2D g2d, int actualDisplayWidth, int maxFilledX){
 					// Compute the end pixel coordinate relative to the containing panel
 					int packEndCoordX = data.timeToScreenPixelRight(packEndTime);
 
-					g2d.fillRect(packBeginCoordX, topCoord+verticalInset+rectHeight, (packEndCoordX-packBeginCoordX+1), data.messagePackHeight());
+					if (packEndCoordX > maxFilledX.pack) {
+						maxFilledX.pack = packEndCoordX;
+						g2d.fillRect(packBeginCoordX, topCoord + verticalInset + rectHeight, (packEndCoordX - packBeginCoordX + 1), data.messagePackHeight());
+					}
 
 				}
 			}
@@ -898,13 +904,15 @@ public int paintMe(Graphics2D g2d, int actualDisplayWidth, int maxFilledX){
 				{
 					// Compute the pixel coordinate relative to the containing panel
 					int msgCoordX = data.timeToScreenPixel(msgtime);
-
-					g2d.drawLine(msgCoordX, topCoord+verticalInset+rectHeight, msgCoordX, topCoord+verticalInset+rectHeight+data.messageSendHeight());
+					if (msgCoordX > maxFilledX.msg) {
+						maxFilledX.msg = msgCoordX;
+						g2d.drawLine(msgCoordX, topCoord + verticalInset + rectHeight, msgCoordX, topCoord + verticalInset + rectHeight + data.messageSendHeight());
+					}
 				}
 			}
 		}
 
-		return right;
+		return paintedEP;
 	}
 
 

src/projections/Tools/Timeline/MainPanel.java

@@ -9,6 +9,7 @@
 import java.awt.Graphics2D;
 import java.awt.Point;
 import java.awt.Rectangle;
+import java.awt.RenderingHints;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 import java.awt.event.MouseMotionListener;
@@ -115,10 +116,12 @@ public void run() {
 	/** Paint the entire opaque panel*/
 	public void paintComponent(Graphics g) {
 		synchronized(data){
+			Graphics2D g2 = (Graphics2D)g;
+			g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
 			if(RenderInParallel && data.numPs()>1){
-				paintInParallel((Graphics2D)g);
+				paintInParallel(g2);
 			} else {
-				paintSequentially((Graphics2D)g);
+				paintSequentially(g2);
 			}
 		}
 	}
@@ -207,6 +210,18 @@ public void paintInParallel(Graphics g){
 
 	}
 
+	/**
+	 * Stores the maximum x coordinates of what has been drawn so far to avoid unnecessary overlapped drawing
+	 */
+	public class MaxFilledX {
+		public int ep, pack, msg;
+
+		public MaxFilledX() {
+			ep = 0;
+			pack = 0;
+			msg = 0;
+		}
+	}
 	/**
 	 * Paint the desired clipped region for this component 
 	 * 
@@ -231,13 +246,14 @@ public long paintAll(Graphics2D g){
 
 			if(l != null){ // FIXME: this shouldn't be here but is to fix a race condition with reloading ranges once something is displayed
 				Iterator<EntryMethodObject> iter = l.iterator(leftClipTime, rightClipTime);
-				int maxFilledX = 0; // Tracks maximum x index of filled pixels for this PE, used to optimize away
-				                    // drawing of multiple overlapping single pixel entry methods
+
+				// Saves the furthest right position EPs and msg lines have been drawn in
+				// order to optimize performance by only drawing when new pixels will be colored in
+				MaxFilledX maxFilledX = new MaxFilledX();
+
 				while(iter.hasNext()){
 					EntryMethodObject o = iter.next();
-					int emoMaxFilledX = o.paintMe((Graphics2D) g, getWidth(), maxFilledX);
-					if (emoMaxFilledX > maxFilledX) {
-						maxFilledX = emoMaxFilledX;
+					if(o.paintMe((Graphics2D) g, getWidth(), maxFilledX)) {
 						count1++;
 					}
 				}

src/projections/Tools/Timeline/WindowControls.java

@@ -9,8 +9,11 @@
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 import java.io.File;
+import java.io.FileReader;
 import java.net.URL;
 import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.Scanner;
 
 import javax.swing.ButtonGroup;
 import javax.swing.ImageIcon;
@@ -26,6 +29,7 @@
 import javax.swing.JRadioButtonMenuItem;
 import javax.swing.JTextField;
 import javax.swing.SwingWorker;
+import javax.swing.JFileChooser;
 
 import projections.gui.ChooseEntriesWindow;
 import projections.gui.FloatJTextField;
@@ -59,7 +63,7 @@ class WindowControls extends JPanel implements ActionListener,
 	// basic zoom controls
 	private JButton bDecrease, bIncrease, bReset;
 
-	private JButton bZoomSelected, bLoadSelected, bRanges;
+	private JButton bZoomSelected, bLoadSelected, bRanges, bOrder;
 
 	private JTextField highlightTime, selectionBeginTime, selectionEndTime,	selectionDiff;
 
@@ -114,7 +118,9 @@ class WindowControls extends JPanel implements ActionListener,
 	private JMenuItem mDisplayLegend;
 
 	private JMenuItem mDisplayTopTimesText;
-	
+
+	private JFileChooser chooseOrderfc;
+
 	protected WindowControls(TimelineWindow parentWindow_,
 			Data data_) {
 
@@ -132,7 +138,40 @@ protected WindowControls(TimelineWindow parentWindow_,
 		userEventWindow = new UserEventWindow(cbUserTable);
 
 	}
-	
+
+
+	protected void showOrderDialog() {
+		chooseOrderfc = new JFileChooser();
+		int returnVal = chooseOrderfc.showOpenDialog(parentWindow);
+		if(returnVal == JFileChooser.APPROVE_OPTION) {
+			String chosenFile = chooseOrderfc.getSelectedFile().getName();
+			String homeDir = System.getProperty("user.home");
+			String fullPath = String.join(File.separator, homeDir, chosenFile);
+
+			ArrayList<Integer> orderedList = readOrderFromFile(fullPath);
+			data.setProcessorList(orderedList);
+			parentWindow.refreshDisplay(true);
+			parentWindow.setVisible(true);
+		}
+
+	}
+
+	protected ArrayList<Integer> readOrderFromFile(String fileName) {
+		Scanner in = null;
+		try {
+			in = new Scanner(new FileReader(fileName));
+		} catch (java.io.FileNotFoundException ex) {
+			System.out.println("File not found: " + fileName);
+		}
+		ArrayList<Integer> orderedList = new ArrayList<Integer>();
+		String pe = null;
+
+		while (in.hasNextInt()) {
+			orderedList.add(in.nextInt());
+		}
+		in.close();
+		return orderedList;
+	}
 
 	protected void showDialog() {
 		if(dialog == null){
@@ -424,6 +463,10 @@ else if (c  == bRanges) {
 			showDialog();
 		}
 
+		else if (c  == bOrder) {
+			showOrderDialog();
+		}
+
 		else if (c  == bLoadSelected) {
 			loadSelected();
 			parentWindow.refreshDisplay(true);
@@ -743,6 +786,7 @@ private void CreateLayout() {
 		bZoomSelected = new JButton("Zoom Selection");
 		bLoadSelected = new JButton("Load Selection");
 		bRanges = new JButton("Load New Time/PE Range");
+		bOrder = new JButton("Set PE Order");
 
 		bZoomSelected.setEnabled(false);
 		bLoadSelected.setEnabled(false);
@@ -751,6 +795,7 @@ private void CreateLayout() {
 		bZoomSelected.addActionListener(this);
 		bLoadSelected.addActionListener(this);
 		bRanges.addActionListener(this);
+		bOrder.addActionListener(this);
 
 
 		highlightTime = new JTextField(" ");
@@ -774,6 +819,7 @@ private void CreateLayout() {
 		Util.gblAdd(zoomPanel, selectionEndTime,   gbc, 4, 2, 1, 1, 1, 1);
 		Util.gblAdd(zoomPanel, selectionDiff,      gbc, 5, 2, 1, 1, 1, 1);
 		Util.gblAdd(zoomPanel, bRanges,            gbc, 0, 1, 1, 1, 1, 1);
+		Util.gblAdd(zoomPanel, bOrder,             gbc, 1, 1, 1, 1, 1, 1);
 		Util.gblAdd(zoomPanel, new JLabel("Time At Mouse Cursor", JLabel.CENTER), gbc, 2, 1, 1, 1, 1, 1);
 		Util.gblAdd(zoomPanel, new JLabel("Selection Begin Time", JLabel.CENTER), gbc, 3, 1, 1, 1, 1, 1);
 		Util.gblAdd(zoomPanel, new JLabel("Selection End Time", JLabel.CENTER),	  gbc, 4, 1, 1, 1, 1, 1);