X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=fio.h;h=0a7281925d1b3e5666a7d65da2c8fe24f1d91860;hb=0a4957c60fb35db0973c15c4c2adbd3bac854ccd;hp=72ca7f6ce232bbc40736d1f0b1c1ad416f2e0f40;hpb=5995a6a46a4c697a6c68c02da3c7c46c0cdea23f;p=fio.git

diff --git a/fio.h b/fio.h
index 72ca7f6c..0a728192 100644
--- a/fio.h
+++ b/fio.h
@@ -332,12 +332,10 @@ struct thread_data {
 
 	struct timeval start;	/* start of this loop */
 	struct timeval epoch;	/* time job was started */
-	struct timeval rw_end[2];
 	struct timeval last_issue;
 	struct timeval tv_cache;
 	unsigned int tv_cache_nr;
 	unsigned int tv_cache_mask;
-	unsigned int rw_end_set[2];
 	unsigned int ramp_time_over;
 
 	/*
@@ -373,16 +371,6 @@ struct thread_data {
 	os_random_state_t file_size_state;
 };
 
-/*
- * roundrobin available files, or choose one at random, or do each one
- * serially.
- */
-enum {
-	FIO_FSERVICE_RANDOM	= 1,
-	FIO_FSERVICE_RR		= 2,
-	FIO_FSERVICE_SEQ	= 3,
-};
-
 /*
  * when should interactive ETA output be generated
  */
@@ -455,72 +443,6 @@ static inline int should_fsync(struct thread_data *td)
 	return 0;
 }
 
-/*
- * Disk utils as read in /sys/block/<dev>/stat
- */
-struct disk_util_stat {
-	unsigned ios[2];
-	unsigned merges[2];
-	unsigned long long sectors[2];
-	unsigned ticks[2];
-	unsigned io_ticks;
-	unsigned time_in_queue;
-};
-
-/*
- * Per-device disk util management
- */
-struct disk_util {
-	struct flist_head list;
-	/* If this disk is a slave, hook it into the master's
-	 * list using this head.
-	 */
-	struct flist_head slavelist;
-
-	char *name;
-	char *sysfs_root;
-	char path[256];
-	int major, minor;
-
-	struct disk_util_stat dus;
-	struct disk_util_stat last_dus;
-
-	/* For software raids, this entry maintains pointers to the
-	 * entries for the slave devices. The disk_util entries for
-	 * the slaves devices should primarily be maintained through
-	 * the disk_list list, i.e. for memory allocation and
-	 * de-allocation, etc. Whereas this list should be used only
-	 * for aggregating a software RAID's disk util figures.
-	 */
-	struct flist_head slaves;
-
-	unsigned long msec;
-	struct timeval time;
-
-	struct fio_mutex *lock;
-	unsigned long users;
-};
-
-static inline void disk_util_inc(struct disk_util *du)
-{
-	if (du) {
-		fio_mutex_down(du->lock);
-		du->users++;
-		fio_mutex_up(du->lock);
-	}
-}
-
-static inline void disk_util_dec(struct disk_util *du)
-{
-	if (du) {
-		fio_mutex_down(du->lock);
-		du->users--;
-		fio_mutex_up(du->lock);
-	}
-}
-
-#define DISK_UTIL_MSEC	(250)
-
 /*
  * Time functions
  */
@@ -562,19 +484,6 @@ extern void td_fill_rand_seeds(struct thread_data *);
 extern void print_thread_status(void);
 extern void print_status_init(int);
 
-/*
- * disk util stuff
- */
-#ifdef FIO_HAVE_DISK_UTIL
-extern void show_disk_util(void);
-extern void init_disk_util(struct thread_data *);
-extern void update_io_ticks(void);
-#else
-#define show_disk_util()
-#define init_disk_util(td)
-#define update_io_ticks()
-#endif
-
 /*
  * Thread life cycle. Once a thread has a runstate beyond TD_INITIALIZED, it
  * will never back again. It may cycle between running/verififying/fsyncing.
@@ -642,39 +551,6 @@ extern int load_blktrace(struct thread_data *, const char *);
 	}	\
 } while (0)
 
-static inline void fio_file_reset(struct fio_file *f)
-{
-	f->last_free_lookup = 0;
-	f->last_pos = f->file_offset;
-	if (f->file_map)
-		memset(f->file_map, 0, f->num_maps * sizeof(int));
-}
-
-static inline void clear_error(struct thread_data *td)
-{
-	td->error = 0;
-	td->verror[0] = '\0';
-}
-
-#ifdef FIO_INC_DEBUG
-static inline void dprint_io_u(struct io_u *io_u, const char *p)
-{
-	struct fio_file *f = io_u->file;
-
-	dprint(FD_IO, "%s: io_u %p: off=%llu/len=%lu/ddir=%d", p, io_u,
-					(unsigned long long) io_u->offset,
-					io_u->buflen, io_u->ddir);
-	if (fio_debug & (1 << FD_IO)) {
-		if (f)
-			log_info("/%s", f->file_name);
-
-		log_info("\n");
-	}
-}
-#else
-#define dprint_io_u(io_u, p)
-#endif
-
 static inline int fio_fill_issue_time(struct thread_data *td)
 {
 	if (td->o.read_iolog_file ||