Add SIOCGSTAMPNS support. Fixes #188530.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@9502

diff --git a/coregrind/m_syswrap/syswrap-linux.c b/coregrind/m_syswrap/syswrap-linux.c
index e96739338f014afe5e4ec91148b510cf4f931dfa..df97cd22fed4dfe2839b78e9f39ab5b39c6e6d7b 100644 (file)
--- a/coregrind/m_syswrap/syswrap-linux.c
+++ b/coregrind/m_syswrap/syswrap-linux.c
@@ -3526,6 +3526,9 @@ PRE(sys_ioctl)
    case VKI_SIOCGSTAMP:
       PRE_MEM_WRITE( "ioctl(SIOCGSTAMP)", ARG3, sizeof(struct vki_timeval));
       break;
+   case VKI_SIOCGSTAMPNS:
+      PRE_MEM_WRITE( "ioctl(SIOCGSTAMPNS)", ARG3, sizeof(struct vki_timespec));
+      break;
       /* SIOCOUTQ is an ioctl that, when called on a socket, returns
         the number of bytes currently in that socket's send buffer.
         It writes this value as an int to the memory location
@@ -4569,6 +4572,9 @@ POST(sys_ioctl)
    case VKI_SIOCGSTAMP:
       POST_MEM_WRITE( ARG3, sizeof(struct vki_timeval) );
       break;
+   case VKI_SIOCGSTAMPNS:
+      POST_MEM_WRITE( ARG3, sizeof(struct vki_timespec) );
+      break;
       /* SIOCOUTQ is an ioctl that, when called on a socket, returns
         the number of bytes currently in that socket's send buffer.
         It writes this value as an int to the memory location

diff --git a/include/vki/vki-amd64-linux.h b/include/vki/vki-amd64-linux.h
index d9be99e3ebc531ede3b183f7f7954a2de47236e1..50e7dcbc3ecf63a32bbdb6a644957945596a7aa7 100644 (file)
--- a/include/vki/vki-amd64-linux.h
+++ b/include/vki/vki-amd64-linux.h
@@ -281,9 +281,10 @@ struct vki_sigcontext {
 // From linux-2.6.9/include/asm-x86_64/sockios.h
 //----------------------------------------------------------------------
 
-#define VKI_SIOCSPGRP  0x8902
-#define VKI_SIOCGPGRP  0x8904
-#define VKI_SIOCGSTAMP 0x8906          /* Get stamp */
+#define VKI_SIOCSPGRP          0x8902
+#define VKI_SIOCGPGRP          0x8904
+#define VKI_SIOCGSTAMP         0x8906          /* Get stamp (timeval) */
+#define VKI_SIOCGSTAMPNS       0x8907          /* Get stamp (timespec) */
 
 //----------------------------------------------------------------------
 // From linux-2.6.9/include/asm-x86_64/stat.h

diff --git a/include/vki/vki-ppc32-linux.h b/include/vki/vki-ppc32-linux.h
index af5fc7294c881272920341acc1d387a2d6a48baf..074a8f84ec8d9d7a5cb84b220c93bb4ceac867b7 100644 (file)
--- a/include/vki/vki-ppc32-linux.h
+++ b/include/vki/vki-ppc32-linux.h
@@ -342,9 +342,10 @@ struct vki_sigcontext {
 #define VKI_SOL_SOCKET 1
 #define VKI_SO_TYPE    3
 
-#define VKI_SIOCSPGRP  0x8902
-#define VKI_SIOCGPGRP  0x8904
-#define VKI_SIOCGSTAMP 0x8906          /* Get stamp */
+#define VKI_SIOCSPGRP          0x8902
+#define VKI_SIOCGPGRP          0x8904
+#define VKI_SIOCGSTAMP         0x8906          /* Get stamp (timeval) */
+#define VKI_SIOCGSTAMPNS       0x8907          /* Get stamp (timespec) */
 
 //----------------------------------------------------------------------
 // From linux-2.6.10/include/asm-ppc/stat.h

diff --git a/include/vki/vki-ppc64-linux.h b/include/vki/vki-ppc64-linux.h
index c2a8d5847c8377a646a6669db0f386774c7f2aa0..063fc55a47878e4bdd7958f8e01523bd732b557f 100644 (file)
--- a/include/vki/vki-ppc64-linux.h
+++ b/include/vki/vki-ppc64-linux.h
@@ -404,7 +404,8 @@ struct vki_sigcontext {
 
 #define VKI_SIOCSPGRP       0x8902
 #define VKI_SIOCGPGRP       0x8904
-#define VKI_SIOCGSTAMP      0x8906          /* Get stamp */
+#define VKI_SIOCGSTAMP      0x8906          /* Get stamp (timeval) */
+#define VKI_SIOCGSTAMPNS    0x8907          /* Get stamp (timespec) */
 
 //----------------------------------------------------------------------
 // From linux-2.6.13/include/asm-ppc64/stat.h

diff --git a/include/vki/vki-x86-linux.h b/include/vki/vki-x86-linux.h
index 68e80f53c65b858ba6b5f9b66e3cead6000471ad..13a4e4e9682de86040ab6283cbfa28e6fb9bb4c9 100644 (file)
--- a/include/vki/vki-x86-linux.h
+++ b/include/vki/vki-x86-linux.h
@@ -318,9 +318,10 @@ struct vki_sigcontext {
 // From linux-2.6.8.1/include/asm-i386/sockios.h
 //----------------------------------------------------------------------
 
-#define VKI_SIOCSPGRP  0x8902
-#define VKI_SIOCGPGRP  0x8904
-#define VKI_SIOCGSTAMP 0x8906          /* Get stamp */
+#define VKI_SIOCSPGRP          0x8902
+#define VKI_SIOCGPGRP          0x8904
+#define VKI_SIOCGSTAMP         0x8906          /* Get stamp (timeval) */
+#define VKI_SIOCGSTAMPNS       0x8907          /* Get stamp (timespec) */
 
 //----------------------------------------------------------------------
 // From linux-2.6.8.1/include/asm-i386/stat.h