Cleanup uses of oidToEntryMethodObjectsMap

rbuch · rbuch · commit 0852d35f8903 · 2021-05-03T12:37:48.000-04:00
Previously the collection of EMOs was a Set being stored as the value
in a &lt;ObjectID, List&gt; map. This change makes the actual collection
into a List to both match types and save space.
diff --git a/src/projections/Tools/Timeline/Data.java b/src/projections/Tools/Timeline/Data.java
@@ -670,7 +670,7 @@ protected void createTLOArray(boolean useHelperThreads, Component rootWindow, bo
 			{			
 				topTimesText = "<html>";
 				topTimesText+="The longest idle times in descending order are: <br>";
-				Set<EntryMethodObject> longestObjectsSet = new HashSet<EntryMethodObject>();
+				HashSet<EntryMethodObject> longestObjectsSet = new HashSet<EntryMethodObject>();
 				for (int i = 0; i < amountTopTimes(); i++)
 				{
 					if ((idleArray[i] == null) || (idleArray[i].getBeginTime() == objEndTimes[i]))
@@ -693,9 +693,7 @@ protected void createTLOArray(boolean useHelperThreads, Component rootWindow, bo
 					longestObjectsSet.add(entryArray[i]);
 				}
 				topTimesText+="</html>";
-				HashSet<Object> objsToHilite = new HashSet<Object>();
-				objsToHilite.addAll(longestObjectsSet);
-				highlightObjects(objsToHilite);
+				highlightObjects(longestObjectsSet);
 			}
 
 			// Spawn a thread that computes some secondary message related data structures
@@ -1521,15 +1519,15 @@ protected void clearObjectHighlights() {
 	}
 
 	/** Highlight the given set of timeline objects */
-	protected void highlightObjects(Set<Object> objects) {
+	protected void highlightObjects(Collection<EntryMethodObject> objects) {
 		highlightedObjects.addAll(objects);
 	}
 
 	/** Determine if an object should be dimmed. 
 	 * If there are any objects set to be highlighted, 
 	 * all others will be dimmed 
 	 */
-	protected boolean isObjectDimmed(Object o){
+	protected boolean isObjectDimmed(EntryMethodObject o){
 		if(highlightedObjects.size() == 0)
 			return false;
 		else
diff --git a/src/projections/Tools/Timeline/EntryMethodObject.java b/src/projections/Tools/Timeline/EntryMethodObject.java
@@ -452,9 +452,9 @@ public void mouseClicked(MouseEvent evt, JPanel parent, Data data)
                 Set<EntryMethodObject> back = traceBackwardDependencies();// this function acts differently depending on data.traceMessagesBackOnHover()
                 Set<EntryMethodObject> criticalpath = traceCriticalPathDependencies();// this function acts differently depending on data.traceMessagesBackOnHover()
 
-                HashSet<Object> fwdGeneric = new HashSet<Object>();
-                HashSet<Object> backGeneric =  new HashSet<Object>();
-                HashSet<Object> criticalpathGeneric =  new HashSet<Object>();
+                HashSet<EntryMethodObject> fwdGeneric = new HashSet<>();
+                HashSet<EntryMethodObject> backGeneric =  new HashSet<>();
+                HashSet<EntryMethodObject> criticalpathGeneric =  new HashSet<>();
                 fwdGeneric.addAll(fwd); // this function acts differently depending on data.traceMessagesForwardOnHover()
                 backGeneric.addAll(back); // this function acts differently depending on data.traceMessagesBackOnHover()
                 criticalpathGeneric.addAll(criticalpath); // this function acts differently depending on data.traceCriticalPathOnHover()
@@ -734,7 +734,7 @@ public void mouseEntered(MouseEvent evt)
 		// Highlight any Entry Method invocations for the same chare array element
 		if(data.traceOIDOnHover()){
 			synchronized(data.messageStructures){
-			Set allWithSameId = (Set) data.messageStructures.getOidToEntryMethodObjectsMap().get(tid);
+			List<EntryMethodObject> allWithSameId = data.messageStructures.getOidToEntryMethodObjectsMap().get(tid);
 			data.highlightObjects(allWithSameId);
 			needRepaint=true;
 			}
diff --git a/src/projections/Tools/Timeline/MessageStructures.java b/src/projections/Tools/Timeline/MessageStructures.java
@@ -1,12 +1,11 @@
 package projections.Tools.Timeline;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.TreeMap;
-import java.util.TreeSet;
 
 import projections.Tools.Timeline.RangeQueries.Query1D;
 import projections.analysis.ObjectId;
@@ -56,7 +55,7 @@ private void init(){
 			for(int i=0;i<pe;i++)
 				eventIDToEntryMethodMap[i] = new HashMap();
 			
-			oidToEntryMethodObjectsMap = new TreeMap();
+			oidToEntryMethodObjectsMap = new TreeMap<>();
 		}		
 	}
 
@@ -87,7 +86,7 @@ public void setOidToEntryMethodObjectsMap(Map oidToEntryMethodObjectsMap) {
 		this.oidToEntryMethodObjectsMap = oidToEntryMethodObjectsMap;
 	}
 
-	public Map getOidToEntryMethodObjectsMap() {
+	public Map<ObjectId, List<EntryMethodObject>> getOidToEntryMethodObjectsMap() {
 		return oidToEntryMethodObjectsMap;
 	}
 
@@ -204,11 +203,11 @@ protected void generate(ThreadMessageStructures structures){
 
 					if(getOidToEntryMethodObjectsMap().containsKey(id)){
 						// add obj to the existing set
-						TreeSet<EntryMethodObject> s = (TreeSet<EntryMethodObject>) getOidToEntryMethodObjectsMap().get(id);
+						List<EntryMethodObject> s = getOidToEntryMethodObjectsMap().get(id);
 						s.add(obj);
 					} else {
 						// create a set for the id
-						TreeSet<EntryMethodObject> s = new TreeSet<EntryMethodObject>();
+						ArrayList<EntryMethodObject> s = new ArrayList<EntryMethodObject>();
 						s.add(obj);
 						getOidToEntryMethodObjectsMap().put(id, s);
 					}

Original file line number	Diff line number	Diff line change
`@@ -670,7 +670,7 @@ protected void createTLOArray(boolean useHelperThreads, Component rootWindow, bo`
`670`	`670`	`{`
`671`	`671`	`topTimesText = "<html>";`
`672`	`672`	`topTimesText+="The longest idle times in descending order are: <br>";`
`673`		`- Set<EntryMethodObject> longestObjectsSet = new HashSet<EntryMethodObject>();`
	`673`	`+ HashSet<EntryMethodObject> longestObjectsSet = new HashSet<EntryMethodObject>();`
`674`	`674`	`for (int i = 0; i < amountTopTimes(); i++)`
`675`	`675`	`{`
`676`	`676`	`if ((idleArray[i] == null) \|\| (idleArray[i].getBeginTime() == objEndTimes[i]))`
`@@ -693,9 +693,7 @@ protected void createTLOArray(boolean useHelperThreads, Component rootWindow, bo`
`693`	`693`	`longestObjectsSet.add(entryArray[i]);`
`694`	`694`	`}`
`695`	`695`	`topTimesText+="</html>";`
`696`		`- HashSet<Object> objsToHilite = new HashSet<Object>();`
`697`		`- objsToHilite.addAll(longestObjectsSet);`
`698`		`- highlightObjects(objsToHilite);`
	`696`	`+ highlightObjects(longestObjectsSet);`
`699`	`697`	`}`
`700`	`698`
`701`	`699`	`// Spawn a thread that computes some secondary message related data structures`
`@@ -1521,15 +1519,15 @@ protected void clearObjectHighlights() {`
`1521`	`1519`	`}`
`1522`	`1520`
`1523`	`1521`	`/** Highlight the given set of timeline objects */`
`1524`		`- protected void highlightObjects(Set<Object> objects) {`
	`1522`	`+ protected void highlightObjects(Collection<EntryMethodObject> objects) {`
`1525`	`1523`	`highlightedObjects.addAll(objects);`
`1526`	`1524`	`}`
`1527`	`1525`
`1528`	`1526`	`/** Determine if an object should be dimmed.`
`1529`	`1527`	`* If there are any objects set to be highlighted,`
`1530`	`1528`	`* all others will be dimmed`
`1531`	`1529`	`*/`
`1532`		`- protected boolean isObjectDimmed(Object o){`
	`1530`	`+ protected boolean isObjectDimmed(EntryMethodObject o){`
`1533`	`1531`	`if(highlightedObjects.size() == 0)`
`1534`	`1532`	`return false;`
`1535`	`1533`	`else`