diff options
| author | Alex Gorrod <alexg@wiredtiger.com> | 2014-02-14 16:46:39 +1100 |
|---|---|---|
| committer | Alex Gorrod <alexg@wiredtiger.com> | 2014-02-14 16:46:39 +1100 |
| commit | 6bb1d7c51208f8d99bdca4d194d661360952cb77 (patch) | |
| tree | b8a1b971ceb56c351c673b15798cbca359cdc32c | |
| parent | 368aefb82853d2ff50a77ff637c37c80c3687801 (diff) | |
| parent | f507e9450947683ca55bf23b48779ee804d7163f (diff) | |
| download | mongo-6bb1d7c51208f8d99bdca4d194d661360952cb77.tar.gz | |
Merge branch 'config-parse-api' into wtperf-multiple-databases
| -rw-r--r-- | bench/wtperf/wtperf.c | 16 | ||||
| -rw-r--r-- | tools/wtperf_stats.py | 7 |
2 files changed, 13 insertions, 10 deletions
diff --git a/bench/wtperf/wtperf.c b/bench/wtperf/wtperf.c index f12e71cc65c..94afcf01e85 100644 --- a/bench/wtperf/wtperf.c +++ b/bench/wtperf/wtperf.c @@ -672,14 +672,20 @@ monitor(void *arg) /* Set line buffering for monitor file. */ (void)setvbuf(fp, NULL, _IOLBF, 0); fprintf(fp, - "#time,totalsec," - "read operations,insert operations,update operations," + "#time," + "totalsec," + "read ops per second," + "insert ops per second," + "update ops per second," "checkpoints," - "read average latency(uS),read minimum latency(uS)," + "read average latency(uS)," + "read minimum latency(uS)," "read maximum latency(uS)," - "insert average latency(uS),insert min latency(uS)," + "insert average latency(uS)," + "insert min latency(uS)," "insert maximum latency(uS)," - "update average latency(uS),update min latency(uS)," + "update average latency(uS)," + "update min latency(uS)," "update maximum latency(uS)" "\n"); last_reads = last_inserts = last_updates = 0; diff --git a/tools/wtperf_stats.py b/tools/wtperf_stats.py index 65e403ee77e..388eb9fe24b 100644 --- a/tools/wtperf_stats.py +++ b/tools/wtperf_stats.py @@ -49,9 +49,6 @@ except ImportError: def munge_dict(values_dict, abstime): sorted_values = sorted(values_dict, key=operator.itemgetter('#time')) start_time = parsetime(sorted_values[0]['#time']) - seconds = (parsetime(sorted_values[1]['#time']) - start_time).seconds - if seconds == 0: - seconds = 1 ret = [] for v in sorted_values: @@ -74,8 +71,8 @@ def munge_dict(values_dict, abstime): title = 'time' elif title.find('latency') == -1 and \ title.find('checkpoints') == -1: - title = title + ' per second' - value = float(value) / seconds + title = title + ' (thousands)' + value = float(value) / 1000 next_val[title] = value ret.append(next_val) |