The following changes since commit a7321eede75b2713067349a1fdcd0e67fdcac6bb: README: update for newer client job file argument format (2012-08-26 19:32:45 +0200) are available in the git repository at: git://git.kernel.dk/fio.git master liang xie (1): fio:modify a deprecated parameter(change timeout to runtime) xieliang (1): Fixup README indentation README | 12 ++++++------ fio.1 | 4 ++-- init.c | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) --- Diff of recent changes: diff --git a/README b/README index 8bce835..c629e2d 100644 --- a/README +++ b/README @@ -121,7 +121,7 @@ Command line $ fio --debug Enable some debugging options (see below) --output Write output to file - --timeout Runtime in seconds + --runtime Runtime in seconds --latency-log Generate per-job latency logs --bandwidth-log Generate per-job bandwidth logs --minimal Minimal (terse) output @@ -138,8 +138,8 @@ $ fio May be "always", "never" or "auto" --section=name Only run specified section in job file. Multiple sections can be specified. - --alloc-size=kb Set smalloc pool to this size in kb (def 1024) - --warnings-fatal Fio parser warnings are fatal + --alloc-size=kb Set smalloc pool to this size in kb (def 1024) + --warnings-fatal Fio parser warnings are fatal --max-jobs Maximum number of threads/processes to support --server=args Start backend server. See Client/Server section. --client=host Connect to specified backend. @@ -161,11 +161,11 @@ options in fio. Currently the options are: process Dump info related to processes file Dump info related to file actions - io Dump info related to IO queuing - mem Dump info related to memory allocations + io Dump info related to IO queuing + mem Dump info related to memory allocations blktrace Dump info related to blktrace setup verify Dump info related to IO verification - all Enable all debug options + all Enable all debug options random Dump info related to random offset generation parse Dump info related to option matching and parsing diskutil Dump info related to disk utilization updates diff --git a/fio.1 b/fio.1 index 5b61e43..086cf9d 100644 --- a/fio.1 +++ b/fio.1 @@ -20,8 +20,8 @@ list all available tracing options. .BI \-\-output \fR=\fPfilename Write output to \fIfilename\fR. .TP -.BI \-\-timeout \fR=\fPtimeout -Limit run time to \fItimeout\fR seconds. +.BI \-\-runtime \fR=\fPruntime +Limit run time to \fIruntime\fR seconds. .TP .B \-\-latency\-log Generate per-job latency logs. diff --git a/init.c b/init.c index 824828c..9f597a9 100644 --- a/init.c +++ b/init.c @@ -1185,7 +1185,7 @@ static void usage(const char *name) "\t\t\tprocess,file,io,mem,blktrace,verify,random,parse,\n" "\t\t\tdiskutil,job,mutex,profile,time,net\n"); printf(" --output\t\tWrite output to file\n"); - printf(" --timeout\t\tRuntime in seconds\n"); + printf(" --runtime\t\tRuntime in seconds\n"); printf(" --latency-log\t\tGenerate per-job latency logs\n"); printf(" --bandwidth-log\tGenerate per-job bandwidth logs\n"); printf(" --minimal\t\tMinimal (terse) output\n"); -- To unsubscribe from this list: send the line "unsubscribe fio" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html