Merge branch 'logging'

diff --combined HOWTO
index 6952c84e84b141fb81b6c649ec0fb054d8bcc248,a74a1127141ba7a93837f83da64fa3775c8b941a..88d10a171da9e373ee40e5844b2b1690c6b3db28
--- 1/HOWTO
--- 2/HOWTO
+++ b/HOWTO
@@@ -798,9 -798,6 +798,9 @@@ ioengine=str       Defines how the job issue
                                overwriting. The writetrim mode works well
                                for this constraint.
  
 +                      pmemblk Read and write through the NVML libpmemblk
 +                              interface.
 +
                        external Prefix to specify loading an external
                                IO engine object file. Append the engine
                                filename, eg ioengine=external:/tmp/foo.o
@@@ -1266,10 -1263,14 +1266,14 @@@ exitall_on_error     When one job finishes 
                default is to wait for each job to finish.
  
  bwavgtime=int Average the calculated bandwidth over the given time. Value
-               is specified in milliseconds.
+               is specified in milliseconds. If the job also does bandwidth
+               logging through 'write_bw_log', then the minimum of this option
+               and 'log_avg_msec' will be used.  Default: 500ms.
  
  iopsavgtime=int       Average the calculated IOPS over the given time. Value
-               is specified in milliseconds.
+               is specified in milliseconds. If the job also does IOPS logging
+               through 'write_iops_log', then the minimum of this option and
+               'log_avg_msec' will be used.  Default: 500ms.
  
  create_serialize=bool If true, serialize the file creating for the jobs.
                        This may be handy to avoid interleaving of data

diff --combined fio.1
index 48a3e96edce9b4deb562497704e88950be17a27f,e9bb72e4645e5e7ea4df223445d7d3a598f69c8b..ebb489905707d9b2b48511295477bed80d1b7fec
--- 1/fio.1
--- 2/fio.1
+++ b/fio.1
@@@ -700,9 -700,6 +700,9 @@@ treated as erases. Depending on the und
  to go in a certain pattern, e.g., on NAND, writing sequentially to erase blocks
  and discarding before overwriting. The writetrim mode works well for this
  constraint.
 +.TP
 +.B pmemblk
 +Read and write through the NVML libpmemblk interface.
  .RE
  .P
  .RE
@@@ -1183,12 -1180,14 +1183,14 @@@ Terminate all jobs if one job finishes 
  to finish.
  .TP
  .BI bwavgtime \fR=\fPint
- Average bandwidth calculations over the given time in milliseconds.  Default:
- 500ms.
+ Average bandwidth calculations over the given time in milliseconds. If the job
+ also does bandwidth logging through \fBwrite_bw_log\fR, then the minimum of
+ this option and \fBlog_avg_msec\fR will be used.  Default: 500ms.
  .TP
  .BI iopsavgtime \fR=\fPint
- Average IOPS calculations over the given time in milliseconds.  Default:
- 500ms.
+ Average IOPS calculations over the given time in milliseconds. If the job
+ also does IOPS logging through \fBwrite_iops_log\fR, then the minimum of
+ this option and \fBlog_avg_msec\fR will be used.  Default: 500ms.
  .TP
  .BI create_serialize \fR=\fPbool
  If true, serialize file creation for the jobs.  Default: true.