move stack_to_render computation to BACKEND

pgbovine · pgbovine · commit f64fd7e38290 · 2012-08-05T16:16:26.000-07:00
diff --git a/PyTutorGAE/backend_test.py b/PyTutorGAE/backend_test.py
@@ -0,0 +1,9 @@
+import pg_logger, pprint
+
+pp = pprint.PrettyPrinter()
+
+def pprint_finalizer(trace):
+  for e in trace:
+    pp.pprint(e)
+
+pg_logger.exec_script_str(open('example-code/closures/closure3.txt').read(), pprint_finalizer)
diff --git a/PyTutorGAE/js/edu-python.js b/PyTutorGAE/js/edu-python.js
@@ -626,47 +626,6 @@ function renderDataStructures(curEntry, vizDiv) {
   $(vizDiv + " #stack").append('<div id="stackHeader">Frames</div>');
 
 
-  // merge zombie_stack_locals and stack_locals into one master
-  // ordered list using some simple rules for aesthetics
-  var stack_to_render = [];
-
-  // first push all regular stack entries backwards
-  if (curEntry.stack_locals) {
-    for (var i = curEntry.stack_locals.length - 1; i >= 0; i--) {
-      var entry = curEntry.stack_locals[i];
-      entry.is_zombie = false;
-      entry.is_highlighted = (i == 0);
-      stack_to_render.push(entry);
-    }
-  }
-
-  // zombie stack consists of exited functions that have returned nested functions
-  // push zombie stack entries at the BEGINNING of stack_to_render,
-  // EXCEPT put zombie entries BEHIND regular entries that are their parents
-  if (curEntry.zombie_stack_locals) {
-
-    for (var i = curEntry.zombie_stack_locals.length - 1; i >= 0; i--) {
-      var entry = curEntry.zombie_stack_locals[i];
-      entry.is_zombie = true;
-      entry.is_highlighted = false; // never highlight zombie entries
-
-      // j should be 0 most of the time, so we're always inserting new
-      // elements to the front of stack_to_render (which is why we are
-      // iterating backwards over zombie_stack_locals).
-      var j = 0;
-      for (j = 0; j < stack_to_render.length; j++) {
-        if ($.inArray(stack_to_render[j].frame_id, entry.parent_frame_id_list) >= 0) {
-          continue;
-        }
-        break;
-      }
-
-      stack_to_render.splice(j, 0, entry);
-    }
-
-  }
-
-
   // first build up a list of lists representing the locations of TOP-LEVEL heap objects to be rendered.
   // doing so decouples the data format of curEntry from the nitty-gritty HTML rendering code,
   // which gives us more flexibility in experimenting with layout strategies.
@@ -813,16 +772,11 @@ function renderDataStructures(curEntry, vizDiv) {
     }
   });
 
-  $.each(stack_to_render, function(i, frame) {
+  $.each(curEntry.stack_to_render, function(i, frame) {
     if (frame.ordered_varnames.length > 0) {
       $.each(frame.ordered_varnames, function(xxx, varname) {
         var val = frame.encoded_locals[varname];
 
-        // ignore return values for zombie frames
-        if (frame.is_zombie && varname == '__return__') {
-          return;
-        }
-
         if (!isPrimitiveType(val)) {
           layoutHeapObject(val);
           //console.log(frame.func_name + ':', varname, getRefID(val));
@@ -1148,7 +1102,7 @@ function renderDataStructures(curEntry, vizDiv) {
   }
 
 
-  $.each(stack_to_render, function(i, e) {
+  $.each(curEntry.stack_to_render, function(i, e) {
     renderStackFrame(e, i, e.is_zombie);
   });
 
@@ -1199,11 +1153,6 @@ function renderDataStructures(curEntry, vizDiv) {
       $.each(frame.ordered_varnames, function(xxx, varname) {
         var val = localVars[varname];
 
-        // don't render return values for zombie frames
-        if (is_zombie && varname == '__return__') {
-          return;
-        }
-
         // special treatment for displaying return value and indicating
         // that the function is about to return to its caller
         //
@@ -1296,7 +1245,7 @@ function renderDataStructures(curEntry, vizDiv) {
 
   // highlight the top-most non-zombie stack frame or, if not available, globals
   var frame_already_highlighted = false;
-  $.each(stack_to_render, function(i, e) {
+  $.each(curEntry.stack_to_render, function(i, e) {
     if (e.is_highlighted) {
       highlight_frame('stack' + i);
       frame_already_highlighted = true;
diff --git a/PyTutorGAE/pg_logger.py b/PyTutorGAE/pg_logger.py
@@ -383,13 +383,56 @@ def create_encoded_stack_entry(cur_frame):
         ordered_globals = [e for e in self.all_globals_in_order if e in encoded_globals]
         assert len(ordered_globals) == len(encoded_globals)
 
+
+        # merge zombie_encoded_stack_locals and encoded_stack_locals
+        # into one master ordered list using some simple rules for
+        # making it look aesthetically pretty
+        stack_to_render = [];
+
+        # first push all regular stack entries BACKWARDS
+        if encoded_stack_locals:
+          stack_to_render = encoded_stack_locals[::-1]
+          for e in stack_to_render:
+            e['is_zombie'] = False
+            e['is_highlighted'] = False
+
+          stack_to_render[-1]['is_highlighted'] = True
+
+
+        # zombie_encoded_stack_locals consists of exited functions that have returned
+        # nested functions. Push zombie stack entries at the BEGINNING of stack_to_render,
+        # EXCEPT put zombie entries BEHIND regular entries that are their parents
+        for e in zombie_encoded_stack_locals[::-1]:
+          # don't display return value for zombie frames
+          try:
+            e['ordered_varnames'].remove('__return__')
+          except ValueError:
+            pass
+
+          e['is_zombie'] = True
+          e['is_highlighted'] = False # never highlight zombie entries
+
+          # j should be 0 most of the time, so we're always inserting new
+          # elements to the front of stack_to_render (which is why we are
+          # iterating backwards over zombie_stack_locals).
+          j = 0
+          while j < len(stack_to_render):
+            if stack_to_render[j]['frame_id'] in e['parent_frame_id_list']:
+              j += 1
+              continue
+            break
+
+          stack_to_render.insert(j, e)
+
+
         trace_entry = dict(line=lineno,
                            event=event_type,
                            func_name=tos[0].f_code.co_name,
                            globals=encoded_globals,
                            ordered_globals=ordered_globals,
-                           stack_locals=encoded_stack_locals,
-                           zombie_stack_locals=zombie_encoded_stack_locals,
+                           #stack_locals=encoded_stack_locals,               # DEPRECATED in favor of stack_to_render
+                           #zombie_stack_locals=zombie_encoded_stack_locals, # DEPRECATED in favor of stack_to_render
+                           stack_to_render=stack_to_render,
                            heap=self.encoder.get_heap(),
                            stdout=get_user_stdout(tos[0]))
 
