Introduce mmap_cache.h

Let's avoid bloating defs.h and introduce a separate header for
mmap_cache.

* defs.h (struct mmap_cache_t, enum mmap_cache_protection,
enum mmap_cache_rebuild_result, mmap_cache_enable, mmap_cache_is_enabled,
mmap_cache_invalidate, mmap_cache_delete, mmap_cache_rebuild_if_invalid,
mmap_cache_search): Move ...
* mmap_cache.h: ... to this new file.
* Makefile.am (strace_SOURCES): Add mmap_cache.h.
* mmap_cache.c: Include mmap_cache.h.
* strace.c: Likewise.
* syscall.c: Likewise.
* unwind.c: Likewise.

Makefile.am

@@ -186,6 +186,7 @@ strace_SOURCES =	\
 	memfd_create.c	\
 	mknod.c		\
 	mmap_cache.c	\
+	mmap_cache.h	\
 	mmsghdr.c	\
 	mount.c		\
 	mpers_type.h	\

defs.h

@@ -721,51 +721,6 @@ extern void unwind_print_stacktrace(struct tcb *);
 extern void unwind_capture_stacktrace(struct tcb *);
 #endif
 
-/*
- * Keep a sorted array of cache entries,
- * so that we can binary search through it.
- */
-struct mmap_cache_t {
-	/**
-	 * example entry:
-	 * 7fabbb09b000-7fabbb09f000 r-xp 00179000 fc:00 1180246 /lib/libc-2.11.1.so
-	 *
-	 * start_addr  is 0x7fabbb09b000
-	 * end_addr    is 0x7fabbb09f000
-	 * mmap_offset is 0x179000
-	 * protections is MMAP_CACHE_PROT_READABLE|MMAP_CACHE_PROT_EXECUTABLE
-	 * major       is 0xfc
-	 * minor       is 0x00
-	 * binary_filename is "/lib/libc-2.11.1.so"
-	 */
-	unsigned long start_addr;
-	unsigned long end_addr;
-	unsigned long mmap_offset;
-	unsigned char protections;
-	unsigned long major, minor;
-	char *binary_filename;
-};
-
-enum mmap_cache_protection {
-	MMAP_CACHE_PROT_READABLE   = 1 << 0,
-	MMAP_CACHE_PROT_WRITABLE   = 1 << 1,
-	MMAP_CACHE_PROT_EXECUTABLE = 1 << 2,
-	MMAP_CACHE_PROT_SHARED     = 1 << 3,
-};
-
-enum mmap_cache_rebuild_result {
-	MMAP_CACHE_REBUILD_NOCACHE,
-	MMAP_CACHE_REBUILD_READY,
-	MMAP_CACHE_REBUILD_RENEWED,
-};
-
-extern void mmap_cache_enable(void);
-extern bool mmap_cache_is_enabled(void);
-extern void mmap_cache_invalidate(struct tcb *tcp);
-extern void mmap_cache_delete(struct tcb *tcp, const char *caller);
-extern enum mmap_cache_rebuild_result mmap_cache_rebuild_if_invalid(struct tcb *tcp, const char *caller);
-extern struct mmap_cache_t *mmap_cache_search(struct tcb *tcp, unsigned long ip);
-
 static inline int
 printstrn(struct tcb *tcp, kernel_ulong_t addr, kernel_ulong_t len)
 {

mmap_cache.c

@@ -28,6 +28,7 @@
 #include "defs.h"
 #include <limits.h>
 
+#include "mmap_cache.h"
 #include "xstring.h"
 
 #ifdef _LARGEFILE64_SOURCE

mmap_cache.h

@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2013-2018 The strace developers.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef STRACE_MMAP_CACHE_H
+#define STRACE_MMAP_CACHE_H
+
+/*
+ * Keep a sorted array of cache entries,
+ * so that we can binary search through it.
+ */
+struct mmap_cache_t {
+	/**
+	 * example entry:
+	 * 7fabbb09b000-7fabbb09f000 r-xp 00179000 fc:00 1180246 /lib/libc-2.11.1.so
+	 *
+	 * start_addr  is 0x7fabbb09b000
+	 * end_addr    is 0x7fabbb09f000
+	 * mmap_offset is 0x179000
+	 * protections is MMAP_CACHE_PROT_READABLE|MMAP_CACHE_PROT_EXECUTABLE
+	 * major       is 0xfc
+	 * minor       is 0x00
+	 * binary_filename is "/lib/libc-2.11.1.so"
+	 */
+	unsigned long start_addr;
+	unsigned long end_addr;
+	unsigned long mmap_offset;
+	unsigned char protections;
+	unsigned long major, minor;
+	char *binary_filename;
+};
+
+enum mmap_cache_protection {
+	MMAP_CACHE_PROT_READABLE   = 1 << 0,
+	MMAP_CACHE_PROT_WRITABLE   = 1 << 1,
+	MMAP_CACHE_PROT_EXECUTABLE = 1 << 2,
+	MMAP_CACHE_PROT_SHARED     = 1 << 3,
+};
+
+enum mmap_cache_rebuild_result {
+	MMAP_CACHE_REBUILD_NOCACHE,
+	MMAP_CACHE_REBUILD_READY,
+	MMAP_CACHE_REBUILD_RENEWED,
+};
+
+extern void
+mmap_cache_enable(void);
+
+extern bool
+mmap_cache_is_enabled(void);
+
+extern void
+mmap_cache_invalidate(struct tcb *);
+
+extern void
+mmap_cache_delete(struct tcb *, const char *caller);
+
+extern enum mmap_cache_rebuild_result
+mmap_cache_rebuild_if_invalid(struct tcb *, const char *caller);
+
+extern struct mmap_cache_t *
+mmap_cache_search(struct tcb *, unsigned long ip);
+
+#endif /* !STRACE_MMAP_CACHE_H */

strace.c

@@ -51,6 +51,7 @@
 #include <asm/unistd.h>
 
 #include "largefile_wrappers.h"
+#include "mmap_cache.h"
 #include "number_set.h"
 #include "scno.h"
 #include "printsiginfo.h"

syscall.c

@@ -33,6 +33,7 @@
  */
 
 #include "defs.h"
+#include "mmap_cache.h"
 #include "native_defs.h"
 #include "ptrace.h"
 #include "nsig.h"

unwind.c

@@ -26,6 +26,7 @@
  */
 
 #include "defs.h"
+#include "mmap_cache.h"
 #include <libunwind-ptrace.h>
 
 #ifdef USE_DEMANGLE