* Copyright (c) 2004-2007 Ulrich Drepper <drepper@redhat.com>
* Copyright (c) 2004 Roland McGrath <roland@redhat.com>
* Copyright (c) 2005-2015 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2015-2017 The strace developers.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
#include "defs.h"
#include <fcntl.h>
-#ifdef HAVE_SYS_EPOLL_H
-# include <sys/epoll.h>
-#endif
+#include <sys/epoll.h>
SYS_FUNC(epoll_create)
{
return RVAL_DECODED | RVAL_FD;
}
-#ifdef HAVE_SYS_EPOLL_H
-# include "xlat/epollevents.h"
+#include "xlat/epollevents.h"
static bool
print_epoll_event(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
return true;
}
-#endif
#include "xlat/epollctls.h"
{
printfd(tcp, tcp->u_arg[0]);
tprints(", ");
- printxval(epollctls, tcp->u_arg[1], "EPOLL_CTL_???");
+ const unsigned int op = tcp->u_arg[1];
+ printxval(epollctls, op, "EPOLL_CTL_???");
tprints(", ");
printfd(tcp, tcp->u_arg[2]);
tprints(", ");
-#ifdef HAVE_SYS_EPOLL_H
struct epoll_event ev;
- if (EPOLL_CTL_DEL == tcp->u_arg[1])
+ if (EPOLL_CTL_DEL == op)
printaddr(tcp->u_arg[3]);
else if (!umove_or_printaddr(tcp, tcp->u_arg[3], &ev))
print_epoll_event(tcp, &ev, sizeof(ev), 0);
-#else
- printaddr(tcp->u_arg[3]);
-#endif
return RVAL_DECODED;
}
printfd(tcp, tcp->u_arg[0]);
tprints(", ");
} else {
-#ifdef HAVE_SYS_EPOLL_H
struct epoll_event ev;
print_array(tcp, tcp->u_arg[1], tcp->u_rval, &ev, sizeof(ev),
umoven_or_printaddr, print_epoll_event, 0);
-#else
- printaddr(tcp->u_arg[1]);
-#endif
tprintf(", %d, %d", (int) tcp->u_arg[2], (int) tcp->u_arg[3]);
}
}
epoll_wait_common(tcp);
if (exiting(tcp)) {
tprints(", ");
- /* NB: kernel requires arg[5] == NSIG / 8 */
+ /* NB: kernel requires arg[5] == NSIG_BYTES */
print_sigset_addr_len(tcp, tcp->u_arg[4], tcp->u_arg[5]);
- tprintf(", %lu", tcp->u_arg[5]);
+ tprintf(", %" PRI_klu, tcp->u_arg[5]);
}
return 0;
}