Changeset 3040

Timestamp:

11/07/08 14:29:25 (13 months ago)

Author:

dr2chase

Message:

Trimmed memory consumption

Location:

trunk/ProjectFortress

Files:

• src/com/sun/fortress/Shell.java (modified) (3 diffs)
• src/com/sun/fortress/interpreter/env/ComponentWrapper.java (modified) (2 diffs)
• src/com/sun/fortress/interpreter/evaluator/BaseEnv.java (modified) (2 diffs)
• src/com/sun/fortress/interpreter/evaluator/Evaluator.java (modified) (1 diff)
• src/com/sun/fortress/interpreter/evaluator/Init.java (modified) (3 diffs)
• src/com/sun/fortress/interpreter/rewrite/DesugarerVisitor.java (modified) (2 diffs)
• src/com/sun/fortress/nodes_util/NodeFactory.java (modified) (14 diffs)
• src/com/sun/fortress/nodes_util/Unprinter.java (modified) (3 diffs)
• src/com/sun/fortress/repository/DerivedFiles.java (modified) (1 diff)
• src/com/sun/fortress/repository/ProjectProperties.java (modified) (1 diff)
• src/com/sun/fortress/tests/unit_tests/FileTests.java (modified) (3 diffs)
• src/com/sun/fortress/tests/unit_tests/SystemJUTest.java (modified) (1 diff)
• src/com/sun/fortress/useful/Useful.java (modified) (1 diff)
• test_leaks (added)

trunk/ProjectFortress/src/com/sun/fortress/Shell.java

@@ -50 +50 @@
 import com.sun.fortress.nodes_util.ASTIO;
 import com.sun.fortress.interpreter.Driver;
+import com.sun.fortress.interpreter.evaluator.Init;
 import com.sun.fortress.interpreter.evaluator.values.FValue;
 import com.sun.fortress.syntax_abstractions.parser.PreParser;
@@ -231 +232 @@
         }
 
+        int return_code = 0;
+            
         // Now match the assembled string.
         try {
@@ -277 +280 @@
 
             } else { printUsageMessage(); }
-        }
-        catch (UserError error) {
+        } catch (UserError error) {
             System.err.println(error.getMessage());
-            System.exit(-1);
+            return_code = -1;
         }
         catch (IOException error) {
             System.err.println(error.getMessage());
-            System.exit(-2);
-        }
+            return_code = -2;
+        }
+        
+        Init.allowForLeakChecks();
+        
+        
+        if (return_code != 0)
+            System.exit(return_code);
     }
 

trunk/ProjectFortress/src/com/sun/fortress/interpreter/env/ComponentWrapper.java

@@ -95 +95 @@
     }
 
+    /**
+     * Reads a "command line" component; do not leave in the cache.
+     * @param comp
+     * @param api_list
+     * @param linker
+     * @param implicitLibs
+     */
     public ComponentWrapper(ComponentIndex comp, List<APIWrapper> api_list,
             HashMap<String, ComponentWrapper> linker, String[] implicitLibs) {
@@ -100 +107 @@
         cacheDisabled = noCache;
         transformed = getCached(comp);
-        // TODO Auto-generated constructor stub
+        componentCache.forget(comp.ast().getName());
     }
 

trunk/ProjectFortress/src/com/sun/fortress/interpreter/evaluator/BaseEnv.java

@@ -746 +746 @@
             int negative_object_depth) {
         if (-negative_object_depth > 0) {
+            // This assumes $self can be found in the current environment.
+            // Next statement maps -1 to zero, -2 to one, -3 to two, etc.
             negative_object_depth = -1 - negative_object_depth;
             FObject obj = (FObject) e.getLeafValue(WellKnownNames.secretSelfName);
@@ -754 +756 @@
                 e = obj.getSelfEnv();
             }
-        } else if (negative_object_depth == 0)
-            e = e.getTopLevel();
+        } else if (negative_object_depth == 0) {
+            e = e.getTopLevel(); 
+        } else if (negative_object_depth < 0) {
+            // True only for MIN_VALUE
+            return e;
+        }
         return e;
     }

trunk/ProjectFortress/src/com/sun/fortress/interpreter/evaluator/Evaluator.java

@@ -1661 +1661 @@
 
     public FValue forVarRef(VarRef x) {
-
+//        Id id = x.getVar();
+//        String s= id.getText();
+//        if (s.contains("$self")) {
+//            id = x.getVar();
+//        }
         FValue res = BaseEnv.toContainingObjectEnv(e, x.getLexicalDepth()).getValueNull(x);
         if (res == null) {

trunk/ProjectFortress/src/com/sun/fortress/interpreter/evaluator/Init.java

@@ -30 +30 @@
 import com.sun.fortress.interpreter.evaluator.values.GenericFunctionOrMethod;
 import com.sun.fortress.interpreter.glue.NativeApp;
+import com.sun.fortress.repository.ProjectProperties;
+import com.sun.fortress.useful.Useful;
 
 
@@ -40 +42 @@
 
     // For leak detection.
-    static int countdown=4;
-
+    static int countdown=16;
+    
     public static void initializeEverything() {
         FTypeArrow.reset();
@@ -60 +62 @@
         NativeApp.reset();
 
-        // For leak detection; runs 4 tests, then cleans the heap, and hangs.
-        if (false && countdown-- == 0) {
-            for (int i = 0; i < 10; i++)
-                System.gc();
-            try {
-                Thread.sleep(1000000000);
-            } catch (InterruptedException ex) {
-
-            }
-        }
+        
 
     }
 
+    public static void allowForLeakChecks() {
+        if (ProjectProperties.leakCheck) {
+            // Clean the heap up nicely before a heap snapshot
+            // (is the GC really necessary?)
+            // note that if we snapshotting the heap,the Nth call to
+            // initializeEverything will do its own GC and sleep, to catch
+            // leaks in a seres of running tests.
+            initializeEverything();
+            for (int i = 0; i < 10; i++)
+                System.gc();
+            /* Hang for jmap probe */
+            try {
+                String pid = Useful.getPid();
+                if (pid == null)
+                    pid = "<this process id>";
+                System.err.println("Now is a good time to attach to this process with \"jmap -heap:format=b " + pid + "\"\n" +
+                        "Now sleeping for a very long time...");
+                 Thread.sleep(1000000000);
+             } catch (InterruptedException ex) {
+    
+             }
+         }
+    }
+
 }

trunk/ProjectFortress/src/com/sun/fortress/interpreter/rewrite/DesugarerVisitor.java

@@ -722 +722 @@
     @Override
     public Node forVarType(VarType vre) {
-        String s = NodeUtil.nameString(vre.getName());
-        StaticParam tp = visibleGenericParameters.get(s);
-        if (tp != null) {
-            usedGenericParameters.put(s, tp);
-        }
-        Node node = newType(vre, s);
+        Id id = vre.getName();
+        Node node = vre;
+        if (id.getApi().isNone()) {
+            String s = NodeUtil.nameString(id);
+            StaticParam tp = visibleGenericParameters.get(s);
+            if (tp != null) {
+                usedGenericParameters.put(s, tp);
+            }
+            node = newType(vre, s);
+        } else {
+            // Rewrite lexical nesting depth to zero if api-qualified.
+            node = NodeFactory.makeVarType(vre, 0);
+        }
+        
         return visitNode(node);
 
@@ -1122 +1130 @@
         return s;
     }
-
+   
     /**
      * Given List<Id>, generate tuple of corresponding VarRef

trunk/ProjectFortress/src/com/sun/fortress/nodes_util/NodeFactory.java

@@ -78 +78 @@
 
     public static APIName makeAPINameSkipLast(Id first, Id rest) {
-        List<Id> ids = new ArrayList<Id>();
+        ArrayList<Id> ids = new ArrayList<Id>();
         Id last = first;
         ids.add(first);
@@ -86 +86 @@
             if (!IterUtil.isEmpty(apiNames)) last = IterUtil.last(apiNames);
         }
+        ids.trimToSize();
         return new APIName(FortressUtil.spanTwo(first, last), ids);
     }
 
     public static APIName makeAPIName(Id first, Id rest) {
-        List<Id> ids = new ArrayList<Id>();
+        ArrayList<Id> ids = new ArrayList<Id>();
         ids.add(first);
         if (rest.getApi().isSome()) {
@@ -96 +97 @@
         }
         ids.add(new Id(rest.getSpan(), rest.getText()));
+        ids.trimToSize();
         return new APIName(FortressUtil.spanTwo(first, rest), ids);
     }
@@ -431 +433 @@
 
     private static List<Id> stringToIds(String path) {
-        List<Id> ids = new ArrayList<Id>();
+        ArrayList<Id> ids = new ArrayList<Id>();
 
         StringTokenizer st = new StringTokenizer(path, ".");
@@ -438 +440 @@
             ids.add(makeId(e));
         }
+        ids.trimToSize();
         return ids;
     }
@@ -473 +476 @@
 
     public static APIName makeAPINameFromPath(Span span, String path, String delimiter) {
-        List<Id> ids = new ArrayList<Id>();
+        ArrayList<Id> ids = new ArrayList<Id>();
         String file = new File(path).getName();
         if (file.length() <= 4) {
@@ -481 +484 @@
             ids.add(new Id(span, n));
         }
+        ids.trimToSize();
         return new APIName(span, ids);
     }
@@ -516 +520 @@
 
     public static Id makeId(Span span, String api, String name) {
-        List<Id> apis = new ArrayList<Id>();
+        ArrayList<Id> apis = new ArrayList<Id>();
         apis.add(makeId(span, api));
+        apis.trimToSize();
         return new Id(span, Option.some(new APIName(span, apis)), name);
     }
@@ -636 +641 @@
                               name,
                               Option.some((Type)makeVarType(type.getSpan(),type)),
-                              new ArrayList<Modifier>(),
+                              Collections.<Modifier>emptyList(),
                               false);
     }
@@ -644 +649 @@
                 name,
                 Option.some(type),
-                new ArrayList<Modifier>(),
+                Collections.<Modifier>emptyList(),
                 false);
     }
@@ -652 +657 @@
                 name,
                 type,
-                new ArrayList<Modifier>(),
+                Collections.<Modifier>emptyList(),
                 false);
     }
@@ -658 +663 @@
     public static LValueBind makeLValue(String name, Type type) {
         return new LValueBind(type.getSpan(), makeId(name), Option.some(type),
-                new ArrayList<Modifier>(), false);
+                Collections.<Modifier>emptyList(), false);
     }
 
@@ -722 +727 @@
     public static MatrixType makeMatrixType(Span span, Type element,
                                             ExtentRange dimension) {
-        List<ExtentRange> dims = new ArrayList<ExtentRange>();
+        ArrayList<ExtentRange> dims = new ArrayList<ExtentRange>();
         dims.add(dimension);
+        dims.trimToSize();
         return new MatrixType(span, element, dims);
     }
@@ -730 +736 @@
                                             ExtentRange dimension,
                                             List<ExtentRange> dimensions) {
-        List<ExtentRange> dims = new ArrayList<ExtentRange>();
+        ArrayList<ExtentRange> dims = new ArrayList<ExtentRange>();
         dims.add(dimension);
         dims.addAll(dimensions);
+        dims.trimToSize();
         return new MatrixType(span, element, dims);
     }

trunk/ProjectFortress/src/com/sun/fortress/nodes_util/Unprinter.java

@@ -25 +25 @@
 import java.math.BigInteger;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -323 +324 @@
                     if (fcl == List.class) {
                         // empty list
-                        f.set(node, new ArrayList());
+                        f.set(node, Collections.EMPTY_LIST);
                     } else if (fcl == String.class) {
                         // empty string
@@ -630 +631 @@
                 x = deQuote(s).intern(); // Intermediate form is quoted.
             } else if (s.startsWith("]")) {
+                a.trimToSize();
                 return a;
             } else {

trunk/ProjectFortress/src/com/sun/fortress/repository/DerivedFiles.java

@@ -67 +67 @@
         }
     }
+    
+    public void forget(APIName name) {
+        cached.remove(name);
+    }
 
 }

trunk/ProjectFortress/src/com/sun/fortress/repository/ProjectProperties.java

@@ -288 +288 @@
     public final static String API_TREE_SUFFIX = "tfi";
 
+    public final static boolean leakCheck = getBoolean("fortress.test.leaks", false);
+
 
     /** Creates a new instance of ProjectProperties */

trunk/ProjectFortress/src/com/sun/fortress/tests/unit_tests/FileTests.java

@@ -26 +26 @@
 import junit.framework.Test;
 import junit.framework.TestCase;
+import junit.framework.TestResult;
 import junit.framework.TestSuite;
 
@@ -31 +32 @@
 import com.sun.fortress.Shell;
 import com.sun.fortress.interpreter.Driver;
+import com.sun.fortress.interpreter.evaluator.Init;
 import com.sun.fortress.nodes.APIName;
 import com.sun.fortress.nodes.CompilationUnit;
@@ -203 +205 @@
     }
 
-    public static Test suite(String dirname, boolean failsOnly, boolean expect_failure) throws IOException {
-        TestSuite suite = new TestSuite("Test for default package");
-        // $JUnit-BEGIN$
-        dirname = ProjectProperties.backslashToSlash(dirname);
+    public static TestSuite suite(String dir_name, boolean failsOnly, boolean expect_failure) throws IOException {
+        TestSuite suite = new TestSuite("Runs all tests in " + dir_name) {
+            public void run(TestResult result) {
+                super.run(result);
+                Init.allowForLeakChecks();
+            }
+        };
+        String dirname = ProjectProperties.backslashToSlash(dir_name);
         File dir = new File(dirname);
         String[] files = dir.list();

trunk/ProjectFortress/src/com/sun/fortress/tests/unit_tests/SystemJUTest.java

@@ -38 +38 @@
             testDir = s;
         }
-        TestSuite suite = new TestSuite("Test all .fss files in 'tests'.");
+       // TestSuite suite = new TestSuite("Test all .fss files in 'tests'.");
         //$JUnit-BEGIN$
-        suite.addTest(FileTests.suite(testDir, failsOnly, false));
+       // suite.addTest(FileTests.suite(testDir, failsOnly, false));
         //$JUnit-END$
-        return suite;
+        return FileTests.suite(testDir, failsOnly, false);
     }
 

trunk/ProjectFortress/src/com/sun/fortress/useful/Useful.java

@@ -1056 +1056 @@
         }
 
+        /**
+         * Gets a string representing the pid of this program - Java VM
+         */
+    public static String getPid() {
+        ArrayList<String> commands = new ArrayList<String>();
+        commands.add("/bin/bash");
+        commands.add("-c");
+        commands.add("echo $PPID");
+        ProcessBuilder pb = new ProcessBuilder(commands);
+
+        try {
+
+            Process pr = pb.start();
+            pr.waitFor();
+            if (pr.exitValue() == 0) {
+                BufferedReader outReader = new BufferedReader(
+                        new InputStreamReader(pr.getInputStream()));
+                return outReader.readLine().trim();
+            } else {
+                return null;
+            }
+        } catch (IOException x) {
+            return null;
+        } catch (InterruptedException x) {
+            return null;
+        }
+    }
 
 }