X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=backend.c;h=7de6f654d153b2f2798450ed4298a6d2c6763a2d;hb=a39fb9ea87afae396a882961fe65d87e548a1a1b;hp=f0cb1bc34cf91937b119c54186276a0aea696a26;hpb=b5b603f474a069eb63839af05db1571a9c122b56;p=fio.git

diff --git a/backend.c b/backend.c
index f0cb1bc3..7de6f654 100644
--- a/backend.c
+++ b/backend.c
@@ -57,6 +57,7 @@
 #include "workqueue.h"
 #include "lib/mountcheck.h"
 #include "rate-submit.h"
+#include "helper_thread.h"
 
 static struct fio_mutex *startup_mutex;
 static struct flist_head *cgroup_list;
@@ -75,16 +76,6 @@ int shm_id = 0;
 int temp_stall_ts;
 unsigned long done_secs = 0;
 
-static struct helper_data {
-	volatile int exit;
-	volatile int reset;
-	volatile int do_stat;
-	struct sk_out *sk_out;
-	pthread_t thread;
-	pthread_mutex_t lock;
-	pthread_cond_t cond;
-} *helper_data;
-
 #define PAGE_ALIGN(buf)	\
 	(char *) (((uintptr_t) (buf) + page_mask) & ~page_mask)
 
@@ -2323,158 +2314,10 @@ reap:
 	update_io_ticks();
 }
 
-void helper_reset(void)
-{
-	if (!helper_data)
-		return;
-
-	pthread_mutex_lock(&helper_data->lock);
-
-	if (!helper_data->reset) {
-		helper_data->reset = 1;
-		pthread_cond_signal(&helper_data->cond);
-	}
-
-	pthread_mutex_unlock(&helper_data->lock);
-}
-
-void helper_do_stat(void)
-{
-	if (!helper_data)
-		return;
-
-	pthread_mutex_lock(&helper_data->lock);
-	helper_data->do_stat = 1;
-	pthread_cond_signal(&helper_data->cond);
-	pthread_mutex_unlock(&helper_data->lock);
-}
-
-bool helper_should_exit(void)
-{
-	if (!helper_data)
-		return true;
-
-	return helper_data->exit;
-}
-
-static void wait_for_helper_thread_exit(void)
-{
-	void *ret;
-
-	pthread_mutex_lock(&helper_data->lock);
-	helper_data->exit = 1;
-	pthread_cond_signal(&helper_data->cond);
-	pthread_mutex_unlock(&helper_data->lock);
-
-	pthread_join(helper_data->thread, &ret);
-}
-
 static void free_disk_util(void)
 {
 	disk_util_prune_entries();
-
-	pthread_cond_destroy(&helper_data->cond);
-	pthread_mutex_destroy(&helper_data->lock);
-	sfree(helper_data);
-}
-
-static void *helper_thread_main(void *data)
-{
-	struct helper_data *hd = data;
-	unsigned int msec_to_next_event, next_log;
-	struct timeval tv, last_du;
-	int ret = 0;
-
-	sk_out_assign(hd->sk_out);
-
-	gettimeofday(&tv, NULL);
-	memcpy(&last_du, &tv, sizeof(tv));
-
-	fio_mutex_up(startup_mutex);
-
-	msec_to_next_event = DISK_UTIL_MSEC;
-	while (!ret && !hd->exit) {
-		struct timespec ts;
-		struct timeval now;
-		uint64_t since_du;
-
-		timeval_add_msec(&tv, msec_to_next_event);
-		ts.tv_sec = tv.tv_sec;
-		ts.tv_nsec = tv.tv_usec * 1000;
-
-		pthread_mutex_lock(&hd->lock);
-		pthread_cond_timedwait(&hd->cond, &hd->lock, &ts);
-
-		gettimeofday(&now, NULL);
-
-		if (hd->reset) {
-			memcpy(&tv, &now, sizeof(tv));
-			memcpy(&last_du, &now, sizeof(last_du));
-			hd->reset = 0;
-		}
-
-		pthread_mutex_unlock(&hd->lock);
-
-		since_du = mtime_since(&last_du, &now);
-		if (since_du >= DISK_UTIL_MSEC || DISK_UTIL_MSEC - since_du < 10) {
-			ret = update_io_ticks();
-			timeval_add_msec(&last_du, DISK_UTIL_MSEC);
-			msec_to_next_event = DISK_UTIL_MSEC;
-			if (since_du >= DISK_UTIL_MSEC)
-				msec_to_next_event -= (since_du - DISK_UTIL_MSEC);
-		} else {
-			if (since_du >= DISK_UTIL_MSEC)
-				msec_to_next_event = DISK_UTIL_MSEC - (DISK_UTIL_MSEC - since_du);
-			else
-				msec_to_next_event = DISK_UTIL_MSEC;
-		}
-
-		if (hd->do_stat) {
-			hd->do_stat = 0;
-			__show_running_run_stats();
-		}
-
-		next_log = calc_log_samples();
-		if (!next_log)
-			next_log = DISK_UTIL_MSEC;
-
-		msec_to_next_event = min(next_log, msec_to_next_event);
-
-		if (!is_backend)
-			print_thread_status();
-	}
-
-	fio_writeout_logs(false);
-
-	sk_out_drop();
-	return NULL;
-}
-
-static int create_helper_thread(struct sk_out *sk_out)
-{
-	struct helper_data *hd;
-	int ret;
-
-	hd = smalloc(sizeof(*hd));
-
-	setup_disk_util();
-
-	hd->sk_out = sk_out;
-	pthread_cond_init(&hd->cond, NULL);
-	pthread_mutex_init(&hd->lock, NULL);
-
-	ret = pthread_create(&hd->thread, NULL, helper_thread_main, hd);
-	if (ret) {
-		log_err("Can't create helper thread: %s\n", strerror(ret));
-		return 1;
-	}
-
-	helper_data = hd;
-
-	dprint(FD_MUTEX, "wait on startup_mutex\n");
-	fio_mutex_down(startup_mutex);
-	dprint(FD_MUTEX, "done waiting on startup_mutex\n");
-	return 0;
+	helper_thread_destroy();
 }
 
 int fio_backend(struct sk_out *sk_out)
@@ -2507,14 +2350,14 @@ int fio_backend(struct sk_out *sk_out)
 
 	set_genesis_time();
 	stat_init();
-	create_helper_thread(sk_out);
+	helper_thread_create(startup_mutex, sk_out);
 
 	cgroup_list = smalloc(sizeof(*cgroup_list));
 	INIT_FLIST_HEAD(cgroup_list);
 
 	run_threads(sk_out);
 
-	wait_for_helper_thread_exit();
+	helper_thread_exit();
 
 	if (!fio_abort) {
 		__show_run_stats();