Skip to contentSkip to conversation

Recent changes (master)

PATCH Jens Axboe 1 participant 1 message Jun 10, 2015

lore
Share & tools
lore

Jens Axboe

author
#0 lore raw

The following changes since commit 5924538164650c6c0dc0e866d6ed15eb199ed020:

verify: add raw pattern verify (2015-06-08 20:43:43 -0600)

are available in the git repository at:

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

for you to fetch changes up to f491a907983c1022ec3c4d3a76d969c286fe441b:

Dropped commented out part of line. (2015-06-09 14:14:20 -0700)

----------------------------------------------------------------
Jens Axboe (3):
verify: fix dumping of received/expected buffers on failure
verify: cleanup code for verify pattern without headers
options: use fio_option_is_set() to detect verify setting

Sam Zaydel (3):
int may be too small for a size_t on some systems. Merge branch 'master' of github.com:axboe/fio into fixtype Dropped commented out part of line.

 backend.c |  3 ++-
 options.c |  2 +-
 verify.c  | 91 +++++++++++++++++++++++++++++++++++++++++++--------------------
 3 files changed, 66 insertions(+), 30 deletions(-)

---

Diff of recent changes:

backend.c +2 -1
index 975317f..6989407 100644
@@ -1242,7 +1242,8 @@ static int keep_running(struct thread_data *td)
 
 static int exec_string(struct thread_options *o, const char *string, const char *mode)
 {
-	int ret, newlen = strlen(string) + strlen(o->name) + strlen(mode) + 9 + 1;
+	size_t newlen = strlen(string) + strlen(o->name) + strlen(mode) + 9 + 1;
+	int ret;
 	char *str;
 
 	str = malloc(newlen);
options.c +1 -1
index cd37141..e3b9338 100644
@@ -1064,7 +1064,7 @@ static int str_verify_pattern_cb(void *data, const char *input)
 	/*
 	 * VERIFY_META could already be set
 	 */
-	if (!ret && td->o.verify == VERIFY_NONE)
+	if (!ret && !fio_option_is_set(&td->o, verify))
 		td->o.verify = VERIFY_PATTERN;
 
 	return ret;
verify.c +63 -28

223 lines not on this page · raw message