Skip to contentSkip to conversation

Recent changes (master)

PATCH Jens Axboe 1 participant 1 message Aug 26, 2016

lore
Share & tools
lore

Jens Axboe

author
#0 lore raw

The following changes since commit 9e4438fecd1d92b4d5221f35d5e73546f52c6ebf:

stat: don't trust per_unit_log() if log is NULL (2016-08-22 13:23:29 -0600)

are available in the git repository at:

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

for you to fetch changes up to 04d6530f6ecd50520e99732b0b6bb90f71ff131a:

file: fix numjobs > 1 and implied jobname as filename (2016-08-25 21:00:55 -0600)

----------------------------------------------------------------
Jens Axboe (2):
Merge branch 'epoch-histograms' of https://github.com/cronburg/fio
file: fix numjobs > 1 and implied jobname as filename

Karl Cronburg (1):
Give job file to fiologparser_hist.py so that it can auto detect log_hist_msec. This commit also adds handling of unix epoch timestamps by fiologparser_hist.py.

 file.h                          |  1 +
 filesetup.c                     | 43 +++++++++++++++++++++++++++++++----------
 init.c                          | 20 -------------------
 tools/hist/fiologparser_hist.py | 41 +++++++++++++++++++++++++++++++++++++--
 4 files changed, 73 insertions(+), 32 deletions(-)

---

Diff of recent changes:

file.h +1 -0
index f7e5d20..aff3ce9 100644
@@ -211,5 +211,6 @@ extern void free_release_files(struct thread_data *);
 extern void filesetup_mem_free(void);
 extern void fio_file_reset(struct thread_data *, struct fio_file *);
 extern int fio_files_done(struct thread_data *);
+extern bool exists_and_not_regfile(const char *);
 
 #endif
filesetup.c +33 -10

77 lines not on this page · raw message

init.c +0 -20
index 5ff7385..0221ab2 100644
@@ -903,26 +903,6 @@ static const char *get_engine_name(const char *str)
 	return p;
 }
 
-static int exists_and_not_regfile(const char *filename)
-{
-	struct stat sb;
-
-	if (lstat(filename, &sb) == -1)
-		return 0;
-
-#ifndef WIN32 /* NOT Windows */
-	if (S_ISREG(sb.st_mode))
-		return 0;
-#else
-	/* \\.\ is the device namespace in Windows, where every file
-	 * is a device node */
-	if (S_ISREG(sb.st_mode) && strncmp(filename, "\\\\.\\", 4) != 0)
-		return 0;
-#endif
-
-	return 1;
-}
-
 static void init_rand_file_service(struct thread_data *td)
 {
 	unsigned long nranges = td->o.nr_files << FIO_FSERVICE_SHIFT;
tools/hist/fiologparser_hist.py +39 -2

65 lines not on this page · raw message