Merge branch 'master' into issue_138

Author: khatchad

edu.cuny.hunter.streamrefactoring.core/src/edu/cuny/hunter/streamrefactoring/core/analysis/StreamAnalyzer.java

@@ -189,7 +189,7 @@ public Map<IJavaProject, Collection<Entrypoint>> analyze() throws CoreException
 	 * @see #analyze().
 	 */
 	public Map<IJavaProject, Collection<Entrypoint>> analyze(Optional<TimeCollector> collector) throws CoreException {
-		LOGGER.info(() -> "Using N = " + this.getNForStreams() + ".");
+		LOGGER.fine(() -> "Using N = " + this.getNForStreams() + ".");
 
 		Map<IJavaProject, Collection<Entrypoint>> ret = new HashMap<>();
 

edu.cuny.hunter.streamrefactoring.core/src/edu/cuny/hunter/streamrefactoring/core/analysis/StreamStateMachine.java

@@ -429,6 +429,12 @@ else if (set2.isEmpty())
 		return ret;
 	}
 
+	private static void outputTypeStateStatistics(AggregateSolverResult result) {
+		LOGGER.info("Total instances: " + result.totalInstancesNum());
+		LOGGER.info("Processed instances: " + result.processedInstancesNum());
+		LOGGER.info("Skipped instances: " + result.skippedInstances());
+	}
+
 	private static IDFAState selectState(IDFAState state1, IDFAState state2) {
 		if (state1.getName().equals(BOTTOM_STATE_NAME))
 			return state2;
@@ -983,7 +989,9 @@ public Map<TypestateRule, Statistics> start(Set<Stream> streamSet, EclipseProjec
 				throw new RuntimeException("Exception caught during typestate analysis.", e);
 			}
 
-			// record statistics.
+			// record typestate statistics.
+			outputTypeStateStatistics(result);
+
 			Statistics lastStatistics = ret.put(rule,
 					new Statistics(result.processedInstancesNum(), result.skippedInstances()));
 			assert lastStatistics == null : "Reassociating statistics.";
@@ -1026,9 +1034,9 @@ public Map<TypestateRule, Statistics> start(Set<Stream> streamSet, EclipseProjec
 							// invocations?
 							if (isTerminalOperation(calledMethod)) {
 								// get the basic block for the call.
+								IR ir = cgNode.getIR();
 
-								ISSABasicBlock[] blocksForCall = cgNode.getIR()
-										.getBasicBlocksForCall(callSiteReference);
+								ISSABasicBlock[] blocksForCall = ir.getBasicBlocksForCall(callSiteReference);
 
 								assert blocksForCall.length == 1 : "Expecting only a single basic block for the call: "
 										+ callSiteReference;
@@ -1045,11 +1053,12 @@ public Map<TypestateRule, Statistics> start(Set<Stream> streamSet, EclipseProjec
 										// search through each instruction in the
 										// block.
 										int processedInstructions = 0;
+
 										for (SSAInstruction instruction : block) {
-											// if it's a phi instruction.
-											if (instruction instanceof SSAPhiInstruction)
-												// skip it. The pointer analysis
-												// below will handle it.
+											// if it's not an invoke instruction.
+											if (!(instruction instanceof SSAAbstractInvokeInstruction))
+												// skip it. Phi instructions will be handled by the pointer analysis
+												// below.
 												continue;
 
 											// Get the possible receivers. This

edu.cuny.hunter.streamrefactoring.core/src/edu/cuny/hunter/streamrefactoring/core/wala/EclipseProjectAnalysisEngine.java

@@ -178,7 +178,7 @@ public CallGraphBuilder<?> getCallGraphBuilder() {
 	@Override
 	protected CallGraphBuilder<?> getCallGraphBuilder(IClassHierarchy cha, AnalysisOptions options,
 			IAnalysisCacheView cache) {
-		LOGGER.info(() -> "Using N = " + this.getNToUseForStreams());
+		LOGGER.fine(() -> "Using N = " + this.getNToUseForStreams() + ".");
 		return Util.makeNCFABuilder(N, options, (AnalysisCache) cache, cha, scope, this.getNToUseForStreams());
 	}
 

edu.cuny.hunter.streamrefactoring.core/src/edu/cuny/hunter/streamrefactoring/core/wala/nCFAContextWithReceiversSelector.java

@@ -95,7 +95,7 @@ public nCFAContextWithReceiversSelector(int n, ContextSelector base) {
 	 */
 	public nCFAContextWithReceiversSelector(int n, ContextSelector base, int nToUseForStreams) {
 		super(n, base);
-		LOGGER.info(() -> "Using N = " + nToUseForStreams);
+		LOGGER.fine(() -> "Using N = " + nToUseForStreams + ".");
 		this.contextLengthForStreams = nToUseForStreams;
 	}
 
@@ -171,7 +171,7 @@ protected int getLength(CGNode caller, CallSiteReference site, IMethod target) {
 
 		if (implementsBaseStream) {
 			int lengthForStreams = this.getContextLengthForStreams();
-			LOGGER.finer(() -> "Using N = " + lengthForStreams);
+			LOGGER.finer(() -> "Using N = " + lengthForStreams + ".");
 			return lengthForStreams;
 		} else
 			return super.getLength(caller, site, target);

edu.cuny.hunter.streamrefactoring.tests/test cases/edu/cuny/hunter/streamrefactoring/ui/tests/ConvertStreamToParallelRefactoringTest.java

@@ -327,7 +327,7 @@ public String getRefactoringPath() {
 	 * Runs a single analysis test.
 	 */
 	private void helper(int nToUseForStreams, StreamAnalysisExpectedResult... expectedResults) throws Exception {
-		LOGGER.info("Using N = " + nToUseForStreams);
+		LOGGER.fine("Using N = " + nToUseForStreams + ".");
 
 		// compute the actual results.
 		ICompilationUnit cu = this.createCUfromTestFile(this.getPackageP(), "A");