Merge missing content to man page

[fio.git] / fio.1

diff --git a/fio.1 b/fio.1
index 0c2a243c0756b80b9ef561db51b42af92ba0aad9..eddc265258ee7f569e9c9a9a6e854298f87e73d8 100644 (file)
--- a/fio.1
+++ b/fio.1
@@ -152,7 +152,7 @@ reserved name, meaning stdin or stdout, depending on the read/write direction
 set.
 .TP
 .BI filename_format \fR=\fPstr
-.B If sharing multiple files between jobs, it is usually necessary to have
+If sharing multiple files between jobs, it is usually necessary to have
 fio generate the exact names that you want. By default, fio will name a file
 based on the default file format specification of
 \fBjobname.jobnumber.filenumber\fP. With this option, that can be
@@ -197,6 +197,7 @@ Only one thread or process may do IO at the time, excluding all others.
 Read-write locking on the file. Many readers may access the file at the same
 time, but writes get exclusive access.
 .RE
+.RE
 .P
 .BI opendir \fR=\fPstr
 Recursively open any files below directory \fIstr\fR.
@@ -1033,7 +1034,7 @@ Disable measurements of throughput/bandwidth numbers. See \fBdisable_lat\fR.
 .TP
 .BI lockmem \fR=\fPint
 Pin the specified amount of memory with \fBmlock\fR\|(2).  Can be used to
-simulate a smaller amount of memory.
+simulate a smaller amount of memory. The amount specified is per worker.
 .TP
 .BI exec_prerun \fR=\fPstr
 Before running the job, execute the specified command with \fBsystem\fR\|(3).
@@ -1169,6 +1170,12 @@ Some parameters are only valid when a specific ioengine is in use. These are
 used identically to normal parameters, with the caveat that when used on the
 command line, the must come after the ioengine that defines them is selected.
 .TP
+.BI (cpu)cpuload \fR=\fPint
+Attempt to use the specified percentage of CPU cycles.
+.TP
+.BI (cpu)cpuchunks \fR=\fPint
+Split the load into cycles of the given time. In microseconds.
+.TP
 .BI (libaio)userspace_reap
 Normally, with the libaio engine in use, fio will use
 the io_getevents system call to reap newly returned events.