diff options
| author | Christopher Baines <mail@cbaines.net> | 2021-03-15 14:37:49 +0000 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2021-03-17 20:46:21 +0000 |
| commit | c37f78a9f55874015d10f081be36104bb33a3ae1 (patch) | |
| tree | f0cdb4b2855ad0569662042625a3584cd0396171 /guix/scripts | |
| parent | c5ab78f90b111839508d0ab10c0e5ac2038002ca (diff) | |
scripts: weather: Provide more representative request statistics.
Previously, the "seconds per request" and "requests per second" statistics
really reported (cache lookups + requests) per second. By looking at the
actual number of requests made within lookup-narinfos, a more representative
value can be reported.
* guix/scripts/weather.scm (let/time): Allow for multiple return values.
(report-server-coverage): Alter the reporting of request statistics.
Diffstat (limited to 'guix/scripts')
| -rw-r--r-- | guix/scripts/weather.scm | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/guix/scripts/weather.scm b/guix/scripts/weather.scm index 26ec543211..349052459c 100644 --- a/guix/scripts/weather.scm +++ b/guix/scripts/weather.scm @@ -117,8 +117,8 @@ values." (end (current-time time-monotonic))) (apply kont (time-difference end start) result))) -(define-syntax-rule (let/time ((time result exp)) body ...) - (call-with-time (lambda () exp) (lambda (time result) body ...))) +(define-syntax-rule (let/time ((time result ... exp)) body ...) + (call-with-time (lambda () exp) (lambda (time result ...) body ...))) (define (histogram field proc seed lst) "Return an alist giving a histogram of all the values of FIELD for elements @@ -181,11 +181,12 @@ Return the coverage ratio, an exact number between 0 and 1." (format #t (G_ "looking for ~h store items on ~a...~%") (length items) server) - (let/time ((time narinfos (lookup-narinfos - server items - #:make-progress-reporter - (lambda* (total #:key url #:allow-other-keys) - (progress-reporter/bar total))))) + (let/time ((time narinfos requests-made + (lookup-narinfos + server items + #:make-progress-reporter + (lambda* (total #:key url #:allow-other-keys) + (progress-reporter/bar total))))) (format #t "~a~%" server) (let ((obtained (length narinfos)) (requested (length items)) @@ -212,9 +213,9 @@ Return the coverage ratio, an exact number between 0 and 1." (format #t (G_ " ~,1h MiB on disk (uncompressed)~%") (/ (reduce + 0 (map narinfo-size narinfos)) MiB)) (format #t (G_ " ~,3h seconds per request (~,1h seconds in total)~%") - (/ time requested 1.) time) + (/ time requests-made 1.) time) (format #t (G_ " ~,1h requests per second~%") - (/ requested time 1.)) + (/ requests-made time 1.)) (guard (c ((http-get-error? c) (if (= 404 (http-get-error-code c)) |