added a unique_hash field to the trace o.O

Philip Guo · Philip Guo · commit 3352907d2615 · 2012-08-09T16:39:14.000-07:00
diff --git a/PyTutorGAE/js/pytutor.js b/PyTutorGAE/js/pytutor.js
@@ -1102,7 +1102,6 @@ ExecutionVisualizer.prototype.precomputeCurTraceLayouts = function() {
 }
 
 
-
 // The "3.0" version of renderDataStructures renders variables in
 // a stack, values in a separate heap, and draws line connectors
 // to represent both stack->heap object references and, more importantly,
@@ -1575,18 +1574,27 @@ ExecutionVisualizer.prototype.renderDataStructures = function() {
   var stackDiv = myViz.domRootD3.select('#stack');
 
   var stackFrameDiv = stackDiv.selectAll('div')
-    .data(curEntry.stack_to_render, function(frame, i) {
-      // use a frankenstein combination of frame identifiers and also the INDEX (stack position)
-      // as the join key, to properly handle closures and recursive calls of the same function
-      return frame.func_name + '_' + String(frame.frame_id) + '_' + String(frame.parent_frame_id_list) + '_' + String(frame.is_zombie) + '_' + i;
+    .data(curEntry.stack_to_render, function(frame) {
+      return frame.unique_hash; // VERY IMPORTANT for properly handling closures and nested functions
     });
 
   stackFrameDiv.enter().append('div')
     .attr('class', function(d, i) {return d.is_zombie ? 'zombieStackFrame' : 'stackFrame';})
-    .attr('id', function(d, i) {return d.is_zombie ? myViz.generateID("zombie_stack" + i) : myViz.generateID("stack" + i);});
+    //.attr('id', function(d, i) {return d.is_zombie ? myViz.generateID("zombie_stack_" + htmlspecialchars(d.unique_hash))
+    //                                               : myViz.generateID("stack_" + htmlspecialchars(d.unique_hash));
+    //})
+    .attr('id', function(d, i) {return d.is_zombie ? myViz.generateID("zombie_stack" + i)
+                                                   : myViz.generateID("stack" + i);
+    })
 
 
+
+  /*
+  // I suspect I need to use .order() somewhere, but I can't seem to get it in the right place :(
   stackFrameDiv
+    .each(function(frame, i) {
+      console.log('UPDATE stackFrameDiv', frame.unique_hash);
+    })
     .append('div')
     .attr('class', 'stackFrameHeader')
     .html(function(frame, i) {
@@ -1605,9 +1613,13 @@ ExecutionVisualizer.prototype.renderDataStructures = function() {
       }
 
       return headerLabel;
-    });
+    })
+  */
+
+  stackFrameDiv.exit().remove();
 
 
+  /*
   stackFrameDiv
     .append('div')
     .attr('class', 'derrrr')
@@ -1637,9 +1649,9 @@ ExecutionVisualizer.prototype.renderDataStructures = function() {
     });
 
   stackVarTable.exit().remove();
+  */
 
 
-  stackFrameDiv.exit().remove();
 
   /*
   stackFrame.enter()
diff --git a/PyTutorGAE/pg_logger.py b/PyTutorGAE/pg_logger.py
@@ -436,6 +436,24 @@ def create_encoded_stack_entry(cur_frame):
 
           stack_to_render.insert(j, e)
 
+        # create a unique hash for this stack entry, so that the
+        # frontend can uniquely identify it when doing incremental
+        # rendering. the strategy is to use a frankenstein-like mix of the
+        # relevant fields to properly disambiguate closures and recursive
+        # calls to the same function (stack_index is key for
+        # disambiguating recursion!)
+        for (stack_index, e) in enumerate(stack_to_render):
+          hash_str = e['func_name']
+          if e['frame_id']:
+            hash_str += '_f' + str(e['frame_id'])
+          if e['parent_frame_id_list']:
+            hash_str += '_p' + '_'.join([str(i) for i in e['parent_frame_id_list']])
+          if e['is_zombie']:
+            hash_str += '_z'
+          hash_str += '_i' + str(stack_index)
+
+          e['unique_hash'] = hash_str
+
 
         trace_entry = dict(line=lineno,
                            event=event_type,
