diff options
author | Sitsofe Wheeler <sitsofe@yahoo.com> | 2019-12-08 18:03:57 +0000 |
---|---|---|
committer | Sitsofe Wheeler <sitsofe@yahoo.com> | 2019-12-18 17:17:01 +0000 |
commit | df18600fd06258b96ae6f6b530ecdff541c2a82d (patch) | |
tree | 4ba7a8ee541cae930fd436eb660519dc00e634b2 /os | |
parent | 5f8b2810bd04f5a4a8e1f0f166cddeaf26f6644d (diff) | |
download | fio-df18600fd06258b96ae6f6b530ecdff541c2a82d.tar.gz fio-df18600fd06258b96ae6f6b530ecdff541c2a82d.tar.bz2 |
filesetup: fix directory creation issues
- Fix double directory prefix concatenation that was happening after
95af8dd57a7a9a564f99492bb1e04bb6d13b95b1 ("filesetup: don't call
create_work_dirs() for ioengine with FIO_DISKLESSIO") refactored some
code
- Stop always using '/' and switch to using FIO_OS_PATH_SEPARATOR when
concatenating the directory value to the filename in set_name_idx()
- Change the permissions directories are created with to have the
execute bit so they can be entered(!)
- Fix bug where filenames that were absolute unix paths would prevent
the creation of intermediate directories
- Remove the configure mkdir test and introduce fio_mkdir to hide mkdir
platform differences
- Make Windows mkdir emulation more robust against multiple slashes
after the drive letter and when dealing dealing with with paths
containing drive letters in general
This commit makes the following work on Windows:
./fio --thread --name=doubleslashtest \
--filename='C\:\\Windows\Temp\fio.tmp' --size=4k --bs=4k --rw=read
The next example now works when D:\1\ exists but D:\1\2\ doesn't:
./fio --thread --name=mkdirtest --directory='D\:\1' \
--filename='2\fio.tmp' --size=4k --bs=4k --rw=read
The following now works on macOS/Linux when /tmp/1/ exists but /tmp/1/2/
doesn't:
./fio --name=mkdirtest --directory='/tmp/1' \
--filename='2/fio.tmp' --size=4k --bs=4k --rw=read
Fixes https://github.com/axboe/fio/issues/784 ,
https://github.com/axboe/fio/issues/864 and
https://github.com/axboe/fio/issues/870
Tested-by: Astolfo Rueda <astolfor@microsoft.com>
Signed-off-by: Sitsofe Wheeler <sitsofe@yahoo.com>
Diffstat (limited to 'os')
-rw-r--r-- | os/os-windows.h | 19 | ||||
-rw-r--r-- | os/os.h | 4 |
2 files changed, 23 insertions, 0 deletions
diff --git a/os/os-windows.h b/os/os-windows.h index 3e9f7341..6061d8c7 100644 --- a/os/os-windows.h +++ b/os/os-windows.h @@ -35,6 +35,7 @@ int rand_r(unsigned *); #define FIO_HAVE_CPU_AFFINITY #define FIO_HAVE_CHARDEV_SIZE #define FIO_HAVE_GETTID +#define FIO_EMULATED_MKDIR_TWO #define FIO_PREFERRED_ENGINE "windowsaio" #define FIO_PREFERRED_CLOCK_SOURCE CS_CGETTIME @@ -197,6 +198,24 @@ static inline int fio_set_sched_idle(void) return (SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_IDLE))? 0 : -1; } +static inline int fio_mkdir(const char *path, mode_t mode) { + DWORD dwAttr = GetFileAttributesA(path); + + if (dwAttr != INVALID_FILE_ATTRIBUTES && + (dwAttr & FILE_ATTRIBUTE_DIRECTORY)) { + errno = EEXIST; + return -1; + } + + if (CreateDirectoryA(path, NULL) == 0) { + log_err("CreateDirectoryA = %d\n", GetLastError()); + errno = win_to_posix_error(GetLastError()); + return -1; + } + + return 0; +} + #ifdef CONFIG_WINDOWS_XP #include "os-windows-xp.h" #else @@ -407,4 +407,8 @@ static inline bool os_cpu_has(cpu_features feature) } #endif +#ifndef FIO_EMULATED_MKDIR_TWO +# define fio_mkdir(path, mode) mkdir(path, mode) #endif + +#endif /* FIO_OS_H */ |