Don't serialize the history any more

Author: pavpanchekha

src/api/server.rkt

@@ -434,13 +434,16 @@
                [analysis (if (hash? backend-hash)
                              (hash-ref backend-hash 'end)
                              '())])
-      (define history (read (open-input-string (hash-ref analysis 'history))))
-      (define block `(div ([id "history"]) (ol ,@history)))
+      (define history (hash-ref analysis 'history))
+      (define block `(div ([id "history"]) (ol ,@(render-history history ctx))))
       (call-with-output-string (curry write-xexpr block))))
 
   (define derivations
-    (for/list ([altn (in-list altns)])
-      (render-json altn pcontext (test-context test) errcache)))
+    (for/list ([altn (in-list altns)]
+               [analysis (if (hash? backend-hash)
+                             (hash-ref backend-hash 'end)
+                             '())])
+      (hash-ref analysis 'history)))
 
   (hasheq 'test
           (~s test-fpcore)
@@ -479,7 +482,6 @@
   (define cost (alt-cost alt repr))
 
   (define history-json (render-json alt pcontext (test-context test) errcache))
-  (define history (render-history history-json (test-context test)))
 
   (define vars (test-vars test))
   (define splitpoints
@@ -492,7 +494,7 @@
   (hasheq 'expr
           (~s (alt-expr alt))
           'history
-          (~s history)
+          history-json
           'errors
           test-errors
           'cost

src/reports/make-graph.rkt

@@ -3,15 +3,16 @@
 (require (only-in xml write-xexpr xexpr?)
          (only-in fpbench core->tex *expr-cse-able?* [core-common-subexpr-elim core-cse]))
 
-(require "../utils/common.rkt"
-         "../core/points.rkt"
+(require "../utils/alternative.rkt"
+         "../utils/common.rkt"
          "../utils/float.rkt"
-         "../utils/alternative.rkt"
-         "../syntax/types.rkt"
          "../syntax/read.rkt"
+         "../syntax/types.rkt"
          "../core/bsearch.rkt"
+         "../core/points.rkt"
          "../api/sandbox.rkt"
-         "common.rkt")
+         "common.rkt"
+         "history.rkt")
 
 (provide make-graph
          dummy-graph)
@@ -50,7 +51,7 @@
   (define end-costs (map (curryr hash-ref 'cost) end))
   (define end-histories
     (for/list ([end-analysis (in-list end)])
-      (read (open-input-string (hash-ref end-analysis 'history)))))
+      (hash-ref end-analysis 'history)))
 
   ; Speedup is going to be #f if cost is 0 for each alternative
   (define speedup
@@ -167,7 +168,8 @@
                        ,dropdown
                        ,(render-help "report.html#alternatives"))
                    ,body
-                   (details (summary "Derivation") (ol ((class "history")) ,@history))))
+                   (details (summary "Derivation") (ol ((class "history"))
+                                                       ,@(render-history history ctx)))))
      ,@(for/list ([i (in-naturals 1)]
                   [target (in-list targets)])
          (define target-error (hash-ref target 'errors))