eta: add cache invalidation status

Signed-off-by: Sitsofe Wheeler <sitsofe@yahoo.com>

Author: sitsofe

HOWTO.rst

@@ -4712,6 +4712,8 @@ forth.  The possible values (in typical life cycle order) are:
 +------+-----+-----------------------------------------------------------+
 |      |  p  | Thread running pre-reading file(s).                       |
 +------+-----+-----------------------------------------------------------+
+|      |  #  | Thread is invalidating the buffer/page cache of a file.   |
++------+-----+-----------------------------------------------------------+
 |      |  /  | Thread is in ramp period.                                 |
 +------+-----+-----------------------------------------------------------+
 |      |  R  | Running, doing sequential reads.                          |

client.c

@@ -1299,6 +1299,7 @@ static void convert_jobs_eta(struct jobs_eta *je)
 	int i;
 
 	je->nr_running		= le32_to_cpu(je->nr_running);
+	je->nr_invalidating	= le32_to_cpu(je->nr_invalidating);
 	je->nr_ramp		= le32_to_cpu(je->nr_ramp);
 	je->nr_pending		= le32_to_cpu(je->nr_pending);
 	je->nr_setting_up	= le32_to_cpu(je->nr_setting_up);

eta.c

@@ -90,6 +90,9 @@ static void check_str_update(struct thread_data *td)
 				c = 'D';
 		}
 		break;
+	case TD_INVALIDATING_CACHE:
+		c = '#';
+		break;
 	case TD_PRE_READING:
 		c = 'p';
 		break;
@@ -464,6 +467,9 @@ static bool calc_thread_status(struct jobs_eta *je, int force)
 			}
 
 			je->files_open += td->nr_open_files;
+		} else if (td->runstate == TD_INVALIDATING_CACHE) {
+			je->nr_running++;
+			je->nr_invalidating++;
 		} else if (td->runstate == TD_RAMP) {
 			je->nr_running++;
 			je->nr_ramp++;
@@ -645,7 +651,8 @@ void display_thread_status(struct jobs_eta *je)
 		int ddir;
 		int linelen;
 
-		if ((!je->eta_sec && !eta_good) || je->nr_ramp == je->nr_running ||
+		if ((!je->eta_sec && !eta_good) ||
+		    je->nr_ramp + je->nr_invalidating == je->nr_running ||
 		    je->eta_sec == -1)
 			strcpy(perc_str, "-.-%");
 		else {

filesetup.c

@@ -574,6 +574,7 @@ static int __file_invalidate_cache(struct thread_data *td, struct fio_file *f,
 				   unsigned long long len)
 {
 	int errval = 0, ret = 0;
+	int old_state;
 
 #ifdef CONFIG_ESX
 	return 0;
@@ -587,6 +588,7 @@ static int __file_invalidate_cache(struct thread_data *td, struct fio_file *f,
 	if (len == -1ULL || off == -1ULL)
 		return 0;
 
+	old_state = td_bump_runstate(td, TD_INVALIDATING_CACHE);
 	if (td->io_ops->invalidate) {
 		dprint(FD_IO, "invalidate %s cache %s\n", td->io_ops->name,
 			f->file_name);
@@ -640,6 +642,7 @@ static int __file_invalidate_cache(struct thread_data *td, struct fio_file *f,
 		log_info("fio: cache invalidation of %s failed: %s\n",
 			 f->file_name, strerror(errval));
 
+	td_restore_runstate(td, old_state);
 	return 0;
 
 }

fio.1

@@ -4352,6 +4352,9 @@ Thread initialized, waiting or generating necessary data.
 .B p
 Thread running pre-reading file(s).
 .TP
+.B #
+Thread is invalidating the buffer/page cache of a file.
+.TP
 .B /
 Thread is in ramp period.
 .TP

fio.h

@@ -716,6 +716,7 @@ enum {
 	TD_RAMP,
 	TD_SETTING_UP,
 	TD_RUNNING,
+	TD_INVALIDATING_CACHE,
 	TD_PRE_READING,
 	TD_VERIFYING,
 	TD_FSYNCING,

libfio.c

@@ -199,6 +199,7 @@ static const char *td_runstates[] = {
 	"RAMP",
 	"SETTING_UP",
 	"RUNNING",
+	"INVALIDATING_CACHE",
 	"PRE_READING",
 	"VERIFYING",
 	"FSYNCING",
@@ -209,7 +210,7 @@ static const char *td_runstates[] = {
 
 const char *runstate_to_name(int runstate)
 {
-	compiletime_assert(TD_LAST == 12, "td runstate list");
+	compiletime_assert(TD_LAST == 13, "td runstate list");
 	if (runstate >= 0 && runstate < TD_LAST)
 		return td_runstates[runstate];
 

server.c

@@ -1044,6 +1044,7 @@ static int handle_send_eta_cmd(struct fio_net_cmd *cmd)
 		je = calloc(1, size);
 	} else {
 		je->nr_running		= cpu_to_le32(je->nr_running);
+		je->nr_invalidating	= cpu_to_le32(je->nr_invalidating);
 		je->nr_ramp		= cpu_to_le32(je->nr_ramp);
 		je->nr_pending		= cpu_to_le32(je->nr_pending);
 		je->nr_setting_up	= cpu_to_le32(je->nr_setting_up);

stat.h

@@ -299,10 +299,12 @@ struct thread_stat {
 
 #define JOBS_ETA {							\
 	uint32_t nr_running;						\
+	uint32_t nr_invalidating;					\
 	uint32_t nr_ramp;						\
 									\
 	uint32_t nr_pending;						\
 	uint32_t nr_setting_up;						\
+	uint32_t pad3;							\
 									\
 	uint64_t m_rate[DDIR_RWDIR_CNT];				\
 	uint64_t t_rate[DDIR_RWDIR_CNT];				\