Skip to contentSkip to conversation

Recent changes (master)

PATCH Jens Axboe 1 participant 1 message Dec 20, 2014

Subsystems (2)
Kbuild Library code
lore
Share & tools
lore

Jens Axboe

author
#0 lore raw

The following changes since commit 2243dfc796a8a6e137893a57a77949df7657dd71:

options: add debug code for failure to lookup option names (2014-12-18 21:51:21 -0700)

are available in the git repository at:

git://git.kernel.dk/fio.git master

for you to fetch changes up to 8a2b393b00dc4b6a8ba129a0e7850a78114ac75e:

gettime: hide fio_gtod_cpumask if not used (2014-12-19 15:04:10 -0700)

----------------------------------------------------------------
Jens Axboe (5):
options: turn missing options into debug parse messages
axmap: ensure we lock down the maps for shared access Fio 2.2.1
gettime: only use CPU affinity if available
gettime: hide fio_gtod_cpumask if not used

 FIO-VERSION-GEN        |    2 +-
 Makefile               |    2 +-
 gettime-thread.c       |    6 +++++-
 lib/axmap.c            |   54 +++++++++++++++++++++++++++++++++++++++---------
 options.c              |    4 +---
 options.h              |    6 ++++--
 os/windows/install.wxs |    2 +-
 t/axmap.c              |    1 +
 8 files changed, 58 insertions(+), 19 deletions(-)

---

Diff of recent changes:

FIO-VERSION-GEN +1 -1
index f0a0a45..d124e36 100755
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=FIO-VERSION-FILE
-DEF_VER=fio-2.2.0
+DEF_VER=fio-2.2.1
 
 LF='
 '
Makefile +1 -1
index 52e515b..d27ecaf 100644
@@ -186,7 +186,7 @@ T_ZIPF_OBJS += t/log.o lib/ieee754.o lib/rand.o lib/zipf.o t/genzipf.o
 T_ZIPF_PROGS = t/fio-genzipf
 
 T_AXMAP_OBJS = t/axmap.o
-T_AXMAP_OBJS += lib/lfsr.o lib/axmap.o
+T_AXMAP_OBJS += lib/lfsr.o lib/axmap.o gettime.o mutex.o t/log.o t/debug.o
 T_AXMAP_PROGS = t/axmap
 
 T_LFSR_TEST_OBJS = t/lfsr-test.o
gettime-thread.c +5 -1
index 73632d0..2dc976f 100644
@@ -8,8 +8,10 @@
 
 struct timeval *fio_tv = NULL;
 int fio_gtod_offload = 0;
-static os_cpu_mask_t fio_gtod_cpumask;
 static pthread_t gtod_thread;
+#ifdef FIO_HAVE_CPU_AFFINITY
+static os_cpu_mask_t fio_gtod_cpumask;
+#endif
 
 void fio_gtod_init(void)
 {

@@ -95,5 +97,7 @@ err:
 
 void fio_gtod_set_cpu(unsigned int cpu)
 {
+#ifdef FIO_HAVE_CPU_AFFINITY
 	fio_cpu_set(&fio_gtod_cpumask, cpu);
+#endif
 }
lib/axmap.c +44 -10

131 lines not on this page · raw message

options.c +1 -3
index 6ceefbc..e3c9c87 100644
@@ -4204,10 +4204,8 @@ int __fio_option_is_set(struct thread_options *o, unsigned int off1)
 		}
 	}
 
-	if (!opt) {
-		log_err("fio: no option found at offset %u\n", off1);
+	if (!opt)
 		return -1;
-	}
 
 	opt_off = opt - &fio_options[0];
 	index = opt_off / (8 * sizeof(uint64_t));
options.h +4 -2
index e830884..36fd35d 100644
@@ -26,9 +26,11 @@ extern int __fio_option_is_set(struct thread_options *, unsigned int off);
 
 #define fio_option_is_set(__td, name)					\
 ({									\
-	int __r = __fio_option_is_set((__td), td_var_offset(name));	\
+	const unsigned int off = td_var_offset(name);			\
+	int __r = __fio_option_is_set((__td), off);			\
 	if (__r == -1) {						\
-		log_err("fio: wanted %s\n", __fio_stringify(name));	\
+		dprint(FD_PARSE, "option %s/%u not found in map\n",	\
+				__fio_stringify(name), off);		\
 		__r = 0;						\
 	}								\
 	__r;								\
os/windows/install.wxs +1 -1
index 26be597..5db099b 100755
@@ -10,7 +10,7 @@
 	<Product Id="*"
 	  Codepage="1252" Language="1033"
 	  Manufacturer="fio" Name="fio"
-	  UpgradeCode="2338A332-5511-43CF-B9BD-5C60496CCFCC" Version="2.2.0">
+	  UpgradeCode="2338A332-5511-43CF-B9BD-5C60496CCFCC" Version="2.2.1">
 		<Package
 		  Description="Flexible IO Tester"
 		  InstallerVersion="301" Keywords="Installer,MSI,Database"
t/axmap.c +1 -0
index e32ff98..cc078aa 100644
@@ -5,6 +5,7 @@
 #include <unistd.h>
 #include <inttypes.h>
 
+#include "../mutex.h"
 #include "../lib/lfsr.h"
 #include "../lib/axmap.h"