diff options
| author | Sage Weil <sage@newdream.net> | 2012-05-30 10:05:01 -0700 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2012-05-30 10:05:01 -0700 |
| commit | e9588f0c82625dc957e024c68e8ccfc9b300e224 (patch) | |
| tree | 285c6486e6f0545c4db8acfa94731033b9d52f95 /src/rados.cc | |
| parent | 26ecf608c5fb5246ff455ebabca4ab0733984740 (diff) | |
| parent | 53269374b38d9e1671565883d5add738b67bd268 (diff) | |
| download | ceph-e9588f0c82625dc957e024c68e8ccfc9b300e224.tar.gz | |
Merge remote-tracking branch 'gh/wip-2349'
Reviewed-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'src/rados.cc')
| -rw-r--r-- | src/rados.cc | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/rados.cc b/src/rados.cc index a831260df3c..a562a485558 100644 --- a/src/rados.cc +++ b/src/rados.cc @@ -111,6 +111,10 @@ STR(DEFAULT_NUM_RADOS_WORKER_THREADS) ")\n" " --create\n" " create the pool or directory that was specified\n" "\n" +"BENCH OPTIONS:\n" +" --show-time\n" +" prefix output with date/time\n" +"\n" "LOAD GEN OPTIONS:\n" " --num-objects total number of objects\n" " --min-object-size min object size\n" @@ -667,6 +671,8 @@ static int rados_tool_common(const std::map < std::string, std::string > &opts, uint64_t num_objs = 0; int run_length = 0; + bool show_time = false; + Formatter *formatter = NULL; bool pretty_format = false; @@ -742,6 +748,10 @@ static int rados_tool_common(const std::map < std::string, std::string > &opts, if (i != opts.end()) { run_length = strtol(i->second.c_str(), NULL, 10); } + i = opts.find("show-time"); + if (i != opts.end()) { + show_time = true; + } i = opts.find("pretty-format"); if (i != opts.end()) { pretty_format = true; @@ -1281,6 +1291,7 @@ static int rados_tool_common(const std::map < std::string, std::string > &opts, else usage_exit(); RadosBencher bencher(rados, io_ctx); + bencher.set_show_time(show_time); ret = bencher.aio_bench(operation, seconds, concurrent_ios, op_size); if (ret != 0) cerr << "error during benchmark: " << ret << std::endl; @@ -1419,6 +1430,8 @@ int main(int argc, const char **argv) opts["create"] = "true"; } else if (ceph_argparse_flag(args, i, "--pretty-format", (char*)NULL)) { opts["pretty-format"] = "true"; + } else if (ceph_argparse_flag(args, i, "--show-time", (char*)NULL)) { + opts["show-time"] = "true"; } else if (ceph_argparse_witharg(args, i, &val, "-p", "--pool", (char*)NULL)) { opts["pool"] = val; } else if (ceph_argparse_witharg(args, i, &val, "--object-locator" , (char *)NULL)) { |