From 38f5c981a52675b023764cde0e070d69e4bde6cd Mon Sep 17 00:00:00 2001 From: jjenista Date: Mon, 22 Mar 2010 18:30:08 +0000 Subject: [PATCH] little bug in final reporting --- Robust/src/Analysis/Disjoint/DisjointAnalysis.java | 5 ++--- Robust/src/Benchmarks/disjoint/makefile | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Robust/src/Analysis/Disjoint/DisjointAnalysis.java b/Robust/src/Analysis/Disjoint/DisjointAnalysis.java index 2dbe1862..2c3b4d73 100644 --- a/Robust/src/Analysis/Disjoint/DisjointAnalysis.java +++ b/Robust/src/Analysis/Disjoint/DisjointAnalysis.java @@ -238,7 +238,7 @@ public class DisjointAnalysis { BufferedWriter bw = new BufferedWriter(new FileWriter(outputFile)); - bw.write("Conducting ownership analysis with allocation depth = " + bw.write("Conducting disjoint reachability analysis with allocation depth = " + allocationDepth + "\n"); bw.write(timeReport + "\n\n"); @@ -514,8 +514,7 @@ public class DisjointAnalysis { if( state.DISJOINTALIASFILE != null ) { if( state.TASK ) { - // not supporting tasks yet... - writeAllAliases(state.OWNERSHIPALIASFILE, treport, justtime, state.OWNERSHIPALIASTAB, state.lines); + writeAllAliases(state.DISJOINTALIASFILE, treport, justtime, state.DISJOINTALIASTAB, state.lines); } else { /* writeAllAliasesJava( aliasFile, diff --git a/Robust/src/Benchmarks/disjoint/makefile b/Robust/src/Benchmarks/disjoint/makefile index 41ac071f..c6467d44 100644 --- a/Robust/src/Benchmarks/disjoint/makefile +++ b/Robust/src/Benchmarks/disjoint/makefile @@ -1,7 +1,6 @@ BUILDSCRIPT=~/research/Robust/src/buildscript -BSFLAGS= -recover -justanalyze -ownership -ownaliasfiletab aliases.txt -enable-assertions #-ownwritedots final #-flatirtasks -BSFLAGS= -recover -justanalyze -disjoint -disjoint-k 2 -disjoint-write-dots final -disjoint-write-ihms -disjoint-alias-file aliases.txt normal -enable-assertions +BSFLAGS= -recover -justanalyze -disjoint -disjoint-k 1 -disjoint-write-dots final -disjoint-alias-file aliases.txt normal -enable-assertions all: $(BUILDSCRIPT) $(BSFLAGS) *.java -- 2.34.1