The following changes since commit 8edd973d57a311d4c590d7385796bbdf111ed04c:
Add runstate swap helpers (2014-03-01 08:24:03 -0700)
are available in the git repository at:
git://git.kernel.dk/fio.git master
for you to fetch changes up to fad69e155f10094611154e76c6babc1fdd1d40c1:
Fio 2.1.6 (2014-03-03 15:49:00 -0800)
----------------------------------------------------------------
fio v2.1.6
----------------------------------------------------------------
Bruce Cran (1):
Windows: add install directory to the Path environment variable
Jens Axboe (5):
server: fix warnings on some platforms on incompatible pointer type
Silence 'io_u might be used uninitialized' warning
solaris: fixup new cpuset functions
Merge branch 'master' of ssh://git.kernel.dk/data/git/fio
Fio 2.1.6
Puthikorn Voravootivat (1):
Fix verify_only option not working properly
FIO-VERSION-GEN | 2 +-
backend.c | 6 ++++++
io_u.c | 2 +-
os/os-solaris.h | 24 +++++++++++++-----------
os/windows/install.wxs | 3 ++-
server.c | 2 +-
6 files changed, 24 insertions(+), 15 deletions(-)
---
Diff of recent changes:
diff --git a/FIO-VERSION-GEN b/FIO-VERSION-GEN
index 63ed948..8953d10 100755
--- a/FIO-VERSION-GEN
+++ b/FIO-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=FIO-VERSION-FILE
-DEF_VER=fio-2.1.5
+DEF_VER=fio-2.1.6
LF='
'
diff --git a/backend.c b/backend.c
index 72d9d6d..992033c 100644
--- a/backend.c
+++ b/backend.c
@@ -1196,6 +1196,12 @@ static uint64_t do_dry_run(struct thread_data *td)
td->ts.total_io_u[io_u->ddir]++;
}
+ if (td_write(td) && io_u->ddir == DDIR_WRITE &&
+ td->o.do_verify &&
+ td->o.verify != VERIFY_NONE &&
+ !td->o.experimental_verify)
+ log_io_piece(td, io_u);
+
ret = io_u_sync_complete(td, io_u, bytes_done);
(void) ret;
}
diff --git a/io_u.c b/io_u.c
index 75b23eb..8e27708 100644
--- a/io_u.c
+++ b/io_u.c
@@ -1297,7 +1297,7 @@ int queue_full(struct thread_data *td)
struct io_u *__get_io_u(struct thread_data *td)
{
- struct io_u *io_u;
+ struct io_u *io_u = NULL;
td_io_u_lock(td);
diff --git a/os/os-solaris.h b/os/os-solaris.h
index c8896b8..5b78cc2 100644
--- a/os/os-solaris.h
+++ b/os/os-solaris.h
@@ -5,6 +5,7 @@
#include <errno.h>
#include <malloc.h>
+#include <unistd.h>
#include <sys/types.h>
#include <sys/fcntl.h>
#include <sys/pset.h>
@@ -105,7 +106,8 @@ static inline int fio_set_odirect(int fd)
static inline int fio_cpu_isset(os_cpu_mask_t *mask, int cpu)
{
- const unsigned int max_cpus = cpus_online();
+ const unsigned int max_cpus = sysconf(_SC_NPROCESSORS_ONLN);
+ unsigned int num_cpus;
processorid_t *cpus;
int i, ret;
@@ -117,7 +119,7 @@ static inline int fio_cpu_isset(os_cpu_mask_t *mask, int
cpu)
}
ret = 0;
- for (i = 0; i < max_cpus; i++) {
+ for (i = 0; i < num_cpus; i++) {
if (cpus[i] == cpu) {
ret = 1;
break;
@@ -128,15 +130,7 @@ static inline int fio_cpu_isset(os_cpu_mask_t *mask, int
cpu)
return ret;
}
-static inline int fio_cpuset_init(os_cpu_mask_t *mask)
-{
- if (pset_create(mask) < 0)
- return -1;
-
- return 0;
-}
-
-static inline int fio_cpuset_count(os_cpu_mask_t *mask)
+static inline int fio_cpu_count(os_cpu_mask_t *mask)
{
unsigned int num_cpus;
@@ -146,6 +140,14 @@ static inline int fio_cpuset_count(os_cpu_mask_t *mask)
return num_cpus;
}
+static inline int fio_cpuset_init(os_cpu_mask_t *mask)
+{
+ if (pset_create(mask) < 0)
+ return -1;
+
+ return 0;
+}
+
static inline int fio_cpuset_exit(os_cpu_mask_t *mask)
{
if (pset_destroy(*mask) < 0)
diff --git a/os/windows/install.wxs b/os/windows/install.wxs
index fd38041..694d422 100755
--- a/os/windows/install.wxs
+++ b/os/windows/install.wxs
@@ -10,7 +10,7 @@
<Product Id="*"
Codepage="1252" Language="1033"
Manufacturer="fio" Name="fio"
- UpgradeCode="2338A332-5511-43CF-B9BD-5C60496CCFCC" Version="2.1.5">
+ UpgradeCode="2338A332-5511-43CF-B9BD-5C60496CCFCC" Version="2.1.6">
<Package
Description="Flexible IO Tester"
InstallerVersion="301" Keywords="Installer,MSI,Database"
@@ -25,6 +25,7 @@
<Directory Id="fio" Name="fio">
<Component>
<File
Source="..\..\fio.exe"/>
+ <Environment
Action="set" Part="last" Id="PATH" Name="PATH" Value="[INSTALLDIR]fio\"
System="yes"/>
</Component>
<Component>
<File Id="README"
Name="README.txt" Source="..\..\README"/>
diff --git a/server.c b/server.c
index b6961fd..dc70616 100644
--- a/server.c
+++ b/server.c
@@ -1138,7 +1138,7 @@ static int fio_send_cmd_ext_pdu(int sk, uint16_t opcode,
const void *buf,
struct fio_net_cmd cmd;
struct iovec iov[2];
- iov[0].iov_base = &cmd;
+ iov[0].iov_base = (void *) &cmd;
iov[0].iov_len = sizeof(cmd);
iov[1].iov_base = (void *) buf;
iov[1].iov_len = size;
--
To unsubscribe from this list: send the line "unsubscribe fio" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
