# include <linux/perf_event.h>
#endif
-static const struct xlat fcntlcmds[] = {
- XLAT(F_DUPFD),
- XLAT(F_GETFD),
- XLAT(F_SETFD),
- XLAT(F_GETFL),
- XLAT(F_SETFL),
- XLAT(F_GETLK),
- XLAT(F_SETLK),
- XLAT(F_SETLKW),
- XLAT(F_GETOWN),
- XLAT(F_SETOWN),
-#ifdef F_RSETLK
- XLAT(F_RSETLK),
-#endif
-#ifdef F_RSETLKW
- XLAT(F_RSETLKW),
-#endif
-#ifdef F_RGETLK
- XLAT(F_RGETLK),
-#endif
-#ifdef F_CNVT
- XLAT(F_CNVT),
-#endif
-#ifdef F_SETSIG
- XLAT(F_SETSIG),
-#endif
-#ifdef F_GETSIG
- XLAT(F_GETSIG),
-#endif
-#ifdef F_CHKFL
- XLAT(F_CHKFL),
-#endif
-#ifdef F_DUP2FD
- XLAT(F_DUP2FD),
-#endif
-#ifdef F_ALLOCSP
- XLAT(F_ALLOCSP),
-#endif
-#ifdef F_ISSTREAM
- XLAT(F_ISSTREAM),
-#endif
-#ifdef F_PRIV
- XLAT(F_PRIV),
-#endif
-#ifdef F_NPRIV
- XLAT(F_NPRIV),
-#endif
-#ifdef F_QUOTACL
- XLAT(F_QUOTACL),
-#endif
-#ifdef F_BLOCKS
- XLAT(F_BLOCKS),
-#endif
-#ifdef F_BLKSIZE
- XLAT(F_BLKSIZE),
-#endif
-#ifdef F_GETOWN
- XLAT(F_GETOWN),
-#endif
-#ifdef F_SETOWN
- XLAT(F_SETOWN),
-#endif
-#ifdef F_REVOKE
- XLAT(F_REVOKE),
-#endif
-#ifdef F_SETLK
- XLAT(F_SETLK),
-#endif
-#ifdef F_SETLKW
- XLAT(F_SETLKW),
-#endif
-#ifdef F_FREESP
- XLAT(F_FREESP),
-#endif
-#ifdef F_GETLK
- XLAT(F_GETLK),
-#endif
-#ifdef F_SETLK64
- XLAT(F_SETLK64),
-#endif
-#ifdef F_SETLKW64
- XLAT(F_SETLKW64),
-#endif
-#ifdef F_FREESP64
- XLAT(F_FREESP64),
-#endif
-#ifdef F_GETLK64
- XLAT(F_GETLK64),
-#endif
-#ifdef F_SHARE
- XLAT(F_SHARE),
-#endif
-#ifdef F_UNSHARE
- XLAT(F_UNSHARE),
-#endif
-#ifdef F_SETLEASE
- XLAT(F_SETLEASE),
-#endif
-#ifdef F_GETLEASE
- XLAT(F_GETLEASE),
-#endif
-#ifdef F_NOTIFY
- XLAT(F_NOTIFY),
-#endif
-#ifdef F_DUPFD_CLOEXEC
- XLAT(F_DUPFD_CLOEXEC),
-#endif
- { 0, NULL },
-};
-
-static const struct xlat fdflags[] = {
-#ifdef FD_CLOEXEC
- XLAT(FD_CLOEXEC),
-#endif
- { 0, NULL },
-};
-
-#ifdef LOCK_SH
-
-static const struct xlat flockcmds[] = {
- XLAT(LOCK_SH),
- XLAT(LOCK_EX),
- XLAT(LOCK_NB),
- XLAT(LOCK_UN),
- { 0, NULL },
-};
-
-#endif /* LOCK_SH */
-
-static const struct xlat lockfcmds[] = {
- XLAT(F_RDLCK),
- XLAT(F_WRLCK),
- XLAT(F_UNLCK),
-#ifdef F_EXLCK
- XLAT(F_EXLCK),
-#endif
-#ifdef F_SHLCK
- XLAT(F_SHLCK),
-#endif
- { 0, NULL },
-};
-
-#ifdef F_NOTIFY
-static const struct xlat notifyflags[] = {
-#ifdef DN_ACCESS
- XLAT(DN_ACCESS),
-#endif
-#ifdef DN_MODIFY
- XLAT(DN_MODIFY),
-#endif
-#ifdef DN_CREATE
- XLAT(DN_CREATE),
-#endif
-#ifdef DN_DELETE
- XLAT(DN_DELETE),
-#endif
-#ifdef DN_RENAME
- XLAT(DN_RENAME),
-#endif
-#ifdef DN_ATTRIB
- XLAT(DN_ATTRIB),
-#endif
-#ifdef DN_MULTISHOT
- XLAT(DN_MULTISHOT),
-#endif
- { 0, NULL },
-};
-#endif
-
-static const struct xlat perf_event_open_flags[] = {
-#ifdef PERF_FLAG_FD_NO_GROUP
- XLAT(PERF_FLAG_FD_NO_GROUP),
-#endif
-#ifdef PERF_FLAG_FD_OUTPUT
- XLAT(PERF_FLAG_FD_OUTPUT),
-#endif
-#ifdef PERF_FLAG_PID_CGROUP
- XLAT(PERF_FLAG_PID_CGROUP),
-#endif
- { 0, NULL },
-};
+#include "xlat/fcntlcmds.h"
+#include "xlat/fdflags.h"
+#include "xlat/flockcmds.h"
+#include "xlat/lockfcmds.h"
+#include "xlat/notifyflags.h"
+#include "xlat/perf_event_open_flags.h"
+/*
+ * Assume that F_SETLK64, F_SETLKW64, and F_GETLK64 are either defined
+ * or not defined altogether.
+ */
#if defined(F_SETLK64) && F_SETLK64 + 0 != F_SETLK
-# define HAVE_F_SETLK64 1
-#else
-# define HAVE_F_SETLK64 0
-#endif
-
-#if defined(F_SETLKW64) && F_SETLKW64 + 0 != F_SETLKW
-# define HAVE_F_SETLKW64 1
-#else
-# define HAVE_F_SETLKW64 0
-#endif
-
-#if defined(F_GETLK64) && F_GETLK64+0 != F_GETLK
-# define HAVE_F_GETLK64 1
+# define USE_PRINTFLOCK64 1
#else
-# define HAVE_F_GETLK64 0
+# define USE_PRINTFLOCK64 0
#endif
-#if defined(X32) || defined(F_FREESP64) || \
- HAVE_F_SETLK64 || HAVE_F_SETLKW64 || HAVE_F_GETLK64
+#if USE_PRINTFLOCK64
-#ifndef HAVE_STRUCT_FLOCK64
+# ifndef HAVE_STRUCT_FLOCK64
struct flock64 {
short int l_type, l_whence;
int64_t l_start, l_len;
int l_pid;
};
-#endif
+# endif
-/* fcntl/lockf */
static void
printflock64(struct tcb *tcp, long addr, int getlk)
{
else
tprints("}");
}
-#endif
+#endif /* USE_PRINTFLOCK64 */
-/* fcntl/lockf */
static void
printflock(struct tcb *tcp, long addr, int getlk)
{
struct flock fl;
+ int r;
#if SUPPORTED_PERSONALITIES > 1
-# ifdef X32
- if (current_personality == 0) {
- printflock64(tcp, addr, getlk);
- return;
- }
-# endif
- if (current_wordsize != sizeof(fl.l_start)) {
+ if (
+# if SIZEOF_OFF_T > SIZEOF_LONG
+ current_personality > 0 &&
+#endif
+ current_wordsize != sizeof(fl.l_start)) {
if (current_wordsize == 4) {
/* 32-bit x86 app on x86_64 and similar cases */
struct {
int32_t l_len; /* off_t */
int32_t l_pid; /* pid_t */
} fl32;
- if (umove(tcp, addr, &fl32) < 0) {
- tprints("{...}");
- return;
+ r = umove(tcp, addr, &fl32);
+ if (r >= 0) {
+ fl.l_type = fl32.l_type;
+ fl.l_whence = fl32.l_whence;
+ fl.l_start = fl32.l_start;
+ fl.l_len = fl32.l_len;
+ fl.l_pid = fl32.l_pid;
}
- fl.l_type = fl32.l_type;
- fl.l_whence = fl32.l_whence;
- fl.l_start = fl32.l_start;
- fl.l_len = fl32.l_len;
- fl.l_pid = fl32.l_pid;
} else {
/* let people know we have a problem here */
tprintf("<decode error: unsupported wordsize %d>",
} else
#endif
{
- if (umove(tcp, addr, &fl) < 0) {
- tprints("{...}");
- return;
- }
+ r = umove(tcp, addr, &fl);
+ }
+ if (r < 0) {
+ tprints("{...}");
+ return;
}
tprints("{type=");
printxval(lockfcmds, fl.l_type, "F_???");
tprints(", whence=");
printxval(whence_codes, fl.l_whence, "SEEK_???");
-#ifdef X32
+#if SIZEOF_OFF_T > SIZEOF_LONG
tprintf(", start=%lld, len=%lld", fl.l_start, fl.l_len);
#else
tprintf(", start=%ld, len=%ld", fl.l_start, fl.l_len);
tprint_open_modes(tcp->u_arg[2]);
break;
case F_SETLK: case F_SETLKW:
-#ifdef F_FREESP
- case F_FREESP:
-#endif
tprints(", ");
printflock(tcp, tcp->u_arg[2], 0);
break;
-#if defined(F_FREESP64) || HAVE_F_SETLK64 || HAVE_F_SETLKW64
-#ifdef F_FREESP64
- case F_FREESP64:
-#endif
- /* Linux glibc defines SETLK64 as SETLK,
- even though the kernel has different values - as does Solaris. */
-#if HAVE_F_SETLK64
- case F_SETLK64:
-#endif
-#if HAVE_F_SETLKW64
- case F_SETLKW64:
-#endif
+#if USE_PRINTFLOCK64
+ case F_SETLK64: case F_SETLKW64:
tprints(", ");
printflock64(tcp, tcp->u_arg[2], 0);
break;
-#endif /* defined(F_FREESP64) || HAVE_F_SETLK64 || HAVE_F_SETLKW64 */
+#endif /* USE_PRINTFLOCK64 */
#ifdef F_NOTIFY
case F_NOTIFY:
tprints(", ");
tprints(", ");
printflock(tcp, tcp->u_arg[2], 1);
break;
-#if HAVE_F_GETLK64
+#if USE_PRINTFLOCK64
case F_GETLK64:
tprints(", ");
printflock64(tcp, tcp->u_arg[2], 1);
return 0;
}
+int
+sys_dup(struct tcb *tcp)
+{
+ if (entering(tcp)) {
+ printfd(tcp, tcp->u_arg[0]);
+ }
+ return RVAL_FD;
+}
+
static int
do_dup2(struct tcb *tcp, int flags_arg)
{
printflags(open_mode_flags, tcp->u_arg[flags_arg], "O_???");
}
}
- return 0;
+ return RVAL_FD;
}
int
{
int i, j;
int nfds, fdsize;
- fd_set *fds;
+ fd_set *fds = NULL;
const char *sep;
long arg;
nfds = (int) args[0];
/* Kernel rejects negative nfds, so we don't parse it either. */
- if (nfds < 0) {
+ if (nfds < 0)
nfds = 0;
- fds = NULL;
- }
+
/* Beware of select(2^31-1, NULL, NULL, NULL) and similar... */
if (nfds > 1024*1024)
nfds = 1024*1024;
}
#endif
-static const struct xlat epollctls[] = {
-#ifdef EPOLL_CTL_ADD
- XLAT(EPOLL_CTL_ADD),
-#endif
-#ifdef EPOLL_CTL_MOD
- XLAT(EPOLL_CTL_MOD),
-#endif
-#ifdef EPOLL_CTL_DEL
- XLAT(EPOLL_CTL_DEL),
-#endif
- { 0, NULL }
-};
-
-static const struct xlat epollevents[] = {
-#ifdef EPOLLIN
- XLAT(EPOLLIN),
-#endif
-#ifdef EPOLLPRI
- XLAT(EPOLLPRI),
-#endif
-#ifdef EPOLLOUT
- XLAT(EPOLLOUT),
-#endif
-#ifdef EPOLLRDNORM
- XLAT(EPOLLRDNORM),
-#endif
-#ifdef EPOLLRDBAND
- XLAT(EPOLLRDBAND),
-#endif
-#ifdef EPOLLWRNORM
- XLAT(EPOLLWRNORM),
-#endif
-#ifdef EPOLLWRBAND
- XLAT(EPOLLWRBAND),
-#endif
-#ifdef EPOLLMSG
- XLAT(EPOLLMSG),
-#endif
-#ifdef EPOLLERR
- XLAT(EPOLLERR),
-#endif
-#ifdef EPOLLHUP
- XLAT(EPOLLHUP),
-#endif
-#ifdef EPOLLRDHUP
- XLAT(EPOLLRDHUP),
-#endif
-#ifdef EPOLLONESHOT
- XLAT(EPOLLONESHOT),
-#endif
-#ifdef EPOLLET
- XLAT(EPOLLET),
-#endif
- { 0, NULL }
-};
+#include "xlat/epollctls.h"
+#include "xlat/epollevents.h"
+#include "xlat/epollflags.h"
/* Not aliased to printargs_ld: we want it to have a distinct address */
int
return printargs_ld(tcp);
}
-static const struct xlat epollflags[] = {
-#ifdef EPOLL_CLOEXEC
- XLAT(EPOLL_CLOEXEC),
-#endif
-#ifdef EPOLL_NONBLOCK
- XLAT(EPOLL_NONBLOCK),
-#endif
- { 0, NULL }
-};
-
int
sys_epoll_create1(struct tcb *tcp)
{
else {
#ifdef HAVE_SYS_EPOLL_H
struct epoll_event ev;
- if (umove(tcp, tcp->u_arg[3], &ev) == 0)
+ if (
+#ifdef EPOLL_CTL_DEL
+ (tcp->u_arg[1] != EPOLL_CTL_DEL) &&
+#endif
+ umove(tcp, tcp->u_arg[3], &ev) == 0)
print_epoll_event(&ev);
else
#endif
- tprints("{...}");
+ tprintf("%lx", tcp->u_arg[3]);
}
}
return 0;
projects / strace / blobdiff