Fix/add recordings

puniverse · Jul 27, 2015 · 0f65292 · 0f65292
1 parent 6f3692a
commit 0f65292
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/quasar-core/src/main/java/co/paralleluniverse/fibers/Stack.java b/quasar-core/src/main/java/co/paralleluniverse/fibers/Stack.java
@@ -147,7 +147,7 @@ record = setNumSlots(record, numSlots);
 //            dataLong[nextMethodIdx + i] = 0L;
 
         if (fiber.isRecordingLevel(2))
-            fiber.record(2, "Stack", "pushMethod     ", "%s %s %s %s %d", Thread.currentThread().getStackTrace()[2], entry, sp /*Arrays.toString(fiber.getStackTrace())*/);
+            fiber.record(2, "Stack", "pushMethod     ", "%s %d %d", Thread.currentThread().getStackTrace()[2], entry, sp /*Arrays.toString(fiber.getStackTrace())*/);
     }
 
     public final void popMethod() {
@@ -174,7 +174,7 @@ final long record = dataLong[idx];
         sp = newSP;
 
         if (fiber.isRecordingLevel(2))
-            fiber.record(2, "Stack", "popMethod      ", "%s %s %s", Thread.currentThread().getStackTrace()[2], sp /*Arrays.toString(fiber.getStackTrace())*/);        
+            fiber.record(2, "Stack", "popMethod      ", "%s %d", Thread.currentThread().getStackTrace()[2], sp /*Arrays.toString(fiber.getStackTrace())*/);        
     }
 
     public final void postRestore() throws SuspendExecution, InterruptedException {

diff --git a/quasar-core/src/main/java/co/paralleluniverse/strands/dataflow/Var.java b/quasar-core/src/main/java/co/paralleluniverse/strands/dataflow/Var.java
@@ -228,6 +228,7 @@ private static class VarFiber<T> extends Fiber<Void> {
         }
 
         void signalNewValue(Var var) {
+            Var.record("signalNewValue", "Fiber %s for var %s signalled by %s", this, this.var, var);
             hasNewVal = true;
             unpark(var);
         }
@@ -254,6 +255,7 @@ protected Void run() throws SuspendExecution, InterruptedException {
                 if (v != null)
                     v.ch.close(t);
             } finally {
+                Var.record("run", "Fiber %s for var %s terminated", this, var);
                 for (Var<?> v1 : registeredVars) {
                     v1.registeredFibers.remove(this);
                     v1.notifyRegistered();