Permalink
Browse files

Merge branch 'master' of github.com:jafingerhut/clojure-benchmarks

  • Loading branch information...
2 parents 7adb425 + 60013fd commit dd242e0bc7a3f848b9261dfcac3be18c3fff9706 @jafingerhut committed Oct 30, 2012
Showing with 11 additions and 4 deletions.
  1. +11 −4 bin/results2graphs
View
@@ -88,7 +88,8 @@
(defn add-columns-problem-platform-language [data]
(for [{:keys [current_working_directory output_file jvm_os_name
- jvm_os_version jvm_java_version jvm_sun_arch_data_model]
+ jvm_os_version jvm_java_version jvm_sun_arch_data_model
+ user_cpu_time_sec system_cpu_time_sec elapsed_time_sec]
:as measurement} data]
(let [problem (basename current_working_directory)
lang (if-let [[_ size lang]
@@ -106,10 +107,16 @@
platform (format "%s %s + JDK %s, %s-bit"
jvm_os_name jvm_os_version
- jvm_java_version jvm_sun_arch_data_model)]
+ jvm_java_version jvm_sun_arch_data_model)
+ total_cpu_time_sec (+ user_cpu_time_sec system_cpu_time_sec)
+ parallelism (/ total_cpu_time_sec elapsed_time_sec)
+ ;; Round parallelism to fewer digits
+ parallelism (format "%.2f" parallelism)]
(assoc measurement :problem problem
:language lang
- :platform platform))))
+ :platform platform
+ :total_cpu_time_sec total_cpu_time_sec
+ :parallelism parallelism))))
(defn fastest-good-run [[problem-platform-lang measurements]]
@@ -258,7 +265,7 @@ consisting of one or more Measurement elements\n"
(if (:show-platform opts)
[:platform]
[])
- [:language :elapsed_time_sec :time_var]
+ [:language :elapsed_time_sec :time_var :parallelism]
(if (:show-all-times opts)
[:other_elapsed_time_sec]
[])

0 comments on commit dd242e0

Please sign in to comment.