From 15adde7d7eccec75d28dab6becbf7e8b46bb3f91 Mon Sep 17 00:00:00 2001
From: Vincent St-Amour <stamourv@racket-lang.org>
Date: Tue, 21 Jan 2014 11:34:00 -0500
Subject: [PATCH] Don't rely on sample counts for anything.

---
 pkgs/contract-profile/boundary-view.rkt |  3 +--
 pkgs/contract-profile/main.rkt          | 13 ++++---------
 pkgs/contract-profile/utils.rkt         |  2 +-
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/pkgs/contract-profile/boundary-view.rkt b/pkgs/contract-profile/boundary-view.rkt
index 107bb7a8fc..62ae396585 100644
--- a/pkgs/contract-profile/boundary-view.rkt
+++ b/pkgs/contract-profile/boundary-view.rkt
@@ -46,8 +46,7 @@
 
 (define (boundary-view correlated)
   (match-define (contract-profile
-                 total-time n-samples n-contract-samples
-                 live-contract-samples all-blames regular-profile)
+                 total-time live-contract-samples all-blames regular-profile)
     correlated)
 
   (define all-contracts (remove-duplicates (map blame-contract all-blames)))
diff --git a/pkgs/contract-profile/main.rkt b/pkgs/contract-profile/main.rkt
index c0a0cb1e42..6d99639285 100644
--- a/pkgs/contract-profile/main.rkt
+++ b/pkgs/contract-profile/main.rkt
@@ -13,7 +13,6 @@
   ;; reverse is there to sort samples in forward time, which get-times
   ;; needs.
   (define samples    (get-times (map cdr (reverse (cdr samples*)))))
-  (define n-samples             (length contract-samples))
   ;; combine blame info and stack trace info. samples should line up
   (define aug-contract-samples
     ;; If the sampler was stopped after recording a contract sample, but
@@ -23,7 +22,6 @@
                [s   (in-list samples)])
       (cons c-s s)))
   (define live-contract-samples (filter car aug-contract-samples))
-  (define n-contract-samples    (length live-contract-samples))
   (define all-blames
     (set->list (for/set ([b (in-list contract-samples)]
                          #:when b)
@@ -33,8 +31,8 @@
                      (blame-swap b) ; swap back
                      b))))
   (define regular-profile (analyze-samples samples*))
-  (contract-profile total-time n-samples n-contract-samples
-                    live-contract-samples all-blames regular-profile))
+  (contract-profile
+   total-time live-contract-samples all-blames regular-profile))
 
 
 (define (analyze-contract-samples contract-samples samples*)
@@ -54,15 +52,13 @@
 
 (define (print-breakdown correlated)
   (match-define (contract-profile
-                 total-time n-samples n-contract-samples
-                 live-contract-samples all-blames regular-profile)
+                 total-time live-contract-samples all-blames regular-profile)
     correlated)
 
   (define total-contract-time (samples-time live-contract-samples))
   (define contract-ratio (/ total-contract-time (max total-time 1) 1.0))
   (printf "Running time is ~a% contracts\n"
           (~r (* 100 contract-ratio) #:precision 2))
-  (printf "~a/~a samples\n" n-contract-samples n-samples)
   (printf "~a/~a ms\n\n"
           (~r total-contract-time #:precision 0)
           total-time)
@@ -137,8 +133,7 @@
 
 (define (module-graph-view correlated)
   (match-define (contract-profile
-                 total-time n-samples n-contract-samples
-                 live-contract-samples all-blames regular-profile)
+                 total-time live-contract-samples all-blames regular-profile)
     correlated)
 
   ;; first, enumerate all the relevant modules
diff --git a/pkgs/contract-profile/utils.rkt b/pkgs/contract-profile/utils.rkt
index 6c37667b06..a373d29a43 100644
--- a/pkgs/contract-profile/utils.rkt
+++ b/pkgs/contract-profile/utils.rkt
@@ -5,7 +5,7 @@
 (provide (all-defined-out))
 
 (struct contract-profile
-  (total-time n-samples n-contract-samples
+  (total-time
    ;; (pairof blame? profile-sample)
    ;; samples taken while a contract was running
    live-contract-samples