Fixed up another canonical misuse, changed wording of alias reporting to see the...

diff --git a/Robust/src/Analysis/OwnershipAnalysis/OwnershipAnalysis.java b/Robust/src/Analysis/OwnershipAnalysis/OwnershipAnalysis.java
index 5972b801fde57e5ede0647cefb3d8d956b599b35..b0dcfb47a193e390bb8ed8bf04889e7f65433564 100644 (file)
--- a/Robust/src/Analysis/OwnershipAnalysis/OwnershipAnalysis.java
+++ b/Robust/src/Analysis/OwnershipAnalysis/OwnershipAnalysis.java
@@ -134,7 +134,7 @@ public class OwnershipAnalysis {
       }
 
       if( !foundSomeAlias ) {
-       bw.write("Task "+td+" contains no aliases between flagged objects.\n");
+       bw.write("No aliases between flagged objects in Task "+td+".\n");
       }
     }
 

diff --git a/Robust/src/Analysis/OwnershipAnalysis/TokenTupleSet.java b/Robust/src/Analysis/OwnershipAnalysis/TokenTupleSet.java
index 30f135b335fcc5d8f2c0d8be12986705cb89ab7b..27dd22ebfd191a6ba6d8b830751e47ebc87e8a68 100644 (file)
--- a/Robust/src/Analysis/OwnershipAnalysis/TokenTupleSet.java
+++ b/Robust/src/Analysis/OwnershipAnalysis/TokenTupleSet.java
@@ -377,11 +377,11 @@ public class TokenTupleSet extends Canonical {
     while( itrThis.hasNext() ) {
       TokenTuple tt = itrThis.next();
 
-      ttsOut.tokenTuples.add( new TokenTuple( tt.getToken(),
+      ttsOut = ttsOut.union( new TokenTuple( tt.getToken(),
                                             tt.isMultiObject(),
                                             TokenTuple.ARITY_ZEROORMORE 
-                                           ).makeCanonical()
-                             );
+                                            ).makeCanonical()
+                            );
     }
 
     return ttsOut.makeCanonical();

diff --git a/Robust/src/Benchmarks/Ownership/ChatTag.txt b/Robust/src/Benchmarks/Ownership/ChatTag.txt
index 61339f7ee6aef7bb08904f60499bb0c663a5eb2e..0e06beb3cd2f0923a486f9e54ac57ae6ff8e2bd1 100644 (file)
--- a/Robust/src/Benchmarks/Ownership/ChatTag.txt
+++ b/Robust/src/Benchmarks/Ownership/ChatTag.txt
@@ -3,13 +3,13 @@ Conducting ownership analysis with allocation depth = 1
 Potential alias between parameter 0 and FlatNew____m2782___= NEW Message.
 
 ---------SendMessage(Message m)--------
-Task SendMessage(Message m) contains no aliases between flagged objects.
+No aliases between flagged objects in Task SendMessage(Message m).
 
 ---------Startup(StartupObject s)--------
-Task Startup(StartupObject s) contains no aliases between flagged objects.
+No aliases between flagged objects in Task Startup(StartupObject s).
 
 ---------ReadRequest(ChatSocket cs, Socket s)--------
-Task ReadRequest(ChatSocket cs, Socket s) contains no aliases between flagged objects.
+No aliases between flagged objects in Task ReadRequest(ChatSocket cs, Socket s).
 
 ---------AcceptConnection(ServerSocket ss)--------
 Potential alias between FlatNew____cs2817___= NEW ChatSocket and FlatNew____s1933___= NEW Socket.

diff --git a/Robust/src/Benchmarks/Ownership/Conglomerator.txt b/Robust/src/Benchmarks/Ownership/Conglomerator.txt
index ec1059933dc0d3d6b91e2e76ea41680ccd0d395d..49bd4bdd1459a0dd5cd7ef7f2ba42015f595be2e 100644 (file)
--- a/Robust/src/Benchmarks/Ownership/Conglomerator.txt
+++ b/Robust/src/Benchmarks/Ownership/Conglomerator.txt
@@ -1,36 +1,36 @@
 Conducting ownership analysis with allocation depth = 1
 ---------LogRequest(WebServerSocket web, Logger log)--------
-Task LogRequest(WebServerSocket web, Logger log) contains no aliases between flagged objects.
+No aliases between flagged objects in Task LogRequest(WebServerSocket web, Logger log).
 
 ---------SendFile(WebServerSocket web, MySocket s)--------
-Task SendFile(WebServerSocket web, MySocket s) contains no aliases between flagged objects.
+No aliases between flagged objects in Task SendFile(WebServerSocket web, MySocket s).
 
 ---------LookupS(Stock l)--------
-Task LookupS(Stock l) contains no aliases between flagged objects.
+No aliases between flagged objects in Task LookupS(Stock l).
 
 ---------Startup(StartupObject s)--------
-Task Startup(StartupObject s) contains no aliases between flagged objects.
+No aliases between flagged objects in Task Startup(StartupObject s).
 
 ---------ReceiveQueryS(Stock l)--------
-Task ReceiveQueryS(Stock l) contains no aliases between flagged objects.
+No aliases between flagged objects in Task ReceiveQueryS(Stock l).
 
 ---------AcceptConnection(ServerSocket ss)--------
-Task AcceptConnection(ServerSocket ss) contains no aliases between flagged objects.
+No aliases between flagged objects in Task AcceptConnection(ServerSocket ss).
 
 ---------LookupW(Weather l)--------
-Task LookupW(Weather l) contains no aliases between flagged objects.
+No aliases between flagged objects in Task LookupW(Weather l).
 
 ---------Transaction(WebServerSocket web, Weather weather, Google g, MySocket s, Stock st)--------
-Task Transaction(WebServerSocket web, Weather weather, Google g, MySocket s, Stock st) contains no aliases between flagged objects.
+No aliases between flagged objects in Task Transaction(WebServerSocket web, Weather weather, Google g, MySocket s, Stock st).
 
 ---------ReceiveQueryG(Google l)--------
-Task ReceiveQueryG(Google l) contains no aliases between flagged objects.
+No aliases between flagged objects in Task ReceiveQueryG(Google l).
 
 ---------ReceiveQueryW(Weather l)--------
-Task ReceiveQueryW(Weather l) contains no aliases between flagged objects.
+No aliases between flagged objects in Task ReceiveQueryW(Weather l).
 
 ---------LookupG(Google l)--------
-Task LookupG(Google l) contains no aliases between flagged objects.
+No aliases between flagged objects in Task LookupG(Google l).
 
 ---------ProcessRequest(WebServerSocket web, MySocket s)--------
-Task ProcessRequest(WebServerSocket web, MySocket s) contains no aliases between flagged objects.
+No aliases between flagged objects in Task ProcessRequest(WebServerSocket web, MySocket s).

diff --git a/Robust/src/Benchmarks/Ownership/Jhttpp2BR.txt b/Robust/src/Benchmarks/Ownership/Jhttpp2BR.txt
index d814158fc0854518cfb42c65810a2dc5b2e75474..862f0258250d7bd75df22352b3e22de0ca7f122d 100644 (file)
--- a/Robust/src/Benchmarks/Ownership/Jhttpp2BR.txt
+++ b/Robust/src/Benchmarks/Ownership/Jhttpp2BR.txt
@@ -1,30 +1,30 @@
 Conducting ownership analysis with allocation depth = 1
 ---------request(Jhttpp2HTTPSession session, Jhttpp2ClientInputStream jcis, MySocket socket, Request rold)--------
-Task request(Jhttpp2HTTPSession session, Jhttpp2ClientInputStream jcis, MySocket socket, Request rold) contains no aliases between flagged objects.
+No aliases between flagged objects in Task request(Jhttpp2HTTPSession session, Jhttpp2ClientInputStream jcis, MySocket socket, Request rold).
 
 ---------start(StartupObject s)--------
-Task start(StartupObject s) contains no aliases between flagged objects.
+No aliases between flagged objects in Task start(StartupObject s).
 
 ---------sendnext(Request rprev, Request r)--------
-Task sendnext(Request rprev, Request r) contains no aliases between flagged objects.
+No aliases between flagged objects in Task sendnext(Request rprev, Request r).
 
 ---------sendfirst(Request r)--------
-Task sendfirst(Request r) contains no aliases between flagged objects.
+No aliases between flagged objects in Task sendfirst(Request r).
 
 ---------sendfirstresp(Request r, MySocket sock)--------
-Task sendfirstresp(Request r, MySocket sock) contains no aliases between flagged objects.
+No aliases between flagged objects in Task sendfirstresp(Request r, MySocket sock).
 
 ---------recvreq(Request r)--------
-Task recvreq(Request r) contains no aliases between flagged objects.
+No aliases between flagged objects in Task recvreq(Request r).
 
 ---------requestmore(Jhttpp2HTTPSession session, Jhttpp2ClientInputStream jcis, Request rold)--------
-Task requestmore(Jhttpp2HTTPSession session, Jhttpp2ClientInputStream jcis, Request rold) contains no aliases between flagged objects.
+No aliases between flagged objects in Task requestmore(Jhttpp2HTTPSession session, Jhttpp2ClientInputStream jcis, Request rold).
 
 ---------sendresp(Request rprev, Request r, MySocket sock)--------
-Task sendresp(Request rprev, Request r, MySocket sock) contains no aliases between flagged objects.
+No aliases between flagged objects in Task sendresp(Request rprev, Request r, MySocket sock).
 
 ---------acceptconnection(ServerSocket ss)--------
-Task acceptconnection(ServerSocket ss) contains no aliases between flagged objects.
+No aliases between flagged objects in Task acceptconnection(ServerSocket ss).
 
 ---------requestfirst(Jhttpp2HTTPSession session, Jhttpp2ClientInputStream jcis, MySocket socket)--------
-Task requestfirst(Jhttpp2HTTPSession session, Jhttpp2ClientInputStream jcis, MySocket socket) contains no aliases between flagged objects.
+No aliases between flagged objects in Task requestfirst(Jhttpp2HTTPSession session, Jhttpp2ClientInputStream jcis, MySocket socket).

diff --git a/Robust/src/Benchmarks/Ownership/MMGTag.txt b/Robust/src/Benchmarks/Ownership/MMGTag.txt
index d03e45b01f85d6eb7fb125d3b0164d99bd0ba68e..89e7dd772f8f303980e1c287ce1311efc109988f 100644 (file)
--- a/Robust/src/Benchmarks/Ownership/MMGTag.txt
+++ b/Robust/src/Benchmarks/Ownership/MMGTag.txt
@@ -1,75 +1,26 @@
-Analyzing public  Pacman.Pacman(int x, int y, Map map)
-Analyzing next(Map map)
-    exhaustiveArityCombinations numDimensions = 11
-[[92, 93S, 14S*]
-[14S, 92, 93S*]
-[92, 14S*]
-[92, 93S, 14S*, 90]
-[92]
-[14S, 92, 90]
-[14S, 92]
-[92, 93S*, 14S*]
-[92, 93S*, 14S*, 90]
-[92, 14S*, 90]
-[14S, 92, 93S]]
-x
-    exhaustiveArityCombinations numDimensions = 12
-[[14S, 92, 93S*]
-[92, 93S, 14S*]
-[92, 14S*]
-[92]
-[92, 93S, 14S*, 90]
-[14S, 92, 90]
-[14S, 92]
-[92, 93S*, 14S*]
-[92, 93S*, 14S*, 90]
-[92, 14S*, 90]
-[14S, 92, 93S, 90]
-[14S, 92, 93S]]
-xxx
-    exhaustiveArityCombinations numDimensions = 13
-[[92, 93S, 14S*]
-[14S, 92, 93S*]
-[92]
-[14S, 92]
-[92, 93S*, 14S*]
-[92, 93S*, 14S*, 90]
-[92, 14S*, 90]
-[92, 14S*]
-[92, 93S, 14S*, 90]
-[14S, 92, 93S*, 90]
-[14S, 92, 90]
-[14S, 92, 93S, 90]
-[14S, 92, 93S]]
-xxxxxxxxx
-    exhaustiveArityCombinations numDimensions = 27
-[[14S, 92, 91S, 90]
-[92]
-[92, 93S*, 14S*, 90]
-[92, 14S*, 90]
-[91S*, 92, 14S*]
-[92, 14S*]
-[91S*, 92, 14S*, 90]
-[91S*, 92, 93S, 14S*, 90]
-[92, 93S*, 14S*, 91S, 90]
-[14S, 92, 91S]
-[92, 14S*, 91S, 90]
-[92, 93S*, 14S*, 91S]
-[91S*, 92, 93S, 14S*]
-[92, 93S, 14S*, 91S, 90]
-[14S, 92, 93S]
-[14S, 92, 93S*]
-[92, 93S, 14S*]
-[91S*, 92, 93S*, 14S*]
-[14S, 92]
-[91S*, 92, 93S*, 14S*, 90]
-[92, 93S*, 14S*]
-[92, 93S, 14S*, 91S]
-[92, 14S*, 91S]
-[92, 93S, 14S*, 90]
-[14S, 92, 93S*, 90]
-[14S, 92, 90]
-[14S, 92, 93S, 90]]
-x
+Conducting ownership analysis with allocation depth = 1
+---------movePacman(Pacman p)--------
+No aliases between flagged objects in Task movePacman(Pacman p).
 
+---------initMap(Map map)--------
+Potential alias between parameter 0 and FlatNew____pacman6987___= NEW Pacman.
+Potential alias between parameter 0 and FlatNew____ghost6966___= NEW Ghost.
 
+---------updatePac(Map map, Pacman p)--------
+No aliases between flagged objects in Task updatePac(Map map, Pacman p).
+
+---------next(Map map)--------
+Potential alias between parameter 0 and FlatNew____pacman7136___= NEW Pacman.
+Potential alias between parameter 0 and FlatNew____ghost7100___= NEW Ghost.
+
+---------startup(StartupObject s)--------
+No aliases between flagged objects in Task startup(StartupObject s).
+
+---------finish(Map map)--------
+No aliases between flagged objects in Task finish(Map map).
+
+---------updateGhost(Map map, Ghost g)--------
+No aliases between flagged objects in Task updateGhost(Map map, Ghost g).
+
+---------moveGhost(Ghost g)--------
+No aliases between flagged objects in Task moveGhost(Ghost g).

diff --git a/Robust/src/Benchmarks/Ownership/MapReduceTag.txt b/Robust/src/Benchmarks/Ownership/MapReduceTag.txt
index 9697280a2b642c4b18ef61284e4188c4bf513535..142b62231b223eb37f61b5b2f09740615dbe0603 100644 (file)
--- a/Robust/src/Benchmarks/Ownership/MapReduceTag.txt
+++ b/Robust/src/Benchmarks/Ownership/MapReduceTag.txt
@@ -1,21 +1,21 @@
 Conducting ownership analysis with allocation depth = 1
 ---------sortgroup(ReduceWorker rworker)--------
-Task sortgroup(ReduceWorker rworker) contains no aliases between flagged objects.
+No aliases between flagged objects in Task sortgroup(ReduceWorker rworker).
 
 ---------assignReduce(Master master)--------
 Potential alias between parameter 0 and FlatNew____rworker894___= NEW ReduceWorker.
 
 ---------map(MapWorker mworker)--------
-Task map(MapWorker mworker) contains no aliases between flagged objects.
+No aliases between flagged objects in Task map(MapWorker mworker).
 
 ---------reduceOutput(Master master, ReduceWorker rworker)--------
-Task reduceOutput(Master master, ReduceWorker rworker) contains no aliases between flagged objects.
+No aliases between flagged objects in Task reduceOutput(Master master, ReduceWorker rworker).
 
 ---------mapOutput(Master master, MapWorker mworker)--------
-Task mapOutput(Master master, MapWorker mworker) contains no aliases between flagged objects.
+No aliases between flagged objects in Task mapOutput(Master master, MapWorker mworker).
 
 ---------startup(StartupObject s)--------
-Task startup(StartupObject s) contains no aliases between flagged objects.
+No aliases between flagged objects in Task startup(StartupObject s).
 
 ---------output(Master master)--------
-Task output(Master master) contains no aliases between flagged objects.
+No aliases between flagged objects in Task output(Master master).

diff --git a/Robust/src/Benchmarks/Ownership/PERTTag.txt b/Robust/src/Benchmarks/Ownership/PERTTag.txt
index 06d1e11840a93812c1bfbe20a351f807ee87695b..286aeaf94a7d2a9c3b3c3f6517ec95a13c2f6897 100644 (file)
--- a/Robust/src/Benchmarks/Ownership/PERTTag.txt
+++ b/Robust/src/Benchmarks/Ownership/PERTTag.txt
@@ -1,15 +1,15 @@
 Conducting ownership analysis with allocation depth = 1
 ---------estimateStage(Stage s)--------
-Task estimateStage(Stage s) contains no aliases between flagged objects.
+No aliases between flagged objects in Task estimateStage(Stage s).
 
 ---------sampling(Stage s)--------
-Task sampling(Stage s) contains no aliases between flagged objects.
+No aliases between flagged objects in Task sampling(Stage s).
 
 ---------estimate(Estimator e, Stage s)--------
-Task estimate(Estimator e, Stage s) contains no aliases between flagged objects.
+No aliases between flagged objects in Task estimate(Estimator e, Stage s).
 
 ---------startup(StartupObject s)--------
-Task startup(StartupObject s) contains no aliases between flagged objects.
+No aliases between flagged objects in Task startup(StartupObject s).
 
 ---------prob(Estimator e)--------
-Task prob(Estimator e) contains no aliases between flagged objects.
+No aliases between flagged objects in Task prob(Estimator e).

diff --git a/Robust/src/Benchmarks/Ownership/SchedulingFilterBank.txt b/Robust/src/Benchmarks/Ownership/SchedulingFilterBank.txt
index 7cad7fb562cb2373c64b9e6b65d600af34844fc0..f492d984ec54050854747120783fc733e3d5fb7c 100644 (file)
--- a/Robust/src/Benchmarks/Ownership/SchedulingFilterBank.txt
+++ b/Robust/src/Benchmarks/Ownership/SchedulingFilterBank.txt
@@ -1,12 +1,12 @@
 Conducting ownership analysis with allocation depth = 1
 ---------t1(StartupObject s)--------
-Task t1(StartupObject s) contains no aliases between flagged objects.
+No aliases between flagged objects in Task t1(StartupObject s).
 
 ---------t2(FilterBankAtom fba)--------
-Task t2(FilterBankAtom fba) contains no aliases between flagged objects.
+No aliases between flagged objects in Task t2(FilterBankAtom fba).
 
 ---------t4(FilterBank fb)--------
-Task t4(FilterBank fb) contains no aliases between flagged objects.
+No aliases between flagged objects in Task t4(FilterBank fb).
 
 ---------t3(FilterBank fb, FilterBankAtom fba)--------
-Task t3(FilterBank fb, FilterBankAtom fba) contains no aliases between flagged objects.
+No aliases between flagged objects in Task t3(FilterBank fb, FilterBankAtom fba).

diff --git a/Robust/src/Benchmarks/Ownership/SchedulingJGFMonteCarlo.txt b/Robust/src/Benchmarks/Ownership/SchedulingJGFMonteCarlo.txt
index e4f1fa1b5801fc8364265a0802704c9e2f047063..af817108f27209eb15e6e8b23ecfb4df2aa8f6fb 100644 (file)
--- a/Robust/src/Benchmarks/Ownership/SchedulingJGFMonteCarlo.txt
+++ b/Robust/src/Benchmarks/Ownership/SchedulingJGFMonteCarlo.txt
@@ -1,12 +1,12 @@
 Conducting ownership analysis with allocation depth = 1
 ---------t3(AppDemo ad, AppDemoRunner adr)--------
-Task t3(AppDemo ad, AppDemoRunner adr) contains no aliases between flagged objects.
+No aliases between flagged objects in Task t3(AppDemo ad, AppDemoRunner adr).
 
 ---------t2(AppDemoRunner adr)--------
-Task t2(AppDemoRunner adr) contains no aliases between flagged objects.
+No aliases between flagged objects in Task t2(AppDemoRunner adr).
 
 ---------t1(StartupObject s)--------
-Task t1(StartupObject s) contains no aliases between flagged objects.
+No aliases between flagged objects in Task t1(StartupObject s).
 
 ---------t5(AppDemo ad)--------
-Task t5(AppDemo ad) contains no aliases between flagged objects.
+No aliases between flagged objects in Task t5(AppDemo ad).

diff --git a/Robust/src/Benchmarks/Ownership/SchedulingJGFSeries.txt b/Robust/src/Benchmarks/Ownership/SchedulingJGFSeries.txt
index bdb8c0918231e33304a89f192f1fa25606f71f7f..f968eaf0067b433881b41711fa5c107409131d7d 100644 (file)
--- a/Robust/src/Benchmarks/Ownership/SchedulingJGFSeries.txt
+++ b/Robust/src/Benchmarks/Ownership/SchedulingJGFSeries.txt
@@ -1,6 +1,6 @@
 Conducting ownership analysis with allocation depth = 1
 ---------t1(StartupObject s)--------
-Task t1(StartupObject s) contains no aliases between flagged objects.
+No aliases between flagged objects in Task t1(StartupObject s).
 
 ---------t2(SeriesRunner sr)--------
-Task t2(SeriesRunner sr) contains no aliases between flagged objects.
+No aliases between flagged objects in Task t2(SeriesRunner sr).

diff --git a/Robust/src/Benchmarks/Ownership/SchedulingMapReduce.txt b/Robust/src/Benchmarks/Ownership/SchedulingMapReduce.txt
index 3bc90078969aa47e9440da2a1dee70d2ff217531..2d1a17415d692c26f585964c6234e536b42684e9 100644 (file)
--- a/Robust/src/Benchmarks/Ownership/SchedulingMapReduce.txt
+++ b/Robust/src/Benchmarks/Ownership/SchedulingMapReduce.txt
@@ -1,33 +1,33 @@
 Conducting ownership analysis with allocation depth = 1
 ---------t8(ReduceWorker rworker)--------
-Task t8(ReduceWorker rworker) contains no aliases between flagged objects.
+No aliases between flagged objects in Task t8(ReduceWorker rworker).
 
 ---------t5(MapWorker mworker)--------
-Task t5(MapWorker mworker) contains no aliases between flagged objects.
+No aliases between flagged objects in Task t5(MapWorker mworker).
 
 ---------t10(Master master, ReduceWorker rworker)--------
-Task t10(Master master, ReduceWorker rworker) contains no aliases between flagged objects.
+No aliases between flagged objects in Task t10(Master master, ReduceWorker rworker).
 
 ---------t4(MapWorker mworker)--------
-Task t4(MapWorker mworker) contains no aliases between flagged objects.
+No aliases between flagged objects in Task t4(MapWorker mworker).
 
 ---------t2(Master master)--------
-Task t2(Master master) contains no aliases between flagged objects.
+No aliases between flagged objects in Task t2(Master master).
 
 ---------t6(Master master, MapWorker mworker)--------
 Potential alias between parameters 0 and 1.
 
 ---------t3(Master master)--------
-Task t3(Master master) contains no aliases between flagged objects.
+No aliases between flagged objects in Task t3(Master master).
 
 ---------t1(StartupObject s)--------
-Task t1(StartupObject s) contains no aliases between flagged objects.
+No aliases between flagged objects in Task t1(StartupObject s).
 
 ---------t7(Master master)--------
 Potential alias between parameter 0 and FlatNew____rworker3429___= NEW ReduceWorker.
 
 ---------t11(Master master)--------
-Task t11(Master master) contains no aliases between flagged objects.
+No aliases between flagged objects in Task t11(Master master).
 
 ---------t9(ReduceWorker rworker)--------
-Task t9(ReduceWorker rworker) contains no aliases between flagged objects.
+No aliases between flagged objects in Task t9(ReduceWorker rworker).

diff --git a/Robust/src/Benchmarks/Ownership/SpiderBR.txt b/Robust/src/Benchmarks/Ownership/SpiderBR.txt
index 28a4ee7238b243c2de7ddff955c9a7db2da06c6c..954b95ef1270b892007516c258af53d0c1b651bc 100644 (file)
--- a/Robust/src/Benchmarks/Ownership/SpiderBR.txt
+++ b/Robust/src/Benchmarks/Ownership/SpiderBR.txt
@@ -1,12 +1,12 @@
 Conducting ownership analysis with allocation depth = 1
 ---------processPage(Query q, QueryList ql)--------
-Task processPage(Query q, QueryList ql) contains no aliases between flagged objects.
+No aliases between flagged objects in Task processPage(Query q, QueryList ql).
 
 ---------requestQuery(Query q)--------
-Task requestQuery(Query q) contains no aliases between flagged objects.
+No aliases between flagged objects in Task requestQuery(Query q).
 
 ---------readResponse(Query q)--------
-Task readResponse(Query q) contains no aliases between flagged objects.
+No aliases between flagged objects in Task readResponse(Query q).
 
 ---------Startup(StartupObject s)--------
-Task Startup(StartupObject s) contains no aliases between flagged objects.
+No aliases between flagged objects in Task Startup(StartupObject s).

diff --git a/Robust/src/Benchmarks/Ownership/SpiderBRTag.txt b/Robust/src/Benchmarks/Ownership/SpiderBRTag.txt
index 2caf46ce808176244bedeca2dba206a94095a453..d2fe7476add7d6cfb633849958ecc4f750df16ef 100644 (file)
--- a/Robust/src/Benchmarks/Ownership/SpiderBRTag.txt
+++ b/Robust/src/Benchmarks/Ownership/SpiderBRTag.txt
@@ -1,12 +1,12 @@
 Conducting ownership analysis with allocation depth = 1
 ---------requestQuery(Query q, Socket s)--------
-Task requestQuery(Query q, Socket s) contains no aliases between flagged objects.
+No aliases between flagged objects in Task requestQuery(Query q, Socket s).
 
 ---------Startup(StartupObject s)--------
-Task Startup(StartupObject s) contains no aliases between flagged objects.
+No aliases between flagged objects in Task Startup(StartupObject s).
 
 ---------processPage(Query q, QueryList ql)--------
-Task processPage(Query q, QueryList ql) contains no aliases between flagged objects.
+No aliases between flagged objects in Task processPage(Query q, QueryList ql).
 
 ---------readResponse(Query q, Socket s)--------
-Task readResponse(Query q, Socket s) contains no aliases between flagged objects.
+No aliases between flagged objects in Task readResponse(Query q, Socket s).

diff --git a/Robust/src/Benchmarks/Ownership/TTTTag.txt b/Robust/src/Benchmarks/Ownership/TTTTag.txt
index a06f33cc31c17dd358e02ae9febf36662ce821af..70617d546bcfe3552f39ecb135fdb0583844e944 100644 (file)
--- a/Robust/src/Benchmarks/Ownership/TTTTag.txt
+++ b/Robust/src/Benchmarks/Ownership/TTTTag.txt
@@ -1,21 +1,21 @@
 Conducting ownership analysis with allocation depth = 1
 ---------AcceptConnection(ServerSocket ss)--------
-Task AcceptConnection(ServerSocket ss) contains no aliases between flagged objects.
+No aliases between flagged objects in Task AcceptConnection(ServerSocket ss).
 
 ---------Startup(StartupObject s)--------
-Task Startup(StartupObject s) contains no aliases between flagged objects.
+No aliases between flagged objects in Task Startup(StartupObject s).
 
 ---------SendBoardDisplay(TTTServerSocket ttts, Board tttBoard, Socket s)--------
-Task SendBoardDisplay(TTTServerSocket ttts, Board tttBoard, Socket s) contains no aliases between flagged objects.
+No aliases between flagged objects in Task SendBoardDisplay(TTTServerSocket ttts, Board tttBoard, Socket s).
 
 ---------ProcessRequest(TTTServerSocket ttts, Socket s)--------
-Task ProcessRequest(TTTServerSocket ttts, Socket s) contains no aliases between flagged objects.
+No aliases between flagged objects in Task ProcessRequest(TTTServerSocket ttts, Socket s).
 
 ---------ProcessMove(TTTServerSocket ttts, Board tttBoard)--------
-Task ProcessMove(TTTServerSocket ttts, Board tttBoard) contains no aliases between flagged objects.
+No aliases between flagged objects in Task ProcessMove(TTTServerSocket ttts, Board tttBoard).
 
 ---------SendErrorMessage(TTTServerSocket ttts, Board tttBoard, Socket s)--------
-Task SendErrorMessage(TTTServerSocket ttts, Board tttBoard, Socket s) contains no aliases between flagged objects.
+No aliases between flagged objects in Task SendErrorMessage(TTTServerSocket ttts, Board tttBoard, Socket s).
 
 ---------GameOver(TTTServerSocket ttts, Board tttBoard, Socket s)--------
-Task GameOver(TTTServerSocket ttts, Board tttBoard, Socket s) contains no aliases between flagged objects.
+No aliases between flagged objects in Task GameOver(TTTServerSocket ttts, Board tttBoard, Socket s).

diff --git a/Robust/src/Benchmarks/Ownership/TileSearchTag.txt b/Robust/src/Benchmarks/Ownership/TileSearchTag.txt
index fc7cdbab3ae7f5c4995ae574e97a03374532dc3f..e70455eb7036dd1cdc28b638699db576b8d78416 100644 (file)
--- a/Robust/src/Benchmarks/Ownership/TileSearchTag.txt
+++ b/Robust/src/Benchmarks/Ownership/TileSearchTag.txt
@@ -1,15 +1,15 @@
 Conducting ownership analysis with allocation depth = 1
 ---------printHighestScore(SubProblem sp)--------
-Task printHighestScore(SubProblem sp) contains no aliases between flagged objects.
+No aliases between flagged objects in Task printHighestScore(SubProblem sp).
 
 ---------scoreSubProbleam(SubProblem sp)--------
-Task scoreSubProbleam(SubProblem sp) contains no aliases between flagged objects.
+No aliases between flagged objects in Task scoreSubProbleam(SubProblem sp).
 
 ---------findHighestScore(SubProblem pSp, SubProblem cSp, GlobalCounter counter)--------
-Task findHighestScore(SubProblem pSp, SubProblem cSp, GlobalCounter counter) contains no aliases between flagged objects.
+No aliases between flagged objects in Task findHighestScore(SubProblem pSp, SubProblem cSp, GlobalCounter counter).
 
 ---------Startup(StartupObject s)--------
-Task Startup(StartupObject s) contains no aliases between flagged objects.
+No aliases between flagged objects in Task Startup(StartupObject s).
 
 ---------findNewFits(SubProblem sp, GlobalCounter counter)--------
-Task findNewFits(SubProblem sp, GlobalCounter counter) contains no aliases between flagged objects.
+No aliases between flagged objects in Task findNewFits(SubProblem sp, GlobalCounter counter).

diff --git a/Robust/src/Benchmarks/Ownership/WebServer.txt b/Robust/src/Benchmarks/Ownership/WebServer.txt
index 90209166668cd0a243e3cc86e435e6d5ce49b57e..d1c16ee30f36c068ce7313dc0bba6b8fa113631d 100644 (file)
--- a/Robust/src/Benchmarks/Ownership/WebServer.txt
+++ b/Robust/src/Benchmarks/Ownership/WebServer.txt
@@ -1,18 +1,18 @@
 Conducting ownership analysis with allocation depth = 1
 ---------LogRequest(WebServerSocket web, Logger log)--------
-Task LogRequest(WebServerSocket web, Logger log) contains no aliases between flagged objects.
+No aliases between flagged objects in Task LogRequest(WebServerSocket web, Logger log).
 
 ---------ProcessRequest(WebServerSocket web)--------
-Task ProcessRequest(WebServerSocket web) contains no aliases between flagged objects.
+No aliases between flagged objects in Task ProcessRequest(WebServerSocket web).
 
 ---------AcceptConnection(ServerSocket ss)--------
-Task AcceptConnection(ServerSocket ss) contains no aliases between flagged objects.
+No aliases between flagged objects in Task AcceptConnection(ServerSocket ss).
 
 ---------Transaction(WebServerSocket web, Inventory inventorylist)--------
-Task Transaction(WebServerSocket web, Inventory inventorylist) contains no aliases between flagged objects.
+No aliases between flagged objects in Task Transaction(WebServerSocket web, Inventory inventorylist).
 
 ---------Startup(StartupObject s)--------
-Task Startup(StartupObject s) contains no aliases between flagged objects.
+No aliases between flagged objects in Task Startup(StartupObject s).
 
 ---------SendFile(WebServerSocket web)--------
-Task SendFile(WebServerSocket web) contains no aliases between flagged objects.
+No aliases between flagged objects in Task SendFile(WebServerSocket web).

diff --git a/Robust/src/Benchmarks/Ownership/WebServerTag.txt b/Robust/src/Benchmarks/Ownership/WebServerTag.txt
index 3a2905a9a796082c0d36be01cf4e1cd19eedcdb5..41a015732f5f3e6a9556cce7110e1d90f6c6a69a 100644 (file)
--- a/Robust/src/Benchmarks/Ownership/WebServerTag.txt
+++ b/Robust/src/Benchmarks/Ownership/WebServerTag.txt
@@ -1,18 +1,18 @@
 Conducting ownership analysis with allocation depth = 1
 ---------SendFile(WebServerSocket web, Socket s)--------
-Task SendFile(WebServerSocket web, Socket s) contains no aliases between flagged objects.
+No aliases between flagged objects in Task SendFile(WebServerSocket web, Socket s).
 
 ---------Startup(StartupObject s)--------
-Task Startup(StartupObject s) contains no aliases between flagged objects.
+No aliases between flagged objects in Task Startup(StartupObject s).
 
 ---------Transaction(WebServerSocket web, Inventory inventorylist, Socket s)--------
-Task Transaction(WebServerSocket web, Inventory inventorylist, Socket s) contains no aliases between flagged objects.
+No aliases between flagged objects in Task Transaction(WebServerSocket web, Inventory inventorylist, Socket s).
 
 ---------ProcessRequest(WebServerSocket web, Socket s)--------
-Task ProcessRequest(WebServerSocket web, Socket s) contains no aliases between flagged objects.
+No aliases between flagged objects in Task ProcessRequest(WebServerSocket web, Socket s).
 
 ---------LogRequest(WebServerSocket web, Logger log)--------
-Task LogRequest(WebServerSocket web, Logger log) contains no aliases between flagged objects.
+No aliases between flagged objects in Task LogRequest(WebServerSocket web, Logger log).
 
 ---------AcceptConnection(ServerSocket ss)--------
-Task AcceptConnection(ServerSocket ss) contains no aliases between flagged objects.
+No aliases between flagged objects in Task AcceptConnection(ServerSocket ss).

diff --git a/Robust/src/Benchmarks/Ownership/summary.txt b/Robust/src/Benchmarks/Ownership/summary.txt
index 71147fa564bacfedc5b4e6f2cb3c86476a70a72a..30afc48ed9b6db221b613f6597a8014227b93abc 100644 (file)
--- a/Robust/src/Benchmarks/Ownership/summary.txt
+++ b/Robust/src/Benchmarks/Ownership/summary.txt
@@ -1,24 +1,25 @@
 No reported aliases in:
--BankApp
--Conglomerator 
--Jhttpp2BR
--PERTTag
--SchedulingFilterBank
--SchedulingJGFMonteCarlo
--SchedulingJGFSeries
--SpiderBR
--SpiderBRTag
--TileSearchTag
--TTTTag
--WebServer
--WebServerTag
+-BankApp                  (7.1s)
+-Conglomerator            (7.4s)
+-Jhttpp2BR                (8.6s)
+-PERTTag                  (5.0s)
+-SchedulingFilterBank     (3.8s)
+-SchedulingJGFMonteCarlo  (8.4s)
+-SchedulingJGFSeries      (3.4s)
+-SpiderBR                 (9.3s)
+-SpiderBRTag              (9.4s)
+-TileSearchTag           (11.0s)
+-TTTTag                   (5.7s)
+-WebServer                (9.1s)
+-WebServerTag            (10.8s)
 
 
 Aliases:
--ChatTag shows 3 tasks with aliases
--MapReduceTag shows 1 task with aliases
--SchedulingMapReduce shows 2 tasks with aliases
+-ChatTag              (6.4s) shows 3 tasks with aliases
+-MapReduceTag        (39.9s) shows 1 task with aliases
+-MMGTag              (63.8s) shows 4 tasks with aliases
+-SchedulingMapReduce (14.5s) shows 2 tasks with aliases
+
+
 
 
-Intractable:
--MMGTag