mmap_cache: add function to enable mmap_cache

[strace] / open.c

diff --git a/open.c b/open.c
index b712a229c7735d37387cc2356405cf6f7971c7b7..afa5020c7f70f784818ab67caa32544dde2e91c7 100644 (file)
--- a/open.c
+++ b/open.c
@@ -7,6 +7,7 @@
  * Copyright (c) 2006-2007 Ulrich Drepper <drepper@redhat.com>
  * Copyright (c) 2009-2013 Denys Vlasenko <dvlasenk@redhat.com>
  * Copyright (c) 2005-2015 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2014-2018 The strace developers.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33,17 +34,17 @@
  */
 
 #include "defs.h"
+#include "xstring.h"
 
-#include <fcntl.h>
+#include <asm/fcntl.h>
+
+/* some libcs are guilty of messing up with O_ACCMODE */
+#undef O_ACCMODE
+#define O_ACCMODE 03
 
 #ifdef O_LARGEFILE
-# if O_LARGEFILE == 0          /* biarch platforms in 64-bit mode */
+# if O_LARGEFILE == 0          /* biarch platforms in 64-bit mode */
 #  undef O_LARGEFILE
-#  ifdef SPARC64
-#   define O_LARGEFILE 0x40000
-#  elif defined X86_64 || defined S390X
-#   define O_LARGEFILE 0100000
-#  endif
 # endif
 #endif
 
@@ -51,7 +52,7 @@
 #include "xlat/open_mode_flags.h"
 
 #ifndef AT_FDCWD
-# define AT_FDCWD                -100
+# define AT_FDCWD      -100
 #endif
 
 /* The fd is an "int", so when decoding x86 on x86_64, we need to force sign
@@ -105,7 +106,7 @@ sprint_open_modes(unsigned int flags)
        }
        /* flags is still nonzero */
        *p++ = sep;
-       sprintf(p, "%#x", flags);
+       p = xappendstr(outstr, p, "%#x", flags);
        return outstr;
 }
 
@@ -115,6 +116,13 @@ tprint_open_modes(unsigned int flags)
        tprints(sprint_open_modes(flags) + sizeof("flags"));
 }
 
+#ifdef O_TMPFILE
+/* The kernel & C libraries often inline O_DIRECTORY. */
+# define STRACE_O_TMPFILE (O_TMPFILE & ~O_DIRECTORY)
+#else /* !O_TMPFILE */
+# define STRACE_O_TMPFILE 0
+#endif
+
 static int
 decode_open(struct tcb *tcp, int offset)
 {
@@ -122,7 +130,7 @@ decode_open(struct tcb *tcp, int offset)
        tprints(", ");
        /* flags */
        tprint_open_modes(tcp->u_arg[offset + 1]);
-       if (tcp->u_arg[offset + 1] & O_CREAT) {
+       if (tcp->u_arg[offset + 1] & (O_CREAT | STRACE_O_TMPFILE)) {
                /* mode */
                tprints(", ");
                print_numeric_umode_t(tcp->u_arg[offset + 2]);