Skip to contentSkip to conversation

Recent changes (master)

PATCH Jens Axboe 1 participant 1 message Jan 5, 2020

lore
Share & tools
lore

Jens Axboe

author
#0 lore raw

The following changes since commit 235b09b68d9bbc5150891faca47f5397d7e806bb:

Merge branch 'master' of https://github.com/bvanassche/fio (2020-01-03 21:00:17 -0700)

are available in the Git repository at:

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

for you to fetch changes up to fa6e7f4fb827adb124dbb97a7f72d64e76b2fe6a:

Merge branch 'master' of https://github.com/bvanassche/fio (2020-01-04 20:22:16 -0700)

----------------------------------------------------------------
Bart Van Assche (6):
Handle helper_thread_create() failures properly
Fix a potential deadlock in helper_do_stat()
Block signals for the helper thread
helper_thread: Complain if select() fails
t/memlock: Free allocated memory
t/read-to-pipe-async: Complain if option -f is specified multiple times

Jens Axboe (2):
Merge branch 'master' of https://github.com/bvanassche/fio
Merge branch 'master' of https://github.com/bvanassche/fio

 backend.c              |   3 +-
 configure              |  66 ++++++++++++++++
 helper_thread.c        | 211 ++++++++++++++++++++++++++++++++++++++++---------
 t/memlock.c            |   1 +
 t/read-to-pipe-async.c |   2 +
 5 files changed, 244 insertions(+), 39 deletions(-)

---

Diff of recent changes:

backend.c +2 -1
index d0d691b3..0d1f4734 100644
@@ -2495,7 +2495,8 @@ int fio_backend(struct sk_out *sk_out)
 
 	set_genesis_time();
 	stat_init();
-	helper_thread_create(startup_sem, sk_out);
+	if (helper_thread_create(startup_sem, sk_out))
+		log_err("fio: failed to create helper thread\n");
 
 	cgroup_list = smalloc(sizeof(*cgroup_list));
 	if (cgroup_list)
configure +66 -0

90 lines not on this page · raw message

helper_thread.c +173 -38

299 lines not on this page · raw message

t/memlock.c +1 -0
index 3d3579ad..ebedb91d 100644
@@ -26,6 +26,7 @@ static void *worker(void *data)
 			first = 0;
 		}
 	}
+	free(buf);
 	return NULL;
 }
 
t/read-to-pipe-async.c +2 -0
index 69799336..bc7986f7 100644
@@ -520,6 +520,8 @@ static int parse_options(int argc, char *argv[])
 	while ((c = getopt(argc, argv, "f:b:t:w:")) != -1) {
 		switch (c) {
 		case 'f':
+			if (file)
+				return usage(argv);
 			file = strdup(optarg);
 			break;
 		case 'b':