added hooks to activate cumulative_mode from the web and command-line

pgbovine · pgbovine · commit f98d4fd17656 · 2012-08-15T21:15:12.000-07:00
diff --git a/PyTutorGAE/css/pytutor.css b/PyTutorGAE/css/pytutor.css
@@ -454,8 +454,8 @@ div.stackFrame, div.zombieStackFrame {
 }
 
 div.zombieStackFrame {
-  border-left: 1px dotted #999999; /* make zombie borders thinner */
-  color: #999999;
+  border-left: 1px dotted #aaa; /* make zombie borders thinner */
+  color: #aaa;
 }
 
 div.highlightedStackFrame {
diff --git a/PyTutorGAE/generate_json_trace.py b/PyTutorGAE/generate_json_trace.py
@@ -1,5 +1,8 @@
 # Generates a JSON trace that is compatible with the js/pytutor.js frontend
 
+CUMULATIVE_MODE = False
+
+
 import sys, pg_logger, json
 
 
@@ -10,5 +13,5 @@ def json_finalizer(input_code, output_trace):
 
 
 for f in sys.argv[1:]:
-  pg_logger.exec_script_str(open(f).read(), json_finalizer)
+  pg_logger.exec_script_str(open(f).read(), CUMULATIVE_MODE, json_finalizer)
 
diff --git a/PyTutorGAE/js/opt-frontend.js b/PyTutorGAE/js/opt-frontend.js
@@ -141,7 +141,8 @@ $(document).ready(function() {
 
 
     $.get(backend_script,
-          {user_script : pyInputCodeMirror.getValue()},
+          {user_script : pyInputCodeMirror.getValue(),
+           cumulative_mode: $('#cumulativeMode').prop('checked')},
           function(dataFromBackend) {
             var trace = dataFromBackend.trace;
             
diff --git a/PyTutorGAE/pg_logger.py b/PyTutorGAE/pg_logger.py
@@ -78,7 +78,7 @@ def filter_var_dict(d):
 
 class PGLogger(bdb.Bdb):
 
-    def __init__(self, finalizer_func, cumulative_display=False):
+    def __init__(self, cumulative_mode, finalizer_func):
         bdb.Bdb.__init__(self)
         self.mainpyfile = ''
         self._wait_for_mainpyfile = 0
@@ -90,7 +90,7 @@ def __init__(self, finalizer_func, cumulative_display=False):
         # if True, then displays ALL stack frames that have ever existed
         # rather than only those currently on the stack (and their
         # lexical parents)
-        self.cumulative_display = cumulative_display
+        self.cumulative_mode = cumulative_mode
 
         # each entry contains a dict with the information for a single
         # executed line
@@ -109,7 +109,7 @@ def __init__(self, finalizer_func, cumulative_display=False):
         self.cur_frame_id = 1
 
         # List of frames to KEEP AROUND after the function exits.
-        # If cumulative_display is True, then keep ALL frames in
+        # If cumulative_mode is True, then keep ALL frames in
         # zombie_frames; otherwise keep only frames where
         # nested functions were defined within them.
         self.zombie_frames = []
@@ -244,7 +244,7 @@ def interaction(self, frame, traceback, event_type):
           self.frame_ordered_ids[top_frame] = self.cur_frame_id
           self.cur_frame_id += 1
 
-          if self.cumulative_display:
+          if self.cumulative_mode:
             self.zombie_frames.append(top_frame)
 
 
@@ -465,6 +465,10 @@ def create_encoded_stack_entry(cur_frame):
           # frame_id is UNIQUE, so it can disambiguate recursive calls
           hash_str += '_f' + str(e['frame_id'])
 
+          # needed to refresh GUI display ...
+          if e['is_parent']:
+            hash_str += '_p'
+
           # TODO: this is no longer needed, right? (since frame_id is unique)
           #if e['parent_frame_id_list']:
           #  hash_str += '_p' + '_'.join([str(i) for i in e['parent_frame_id_list']])
@@ -596,8 +600,8 @@ def finalize(self):
 
 
 # the MAIN meaty function!!!
-def exec_script_str(script_str, finalizer_func):
-  logger = PGLogger(finalizer_func)
+def exec_script_str(script_str, cumulative_mode, finalizer_func):
+  logger = PGLogger(cumulative_mode, finalizer_func)
 
   try:
     logger._runscript(script_str)
diff --git a/PyTutorGAE/pythontutor.py b/PyTutorGAE/pythontutor.py
@@ -58,7 +58,13 @@ def json_finalizer(self, input_code, output_trace):
   def get(self):
     self.response.headers['Content-Type'] = 'application/json'
     self.response.headers['Cache-Control'] = 'no-cache'
-    pg_logger.exec_script_str(self.request.get('user_script'), self.json_finalizer)
+
+    # convert from string to a Python boolean ...
+    cumulative_mode = (self.request.get('cumulative_mode') == 'true')
+    
+    pg_logger.exec_script_str(self.request.get('user_script'),
+                              cumulative_mode,
+                              self.json_finalizer)
 
 
 app = webapp2.WSGIApplication([('/', TutorPage),
diff --git a/PyTutorGAE/tutor.html b/PyTutorGAE/tutor.html
@@ -66,11 +66,12 @@
 <div id="codeInputPane"></div> <!-- populate with a CodeMirror instance -->
 
 <p>
-
 <button id="executeBtn" class="bigBtn" type="button">Visualize execution</button>
-
 </p>
 
+<p><input type="checkbox" id="cumulativeMode"/>Display exited functions</p>
+
+
 <p style="margin-top: 25px;">Try these small examples:<br/>
 
 <a id="aliasExampleLink" href="#">aliasing</a> |
diff --git a/PyTutorGAE/web_exec.py b/PyTutorGAE/web_exec.py
@@ -21,5 +21,7 @@ def cgi_finalizer(input_code, output_trace):
 else:
   form = cgi.FieldStorage()
   user_script = form['user_script'].value
+  # convert from string to a Python boolean ...
+  cumulative_mode = (form['cumulative_mode'].value == 'true')
 
-pg_logger.exec_script_str(user_script, cgi_finalizer)
+pg_logger.exec_script_str(user_script, cumulative_mode, cgi_finalizer)

Original file line number	Diff line number	Diff line change
`@@ -454,8 +454,8 @@ div.stackFrame, div.zombieStackFrame {`
`454`	`454`	`}`
`455`	`455`
`456`	`456`	`div.zombieStackFrame {`
`457`		`- border-left: 1px dotted #999999; /* make zombie borders thinner */`
`458`		`- color: #999999;`
	`457`	`+ border-left: 1px dotted #aaa; /* make zombie borders thinner */`
	`458`	`+ color: #aaa;`
`459`	`459`	`}`
`460`	`460`
`461`	`461`	`div.highlightedStackFrame {`