|
From: <sv...@va...> - 2008-04-27 12:56:04
|
Author: bart
Date: 2008-04-27 13:56:06 +0100 (Sun, 27 Apr 2008)
New Revision: 7942
Log:
Added support for timerfd_create(), timerfd_gettime() and timerfd_settime() system calls.
Modified:
trunk/coregrind/m_syswrap/priv_syswrap-linux.h
trunk/coregrind/m_syswrap/syswrap-amd64-linux.c
trunk/coregrind/m_syswrap/syswrap-linux.c
trunk/coregrind/m_syswrap/syswrap-ppc32-linux.c
trunk/coregrind/m_syswrap/syswrap-ppc64-linux.c
trunk/coregrind/m_syswrap/syswrap-x86-linux.c
trunk/include/vki/vki-scnums-amd64-linux.h
trunk/include/vki/vki-scnums-ppc32-linux.h
trunk/include/vki/vki-scnums-ppc64-linux.h
trunk/include/vki/vki-scnums-x86-linux.h
Modified: trunk/coregrind/m_syswrap/priv_syswrap-linux.h
===================================================================
--- trunk/coregrind/m_syswrap/priv_syswrap-linux.h 2008-04-27 12:52:33 UTC (rev 7941)
+++ trunk/coregrind/m_syswrap/priv_syswrap-linux.h 2008-04-27 12:56:06 UTC (rev 7942)
@@ -126,7 +126,9 @@
DECL_TEMPLATE(linux, sys_timer_gettime);
DECL_TEMPLATE(linux, sys_timer_getoverrun);
DECL_TEMPLATE(linux, sys_timer_delete);
-DECL_TEMPLATE(linux, sys_timerfd);
+DECL_TEMPLATE(linux, sys_timerfd_create);
+DECL_TEMPLATE(linux, sys_timerfd_gettime);
+DECL_TEMPLATE(linux, sys_timerfd_settime);
DECL_TEMPLATE(linux, sys_signalfd);
Modified: trunk/coregrind/m_syswrap/syswrap-amd64-linux.c
===================================================================
--- trunk/coregrind/m_syswrap/syswrap-amd64-linux.c 2008-04-27 12:52:33 UTC (rev 7941)
+++ trunk/coregrind/m_syswrap/syswrap-amd64-linux.c 2008-04-27 12:56:06 UTC (rev 7942)
@@ -1383,9 +1383,11 @@
LINX_(__NR_utimensat, sys_utimensat), // 280
LINXY(__NR_epoll_pwait, sys_epoll_pwait), // 281
LINXY(__NR_signalfd, sys_signalfd), // 282
- LINXY(__NR_timerfd, sys_timerfd), // 283
+ LINXY(__NR_timerfd_create, sys_timerfd_create), // 283
LINX_(__NR_eventfd, sys_eventfd), // 284
// LINX_(__NR_fallocate, sys_ni_syscall), // 285
+ LINXY(__NR_timerfd_settime, sys_timerfd_settime), // 286
+ LINXY(__NR_timerfd_gettime, sys_timerfd_gettime), // 287
};
const UInt ML_(syscall_table_size) =
Modified: trunk/coregrind/m_syswrap/syswrap-linux.c
===================================================================
--- trunk/coregrind/m_syswrap/syswrap-linux.c 2008-04-27 12:52:33 UTC (rev 7941)
+++ trunk/coregrind/m_syswrap/syswrap-linux.c 2008-04-27 12:56:06 UTC (rev 7942)
@@ -1707,27 +1707,125 @@
PRE_REG_READ1(long, "timer_delete", vki_timer_t, timerid);
}
-PRE(sys_timerfd)
+/* ---------------------------------------------------------------------
+ timerfd* wrappers
+ See also http://lwn.net/Articles/260172/ for an overview.
+ See also /usr/src/linux/fs/timerfd.c for the implementation.
+ ------------------------------------------------------------------ */
+
+static int linux_kernel_2_6_22(void)
{
- PRINT("sys_timerfd ( %d, %d, %p )", ARG1, ARG2, ARG3);
- PRE_REG_READ3(long, "sys_timerfd",
- int, fd, int, clockid, const struct itimerspec *, tmr);
- PRE_MEM_READ( "timerfd(tmr)", ARG3,
- sizeof(struct vki_itimerspec) );
- if (ARG1 != -1 && !ML_(fd_allowed)(ARG1, "timerfd", tid, False))
- SET_STATUS_Failure( VKI_EBADF );
+ static int result = -1;
+ Int fd, read;
+ char release[64];
+ SysRes res;
+
+ if (result == -1)
+ {
+ res = VG_(open)("/proc/sys/kernel/osrelease", 0, 0);
+ vg_assert(! res.isError);
+ fd = res.res;
+ read = VG_(read)(fd, release, sizeof(release) - 1);
+ vg_assert(read >= 0);
+ release[read] = 0;
+ VG_(close)(fd);
+ //VG_(printf)("kernel release = %s\n", release);
+ result = (VG_(strncmp)(release, "2.6.22", 6) == 0);
+ }
+ return result;
}
-POST(sys_timerfd)
+
+PRE(sys_timerfd_create)
{
- if (!ML_(fd_allowed)(RES, "timerfd", tid, True)) {
- VG_(close)(RES);
- SET_STATUS_Failure( VKI_EMFILE );
- } else {
- if (VG_(clo_track_fds))
- ML_(record_fd_open_nameless) (tid, RES);
+ if (linux_kernel_2_6_22())
+ {
+ /* 2.6.22 kernel: timerfd system call. */
+ PRINT("sys_timerfd ( %d, %d, %p )", ARG1, ARG2, ARG3);
+ PRE_REG_READ3(long, "sys_timerfd",
+ int, fd, int, clockid, const struct itimerspec *, tmr);
+ PRE_MEM_READ("timerfd(tmr)", ARG3,
+ sizeof(struct vki_itimerspec) );
+ if (ARG1 != -1 && !ML_(fd_allowed)(ARG1, "timerfd", tid, False))
+ SET_STATUS_Failure( VKI_EBADF );
+ }
+ else
+ {
+ /* 2.6.24 and later kernels: timerfd_create system call. */
+ PRINT("sys_timerfd_create (%d, %d )", ARG1, ARG2);
+ PRE_REG_READ2(long, "timerfd_create", int, clockid, int, flags);
+ }
+}
+POST(sys_timerfd_create)
+{
+ if (linux_kernel_2_6_22())
+ {
+ /* 2.6.22 kernel: timerfd system call. */
+ if (!ML_(fd_allowed)(RES, "timerfd", tid, True)) {
+ VG_(close)(RES);
+ SET_STATUS_Failure( VKI_EMFILE );
+ } else {
+ if (VG_(clo_track_fds))
+ ML_(record_fd_open_nameless) (tid, RES);
+ }
}
+ else
+ {
+ /* 2.6.24 and later kernels: timerfd_create system call. */
+ if (!ML_(fd_allowed)(RES, "timerfd_create", tid, True)) {
+ VG_(close)(RES);
+ SET_STATUS_Failure( VKI_EMFILE );
+ } else {
+ if (VG_(clo_track_fds))
+ ML_(record_fd_open_nameless) (tid, RES);
+ }
+ }
}
+PRE(sys_timerfd_gettime)
+{
+ PRINT("sys_timerfd_gettime ( %d, %p )", ARG1, ARG2);
+ PRE_REG_READ2(long, "timerfd_gettime",
+ int, ufd,
+ struct vki_itimerspec*, otmr);
+ if (!ML_(fd_allowed)(ARG1, "timerfd_gettime", tid, False))
+ SET_STATUS_Failure(VKI_EBADF);
+ else
+ PRE_MEM_WRITE("timerfd_gettime(result)",
+ ARG2, sizeof(struct vki_itimerspec));
+}
+POST(sys_timerfd_gettime)
+{
+ if (RES == 0)
+ POST_MEM_WRITE(ARG2, sizeof(struct vki_itimerspec));
+}
+
+PRE(sys_timerfd_settime)
+{
+ PRINT("sys_timerfd_settime ( %d, %d, %p, %p )", ARG1, ARG2, ARG3, ARG4);
+ PRE_REG_READ4(long, "timerfd_settime",
+ int, ufd,
+ int, flags,
+ const struct vki_itimerspec*, utmr,
+ struct vki_itimerspec*, otmr);
+ if (!ML_(fd_allowed)(ARG1, "timerfd_settime", tid, False))
+ SET_STATUS_Failure(VKI_EBADF);
+ else
+ {
+ PRE_MEM_READ("timerfd_settime(result)",
+ ARG3, sizeof(struct vki_itimerspec));
+ if (ARG4)
+ {
+ PRE_MEM_WRITE("timerfd_settime(result)",
+ ARG4, sizeof(struct vki_itimerspec));
+ }
+ }
+}
+POST(sys_timerfd_settime)
+{
+ if (RES == 0 && ARG4 != 0)
+ POST_MEM_WRITE(ARG4, sizeof(struct vki_itimerspec));
+}
+
/* ---------------------------------------------------------------------
capabilities wrappers
------------------------------------------------------------------ */
Modified: trunk/coregrind/m_syswrap/syswrap-ppc32-linux.c
===================================================================
--- trunk/coregrind/m_syswrap/syswrap-ppc32-linux.c 2008-04-27 12:52:33 UTC (rev 7941)
+++ trunk/coregrind/m_syswrap/syswrap-ppc32-linux.c 2008-04-27 12:56:06 UTC (rev 7942)
@@ -1831,6 +1831,9 @@
LINX_(__NR_eventfd, sys_eventfd), // 307
// LINX_(__NR_sync_file_range2, sys_ni_syscall), // 308
// LINX_(__NR_fallocate, sys_ni_syscall), // 309
+// LINXY(__NR_subpage_prot, sys_ni_syscall), // 310
+ LINXY(__NR_timerfd_settime, sys_timerfd_settime), // 311
+ LINXY(__NR_timerfd_gettime, sys_timerfd_gettime), // 312
};
const UInt ML_(syscall_table_size) =
Modified: trunk/coregrind/m_syswrap/syswrap-ppc64-linux.c
===================================================================
--- trunk/coregrind/m_syswrap/syswrap-ppc64-linux.c 2008-04-27 12:52:33 UTC (rev 7941)
+++ trunk/coregrind/m_syswrap/syswrap-ppc64-linux.c 2008-04-27 12:56:06 UTC (rev 7942)
@@ -1487,6 +1487,9 @@
LINX_(__NR_eventfd, sys_eventfd), // 307
// LINX_(__NR_sync_file_range2, sys_ni_syscall), // 308
// LINX_(__NR_fallocate, sys_ni_syscall), // 309
+// LINXY(__NR_subpage_prot, sys_ni_syscall), // 310
+ LINXY(__NR_timerfd_settime, sys_timerfd_settime), // 311
+ LINXY(__NR_timerfd_gettime, sys_timerfd_gettime), // 312
};
const UInt ML_(syscall_table_size) =
Modified: trunk/coregrind/m_syswrap/syswrap-x86-linux.c
===================================================================
--- trunk/coregrind/m_syswrap/syswrap-x86-linux.c 2008-04-27 12:52:33 UTC (rev 7941)
+++ trunk/coregrind/m_syswrap/syswrap-x86-linux.c 2008-04-27 12:56:06 UTC (rev 7942)
@@ -2228,9 +2228,11 @@
LINX_(__NR_utimensat, sys_utimensat), // 320
LINXY(__NR_signalfd, sys_signalfd), // 321
- LINXY(__NR_timerfd, sys_timerfd), // 322
+ LINXY(__NR_timerfd_create, sys_timerfd_create), // 322
LINX_(__NR_eventfd, sys_eventfd), // 323
// LINX_(__NR_fallocate, sys_ni_syscall), // 324
+ LINXY(__NR_timerfd_settime, sys_timerfd_settime), // 325
+ LINXY(__NR_timerfd_gettime, sys_timerfd_gettime), // 326
};
const UInt ML_(syscall_table_size) =
Modified: trunk/include/vki/vki-scnums-amd64-linux.h
===================================================================
--- trunk/include/vki/vki-scnums-amd64-linux.h 2008-04-27 12:52:33 UTC (rev 7941)
+++ trunk/include/vki/vki-scnums-amd64-linux.h 2008-04-27 12:56:06 UTC (rev 7942)
@@ -364,9 +364,11 @@
#define __NR_utimensat 280
#define __NR_epoll_pwait 281
#define __NR_signalfd 282
-#define __NR_timerfd 283
+#define __NR_timerfd_create 283
#define __NR_eventfd 284
#define __NR_fallocate 285
+#define __NR_timerfd_settime 286
+#define __NR_timerfd_gettime 287
#endif /* __VKI_SCNUMS_AMD64_LINUX_H */
Modified: trunk/include/vki/vki-scnums-ppc32-linux.h
===================================================================
--- trunk/include/vki/vki-scnums-ppc32-linux.h 2008-04-27 12:52:33 UTC (rev 7941)
+++ trunk/include/vki/vki-scnums-ppc32-linux.h 2008-04-27 12:56:06 UTC (rev 7942)
@@ -348,13 +348,14 @@
#define __NR_epoll_pwait 303
#define __NR_utimensat 304
#define __NR_signalfd 305
-#define __NR_timerfd 306
+#define __NR_timerfd_create 306
#define __NR_eventfd 307
#define __NR_sync_file_range2 308
#define __NR_fallocate 309
+#define __NR_subpage_prot 310
+#define __NR_timerfd_settime 311
+#define __NR_timerfd_gettime 312
-#define __NR_syscalls 310
-
#endif /* __VKI_SCNUMS_PPC32_LINUX_H */
/*--------------------------------------------------------------------*/
Modified: trunk/include/vki/vki-scnums-ppc64-linux.h
===================================================================
--- trunk/include/vki/vki-scnums-ppc64-linux.h 2008-04-27 12:52:33 UTC (rev 7941)
+++ trunk/include/vki/vki-scnums-ppc64-linux.h 2008-04-27 12:56:06 UTC (rev 7942)
@@ -340,10 +340,13 @@
#define __NR_epoll_pwait 303
#define __NR_utimensat 304
#define __NR_signalfd 305
-#define __NR_timerfd 306
+#define __NR_timerfd_create 306
#define __NR_eventfd 307
#define __NR_sync_file_range2 308
#define __NR_fallocate 309
+#define __NR_subpage_prot 310
+#define __NR_timerfd_settime 311
+#define __NR_timerfd_gettime 312
#endif /* __VKI_SCNUMS_PPC64_LINUX_H */
Modified: trunk/include/vki/vki-scnums-x86-linux.h
===================================================================
--- trunk/include/vki/vki-scnums-x86-linux.h 2008-04-27 12:52:33 UTC (rev 7941)
+++ trunk/include/vki/vki-scnums-x86-linux.h 2008-04-27 12:56:06 UTC (rev 7942)
@@ -356,9 +356,11 @@
#define __NR_epoll_pwait 319
#define __NR_utimensat 320
#define __NR_signalfd 321
-#define __NR_timerfd 322
+#define __NR_timerfd_create 322
#define __NR_eventfd 323
#define __NR_fallocate 324
+#define __NR_timerfd_settime 325
+#define __NR_timerfd_gettime 326
#endif /* __VKI_SCNUMS_X86_LINUX_H */
|