little changes to keep, debugging removed

diff --git a/Robust/src/Analysis/OwnershipAnalysis/OwnershipAnalysis.java b/Robust/src/Analysis/OwnershipAnalysis/OwnershipAnalysis.java
index 87d53ba8d82e13b74ef9b12d0dfa8cebc20d1dab..f7ff02f610eeee6fcc31ff9e94727d7997970948 100644 (file)
--- a/Robust/src/Analysis/OwnershipAnalysis/OwnershipAnalysis.java
+++ b/Robust/src/Analysis/OwnershipAnalysis/OwnershipAnalysis.java
@@ -746,7 +746,6 @@ public class OwnershipAnalysis {
          mc.getDescriptor().getSymbol().equals( mcDescSymbolDebug ) ) {
        debugSnapshot(og,fn);
       }
-     
 
 
       // if the results of the new graph are different from

diff --git a/Robust/src/Analysis/OwnershipAnalysis/OwnershipGraph.java b/Robust/src/Analysis/OwnershipAnalysis/OwnershipGraph.java
index cf17e071a1b12f8439893cb5ddf57d17bda3b6ed..4f8567f35cdc9cc958d1d1f006425220c545c96b 100644 (file)
--- a/Robust/src/Analysis/OwnershipAnalysis/OwnershipGraph.java
+++ b/Robust/src/Analysis/OwnershipAnalysis/OwnershipGraph.java
@@ -2249,7 +2249,6 @@ public class OwnershipGraph {
     Hashtable< Integer, Set<Vector> > edges_up_dr = new Hashtable< Integer, Set<Vector> >();
     Hashtable< Integer, Set<Vector> > edges_up_r  = new Hashtable< Integer, Set<Vector> >();
 
-
     // so again, with respect to some arg i...
     lnArgItr = paramIndex2ln.entrySet().iterator();
     while( lnArgItr.hasNext() ) {
@@ -2757,6 +2756,7 @@ public class OwnershipGraph {
     // in the caller graph
     Set      sCallee = ogCallee.id2hrn.entrySet();
     Iterator iCallee = sCallee.iterator();
+
     while( iCallee.hasNext() ) {
       Map.Entry      meCallee  = (Map.Entry)      iCallee.next();
       Integer        idCallee  = (Integer)        meCallee.getKey();
@@ -2884,6 +2884,7 @@ public class OwnershipGraph {
     }
 
 
+
     // return value may need to be assigned in caller
     TempDescriptor returnTemp = fc.getReturnTemp();
     if( returnTemp != null && !returnTemp.getType().isImmutable() ) {
@@ -2957,6 +2958,7 @@ public class OwnershipGraph {
     }
 
 
+    /*
     if( debugCallMap &&
        mc.getDescriptor().getSymbol().equals( debugCaller ) &&
        fm.getMethod().getSymbol().equals( debugCallee ) 
@@ -2973,7 +2975,7 @@ public class OwnershipGraph {
                   true); // hide edge taints
       } catch( IOException e ) {}
     }
-
+    */
 
 
     // merge the shadow nodes of allocation sites back down to normal capacity
@@ -3043,6 +3045,7 @@ public class OwnershipGraph {
     }
 
 
+    /*
     if( debugCallMap &&
        mc.getDescriptor().getSymbol().equals( debugCaller ) &&
        fm.getMethod().getSymbol().equals( debugCallee ) 
@@ -3059,6 +3062,7 @@ public class OwnershipGraph {
                    true); // hide edge taints
       } catch( IOException e ) {}
     }
+    */
 
 
     // improve reachability as much as possible
@@ -3085,7 +3089,7 @@ public class OwnershipGraph {
       System.out.println( "  "+mc+" done calling "+fm );      
       ++x;
       if( x == debugCallMapCount ) {
-       System.exit( -1 );   
+       System.exit( 0 );   
       }
     }
   }

diff --git a/Robust/src/Benchmarks/mlp/directto/mlp-small-for-testing/makefile b/Robust/src/Benchmarks/mlp/directto/mlp-small-for-testing/makefile
index bf80219efcc2c6f7638a3434a110cd16c908942b..5a62e8d33fbf0099aded9ccdae4c234e30522fd9 100644 (file)
--- a/Robust/src/Benchmarks/mlp/directto/mlp-small-for-testing/makefile
+++ b/Robust/src/Benchmarks/mlp/directto/mlp-small-for-testing/makefile
@@ -6,8 +6,8 @@ SOURCE_FILES=D2.java
 BUILDSCRIPT=~/research/Robust/src/buildscript
 BSFLAGS= -debug -nooptimize -mainclass $(MAIN_CLASS) 
 
-#DBCALLFLAGS= -owndebugcaller main -owndebugcallee executeAll 
-DBCALLFLAGS= -owndebugcaller executeAll -owndebugcallee executeMessage -owndebugcallcount 1
+DBCALLFLAGS= -owndebugcaller main -owndebugcallee executeAll 
+#DBCALLFLAGS= -owndebugcaller executeAll -owndebugcallee executeMessage -owndebugcallcount 0
 #DBCALLFLAGS= -owndebugcaller executeMessage -owndebugcallee amendFlightPlan
 
 ANALYZEFLAGS= -justanalyze $(DBCALLFLAGS) -ownership -ownallocdepth 1 -ownwritedots final -ownaliasfile aliases.txt -enable-assertions