Recent changes (master)

PATCH Jens Axboe 1 participant 1 message Jan 27, 2017

lore

Share & tools

lore

Jens Axboe

author

2017-01-27 13:00 UTC #0 lore raw

The following changes since commit bd4d9bdc5097c3b35b5172508e1a2828296e01c2:

Remove/Move Linux specific sysfs_root field from thread_data (2017-01-23 08:26:12 -0700)

are available in the git repository at:

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

for you to fetch changes up to f0ac17190989b4ada1d4d74be8d7a4ef3a76dfbb:

Merge branch 'shm_rm' of https://github.com/sitsofe/fio (2017-01-26 10:07:48 -0700)

----------------------------------------------------------------
Jens Axboe (2):
Merge branch 'sphinx-doc' of https://github.com/termim/fio
Merge branch 'shm_rm' of https://github.com/sitsofe/fio

Mikhail Terekhov (1):
fix manpage heading issue

Sitsofe Wheeler (1):
shm: have os remove shared memory if fio dies unexpectedly

 doc/fio_man.rst   | 3 ++-
 init.c            | 3 +++
 os/os-dragonfly.h | 2 ++
 os/os-freebsd.h   | 3 +++
 os/os-linux.h     | 1 +
 os/os-openbsd.h   | 3 +++
 6 files changed, 14 insertions(+), 1 deletion(-)

---

Diff of recent changes:

doc/fio_man.rst +2 -1

index 7eae05e..c6a6438 100644
@@ -1,6 +1,7 @@
 :orphan:
 
-
+Fio Manpage
+===========
 
 (rev. |release|)

init.c +3 -0

index c3cc3e5..34ed20f 100644
@@ -356,6 +356,9 @@ static int setup_thread_area(void)
 		perror("shmat");
 		return 1;
 	}
+#ifdef FIO_HAVE_SHM_ATTACH_REMOVED
+	shmctl(shm_id, IPC_RMID, NULL);
+#endif
 #endif
 
 	memset(threads, 0, max_jobs * sizeof(struct thread_data));

os/os-dragonfly.h +2 -0

index c799817..5e94855 100644
@@ -24,6 +24,8 @@
 #define FIO_HAVE_GETTID
 #define FIO_HAVE_CPU_AFFINITY
 #define FIO_HAVE_IOPRIO
+/* Only have attach-to-open-removed when kern.ipc.shm_allow_removed is 1 */
+#undef  FIO_HAVE_SHM_ATTACH_REMOVED
 
 #define OS_MAP_ANON		MAP_ANON

os/os-freebsd.h +3 -0

index ac408c9..aa90954 100644
@@ -22,6 +22,9 @@
 #define FIO_HAVE_TRIM
 #define FIO_HAVE_GETTID
 #define FIO_HAVE_CPU_AFFINITY
+/* Only have attach-to-open-removed when kern.ipc.shm_allow_removed is 1 */
+#undef  FIO_HAVE_SHM_ATTACH_REMOVED
+
 
 #define OS_MAP_ANON		MAP_ANON

os/os-linux.h +1 -0

index 06235ab..1829829 100644
@@ -41,6 +41,7 @@
 #define FIO_HAVE_GETTID
 #define FIO_USE_GENERIC_INIT_RANDOM_STATE
 #define FIO_HAVE_PWRITEV2
+#define FIO_HAVE_SHM_ATTACH_REMOVED
 
 #ifdef MAP_HUGETLB
 #define FIO_HAVE_MMAP_HUGE

os/os-openbsd.h +3 -0

index 3343cbd..4700572 100644
@@ -25,6 +25,9 @@
 
 #undef	FIO_HAVE_CPU_AFFINITY	/* XXX notyet */
 
+/* Only OpenBSD 5.1 and above have attach-to-open-removed semantics */
+#undef  FIO_HAVE_SHM_ATTACH_REMOVED
+
 #define OS_MAP_ANON		MAP_ANON
 
 #ifndef PTHREAD_STACK_MIN