Changeset 729

Timestamp:

08/17/07 08:28:18 (2 years ago)

Author:

chf

Message:

Various fixes to getting the current task. This should address the nested transaction problem.

Location:

trunk/ProjectFortress

Files:

• junit (modified) (1 diff)
• src/com/sun/fortress/interpreter/drivers/Driver.java (modified) (3 diffs)
• src/com/sun/fortress/interpreter/evaluator/Evaluator.java (modified) (5 diffs)
• src/com/sun/fortress/interpreter/evaluator/EvaluatorJUTest.java (modified) (2 diffs)
• src/com/sun/fortress/interpreter/evaluator/tasks/BaseTask.java (modified) (3 diffs)
• src/com/sun/fortress/interpreter/evaluator/tasks/EvaluatorTask.java (modified) (3 diffs)
• src/com/sun/fortress/interpreter/evaluator/tasks/FortressTaskRunner.java (modified) (16 diffs)
• src/com/sun/fortress/interpreter/evaluator/tasks/SpawnTask.java (modified) (1 diff)
• src/com/sun/fortress/interpreter/evaluator/tasks/ThreadState.java (modified) (4 diffs)
• src/com/sun/fortress/interpreter/evaluator/tasks/TupleTask.java (modified) (2 diffs)
• src/com/sun/fortress/interpreter/evaluator/values/FThread.java (modified) (1 diff)

trunk/ProjectFortress/junit

@@ -21 +21 @@
 
 if (uname | egrep -q CYGWIN) ; then 
-  CP="build;third_party/junit/junit.jar;third_party/xtc/xtc.jar;third_party/FJ/concurrent.jar;third_party/plt/plt.jar"
+  CP="build;third_party/junit/junit.jar;third_party/xtc/xtc.jar;third_party/jsr166y/jsr166y.jar;third_party/plt/plt.jar"
 else
-  CP="build:third_party/junit/junit.jar:third_party/xtc/xtc.jar:third_party/FJ/concurrent.jar:third_party/plt/plt.jar"
+  CP="build:third_party/junit/junit.jar:third_party/xtc/xtc.jar:third_party/jsr166y/jsr166y.jar:third_party/plt/plt.jar"
 fi
 

trunk/ProjectFortress/src/com/sun/fortress/interpreter/drivers/Driver.java

@@ -42 +42 @@
 import com.sun.fortress.interpreter.evaluator.InterpreterBug;
 import com.sun.fortress.interpreter.evaluator.ProgramError;
+import com.sun.fortress.interpreter.evaluator.types.FType;
+import com.sun.fortress.interpreter.evaluator.tasks.BaseTask;
 import com.sun.fortress.interpreter.evaluator.tasks.EvaluatorTask;
-import com.sun.fortress.interpreter.evaluator.types.FType;
+import com.sun.fortress.interpreter.evaluator.tasks.FortressTaskRunner;
 import com.sun.fortress.interpreter.evaluator.tasks.FortressTaskRunnerGroup;
 import com.sun.fortress.interpreter.evaluator.values.Closure;
@@ -686 +688 @@
            group = new FortressTaskRunnerGroup(numThreads);
 
-        EvaluatorTask evTask = new EvaluatorTask(p, runTests, args, null);
+        EvaluatorTask evTask = new EvaluatorTask(p, runTests, args);
         try {
             group.invoke(evTask);
@@ -694 +696 @@
         }
         if (evTask.causedException()) {
-            throw evTask.getTaskException();
+            throw evTask.taskException();
         }
     }

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

@@ -167 +167 @@
 public class Evaluator extends EvaluatorBase<FValue> {
     boolean debug = false;
-    int transactionNestingCount = 0;
-
     final public static FVoid evVoid = FVoid.V;
 
@@ -210 +208 @@
         super(e2.e);
         debug = e2.debug;
-        transactionNestingCount = e2.transactionNestingCount;
     }
 
@@ -304 +301 @@
         final Expr expr = x.getExpr();
         final Evaluator current = new Evaluator(this);
-        transactionNestingCount += 1;
 
         FValue res = FortressTaskRunner.doIt (
@@ -314 +310 @@
             }
         );
-        transactionNestingCount -= 1;
         return res;
     }
@@ -424 +419 @@
         if (sz==1) {
             resList.add(exprs.get(0).accept(this));
- } else if (transactionNestingCount > 0) {
-   for (Expr exp : exprs) {
-       resList.add(exp.accept(this));
-   }
+            /* If we are already in a transaction, don't evaluate in parallel */
+        } else if (BaseTask.getThreadState().transactionNesting() > 0) {
+            for (Expr exp : exprs) {
+                resList.add(exp.accept(this));
+            }
         } else if (sz > 1) {
             TupleTask[] tasks = new TupleTask[exprs.size()];
             int count = 0;
-            BaseTask currentTask = BaseTask.getCurrentTask();
             for (Expr e : exprs) {
-                tasks[count++] = new TupleTask(e, this, currentTask);
-            }
+                tasks[count++] = new TupleTask(e, this);
+            }
+            FortressTaskRunner runner = (FortressTaskRunner) Thread.currentThread();
+            BaseTask currentTask = runner.getCurrentTask();
             TupleTask.coInvoke(tasks);
+            runner.setCurrentTask(currentTask);
+            
             for (int i = 0; i < count; i++) {
-                if (tasks[i].causedException) {
-                    Throwable t = tasks[i].getTaskException();
+                if (tasks[i].causedException()) {
+                    Throwable t = tasks[i].taskException();
                     if (t instanceof Error) {
                         throw (Error)t;

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

@@ -26 +26 @@
 
 import com.sun.fortress.interpreter.env.BetterEnv;
+import com.sun.fortress.interpreter.evaluator.tasks.BaseTask;
 import com.sun.fortress.interpreter.evaluator.tasks.FortressTaskRunner;
 import com.sun.fortress.interpreter.evaluator.tasks.FortressTaskRunnerGroup;
@@ -47 +48 @@
   }
 
-  FortressTaskRunnerGroup group;
+    class TestTask extends BaseTask {
+        public void print() {
+            System.out.println("TestTask");
+        }
+    
+        public void compute() {
+            FortressTaskRunner runner = (FortressTaskRunner) Thread.currentThread();
+            runner.setCurrentTask(this);
+            
+            try {
+                BetterEnv e = BetterEnv.primitive();
+                e.bless();
+                BetterEnv s = new BetterEnv(e, "s");
+                s.bless();
+                BetterEnv s1 = new BetterEnv(s, "s1");
+                s1.putVariable("x", FInt.make(0));
+                s1.bless();
+                BetterEnv s2 = new BetterEnv(s1, "s2");
+                s2.putValue("y", FInt.make(10));
+                s2.bless();
+                BetterEnv s3 = new BetterEnv(s2, "s3");
+                s3.bless();
+                HasAt at = new HasAt.FromString("EvaluatorJUTest assignValue");
+                s3.assignValue(at,"x", FInt.make(1));
+                assertTrue(s2.getValue("x").getInt() == 1);
+                s3.dump(System.out);
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
 
   public void testEnvironment2() throws IOException {
-      group = new FortressTaskRunnerGroup(1);
-
-      BetterEnv e = BetterEnv.primitive();
-      e.bless();
-      BetterEnv s = new BetterEnv(e, "s");
-      s.bless();
-      BetterEnv s1 = new BetterEnv(s, "s1");
-      s1.putVariable("x", FInt.make(0));
-      s1.bless();
-      BetterEnv s2 = new BetterEnv(s1, "s2");
-      s2.putValue("y", FInt.make(10));
-      s2.bless();
-      BetterEnv s3 = new BetterEnv(s2, "s3");
-      s3.bless();
-      HasAt at = new HasAt.FromString("EvaluatorJUTest assignValue");
-      s3.assignValue(at,"x", FInt.make(1));
-      assertTrue(s2.getValue("x").getInt() == 1);
-      s3.dump(System.out);
+      FortressTaskRunnerGroup group = new FortressTaskRunnerGroup(1);
+      TestTask testTask = new TestTask();
+      group.invoke(testTask);
   }
 

trunk/ProjectFortress/src/com/sun/fortress/interpreter/evaluator/tasks/BaseTask.java

@@ -26 +26 @@
 import com.sun.fortress.interpreter.evaluator.transactions.exceptions.SnapshotException;
 import java.util.concurrent.Callable;
+import com.sun.fortress.interpreter.evaluator.tasks.ThreadState;
 
 public abstract class BaseTask extends RecursiveAction {
-    public boolean causedException;
-    public Throwable err;
-    public BaseTask currentTask;
-    int transactionCount;
+    Throwable err;
+    boolean causedException;
+    ThreadState threadState;
+    BaseTask parent;
 
-    public void initTask() {
-        setCurrentTask(this);
-        transactionCount = 0;
-    }
+    public BaseTask() {
+        causedException = false;
+        threadState = new ThreadState();
+        parent = getCurrentTask();
+    }   
 
-    public void finalizeTask() {
-        setCurrentTask(parent);
-        if (parent != null) {
-            if (causedException) {
-                parent.causedException = true;
-                parent.err = err;
-     }
-        }
-    }
-
-    public BaseTask(BaseTask parent) {
-        causedException = false;
-        setParentTask(parent);
+    public void recordException(Throwable t) { 
+        causedException = true;
+        err = t;
     }
 
     public boolean causedException() {return causedException;}
-    public Throwable getTaskException() {return err;}
+    public Throwable taskException() {return err;}
 
     public static BaseTask getCurrentTask() {
-        FortressTaskRunner taskrunner = (FortressTaskRunner) Thread.currentThread();
-        return (BaseTask) taskrunner.getCurrentTask();
+        /* This may get called before we've started our FortressTaskGroup so in 
+           that case we have no current task and need to return null */
+        Thread t = Thread.currentThread();
+        BaseTask result = null;
+        if (t instanceof FortressTaskRunner) {
+            FortressTaskRunner taskrunner = (FortressTaskRunner) t;
+            result = (BaseTask) taskrunner.getCurrentTask();
+        }
+        return result;
     }
 
@@ -66 +65 @@
     }
 
-    BaseTask parent;
-    public BaseTask getParentTask() { return parent;}
-    public void setParentTask(BaseTask task) { parent = task;}
-
-
     public abstract void print();
 
@@ -77 +71 @@
         while (currentTask != null) {
             currentTask.print();
-            currentTask = currentTask.getParentTask();
+            currentTask = currentTask.parent;
         }
     }
 
-    Object tag;
-    // Finds the current task and tags it
-    public static void tagCurrentTask(Object obj) {
-        BaseTask currentTask = getCurrentTask();
-        currentTask.setTag(obj);
+    public ThreadState threadState() { return threadState();}
+
+    public static ThreadState getThreadState() { 
+        BaseTask task = getCurrentTask();
+        if (task == null) 
+            throw new RuntimeException("Not in a task!");
+        return task.threadState;
     }
-
-    // Get the tag from the current task
-    public static Object  getCurrentTag() {
-        BaseTask currentTask = getCurrentTask();
-        return currentTask.getTag();
-    }
-
-    public void setTag(Object obj) { tag = obj;}
-    public Object getTag() { return tag;}
 }

trunk/ProjectFortress/src/com/sun/fortress/interpreter/evaluator/tasks/EvaluatorTask.java

@@ -34 +34 @@
     
     public EvaluatorTask(CompilationUnit prog, boolean tests, 
-                         List<String> args_, BaseTask parent) {
-        super(parent);
+                         List<String> args_) {
         p = prog;
         runTests = tests;
@@ -46 +45 @@
     
     public void compute() {
-        initTask();
+        FortressTaskRunner runner = (FortressTaskRunner) Thread.currentThread();
+        runner.setCurrentTask(this);
         try {
             Driver.runProgramTask(p, runTests, args);
@@ -53 +53 @@
             causedException = true;
             err = e;
-            //System.err.println("\nGot exception:\n" + e);
-            e.printStackTrace();
+            e.printStackTrace();
+            throw new RuntimeException(e);
         }
-        finalizeTask();
     }
-
 }
 

trunk/ProjectFortress/src/com/sun/fortress/interpreter/evaluator/tasks/FortressTaskRunner.java

@@ -52 +52 @@
     public static long totalTotalMemRefs = 0;
 
-    static ThreadLocal<ThreadState> _threadState = new ThreadLocal<ThreadState>() {
-        protected synchronized ThreadState initialValue() {
-        return new ThreadState();
-
-        }
-    };
-    static ThreadLocal<Thread> _thread = new ThreadLocal<Thread>() {
-        protected synchronized Thread initialValue() {
-        return null;
-        }
-    };
-
     private static int MAX_NESTING_DEPTH = 100;
 
@@ -71 +59 @@
 
     public BaseTask getCurrentTask() {return currentTask;}
-    public void setCurrentTask(BaseTask task) {currentTask = task;}
+
+    public void setCurrentTask(BaseTask task) {
+        currentTask = task;
+    }
 
     public FortressTaskRunner(FortressTaskRunnerGroup group) {
@@ -117 +108 @@
      */
     static public boolean validate() {
-        ThreadState threadState = _threadState.get();
+        ThreadState threadState = BaseTask.getThreadState();
         return threadState.validate();
     }
@@ -128 +119 @@
      */
     static public Transaction getTransaction() {
-        return _threadState.get().transaction;
+        ThreadState threadState = BaseTask.getThreadState();    
+        return threadState.transaction();
     }
 
@@ -137 +129 @@
      */
     static public ContentionManager getContentionManager() {
-        return _threadState.get().manager;
+        ThreadState threadState = BaseTask.getThreadState();    
+        return threadState.manager();
     }
 
@@ -146 +139 @@
      */
     public static <T> T doIt(Callable<T> xaction) {
-        ThreadState threadState = _threadState.get();
-        ContentionManager manager = threadState.manager;
+        ThreadState threadState = BaseTask.getThreadState();
+        ContentionManager manager = threadState.manager();
         T result = null;
         try {
@@ -167 +160 @@
                     throw new PanicException("Error " + e);
                 }
-                threadState.totalMemRefs += threadState.transaction.memRefs;
+                threadState.addToTotalMemRefs(threadState.memRefs());
                 if (threadState.commitTransaction()) {
-                    threadState.committedMemRefs += threadState.transaction.memRefs;
+                    threadState.addToCommittedMemRefs(threadState.memRefs());
                     return result;
                 }
-                threadState.transaction.attempts++;
+                threadState.incAttempts();
                 // transaction aborted
             }
@@ -221 +214 @@
      */
     public static void onValidate(Callable<Boolean> c) {
-        _threadState.get().onValidate.add(c);
+        ThreadState threadState = BaseTask.getThreadState();
+        threadState.onValidate.add(c);
     }
     /**
@@ -228 +222 @@
      */
     public static void onValidateOnce(Callable<Boolean> c) {
-        _threadState.get().onValidateOnce.add(c);
+        ThreadState threadState = BaseTask.getThreadState();
+        threadState.onValidateOnce.add(c);
     }
     /**
@@ -235 +230 @@
      */
     public static void onBegin(Runnable r) {
-        _threadState.get().onBegin.add(r);
+        ThreadState threadState = BaseTask.getThreadState();
+        threadState.onBegin.add(r);
     }
     /**
@@ -242 +238 @@
      */
     public static void onBeginOnce(Runnable r) {
-        _threadState.get().onBeginOnce.add(r);
+        ThreadState threadState = BaseTask.getThreadState();
+        threadState.onBeginOnce.add(r);
     }
     /**
@@ -249 +246 @@
      */
     public static void onCommit(Runnable r) {
-        _threadState.get().onCommit.add(r);
+        ThreadState threadState = BaseTask.getThreadState();
+        threadState.onCommit.add(r);
     }
     /**
@@ -256 +254 @@
      */
     public static void onCommitOnce(Runnable r) {
-        _threadState.get().onCommitOnce.add(r);
+        ThreadState threadState = BaseTask.getThreadState();
+        threadState.onCommitOnce.add(r);
     }
     /**
@@ -263 +262 @@
      */
     public static void onAbort(Runnable r) {
-        _threadState.get().onAbort.add(r);
+        ThreadState threadState = BaseTask.getThreadState();
+        threadState.onAbort.add(r);
     }
     /**
@@ -270 +270 @@
      */
     public static void onAbortOnce(Runnable r) {
-        _threadState.get().onAbortOnce.add(r);
+        ThreadState threadState = BaseTask.getThreadState();
+        threadState.onAbortOnce.add(r);
     }
     /**
@@ -277 +278 @@
      */
     public static int getID() {
-        return _threadState.get().hashCode();
+        ThreadState threadState = BaseTask.getThreadState();
+        return threadState.hashCode();
     }
 

trunk/ProjectFortress/src/com/sun/fortress/interpreter/evaluator/tasks/SpawnTask.java

@@ -35 +35 @@
     
     public void compute() {
-        initTask();
-        try {
-            val = new Evaluator(eval, expr).eval(expr);
-        } 
-        catch (Throwable e) {
-            causedException = true;
-            err = e;
-        }
-        finalizeTask();
+        FortressTaskRunner runner = (FortressTaskRunner) Thread.currentThread();
+        runner.setCurrentTask(this);
+        val = new Evaluator(eval, expr).eval(expr);
     }
     
-    public SpawnTask(Expr b, Evaluator e, BaseTask task) {
-        super(task);
+    public SpawnTask(Expr b, Evaluator e) {
         expr = b;
         eval = e;

trunk/ProjectFortress/src/com/sun/fortress/interpreter/evaluator/tasks/ThreadState.java

@@ -31 +31 @@
     ContentionManager manager;
   
-    public long committed = 0;        // number of committed transactions
-    public long total = 0;            // total number of transactions
-    public long committedMemRefs = 0; // number of committed reads and writes
-    public long totalMemRefs = 0;     // total number of reads and writes
+    long committed = 0;        // number of committed transactions
+    long total = 0;            // total number of transactions
+    long committedMemRefs = 0; // number of committed reads and writes
+    long totalMemRefs = 0;     // total number of reads and writes
   
     Set<Callable<Boolean>> onValidate = new HashSet<Callable<Boolean>>();
@@ -59 +59 @@
         }
     }
+
+    /* Are we in a transaction? */
+    public int transactionNesting() { return depth;}
   
     /**
@@ -69 +72 @@
         totalMemRefs = 0;     // total number of reads and writes
     }
+
+    public void incCommitted(int num) { committed += num;}
+    public void incTotal(int num) {total+= num;}
+    public void incCommittedMemRefs(int num) { committedMemRefs += num;}
+    public void incTotalMemRefs(int num) {totalMemRefs += num;}
   
     /**
@@ -81 +89 @@
             "]";
     }
-  
+
+    public Transaction transaction() { return transaction;}
+    public ContentionManager manager() { return manager;}
+    public void addToTotalMemRefs(long num) { totalMemRefs += num;}
+    public long memRefs() { return totalMemRefs;}
+    public void addToCommittedMemRefs(long num) { committedMemRefs += num;}
+    public long commitedMemRefs() { return committedMemRefs;}
+    public void incAttempts() { transaction.attempts++;}
+    public long attempts() { return transaction.attempts;}
+
     /**
      * Can this transaction still commit?

trunk/ProjectFortress/src/com/sun/fortress/interpreter/evaluator/tasks/TupleTask.java

@@ -31 +31 @@
     FValue res;
     
-    public TupleTask(Expr ex, Evaluator ev, BaseTask parent) {
-        super(parent);
+    public TupleTask(Expr ex, Evaluator ev) {
         expr = ex;
         eval = ev;
@@ -38 +37 @@
     
     public void compute() {
-        initTask();
-        try {
-            res = new Evaluator(eval, expr).eval(expr);
-        } 
-        catch (Throwable e) {
-            causedException = true;
-            err = e;
-        }
-        finalizeTask();
+        FortressTaskRunner runner = (FortressTaskRunner) Thread.currentThread();
+        runner.setCurrentTask(this);
+        res = new Evaluator(eval, expr).eval(expr);
     }
     

trunk/ProjectFortress/src/com/sun/fortress/interpreter/evaluator/values/FThread.java

@@ -33 +33 @@
 
     public FThread(Expr b, Evaluator e) {
-        st = new SpawnTask(b,e, BaseTask.getCurrentTask());
+        st = new SpawnTask(b,e);
     }