2007-07-23 Ulrich Drepper <drepper@redhat.com>

* desc.c (sys_epoll_wait): Move body of function to ...
	(epoll_wait_common): ...here.  New function.
	(sys_epoll_pwait): New function.
	* linux/syscall.h: Declare sys_epoll_pwait.
	* linux/syscallent.h: Add entry for epoll_pwait.
	* linux/x86_64/syscallent.h: Likewise.
This commit is contained in:
Roland McGrath 2007-08-02 01:13:26 +00:00
parent b2c4f507ac
commit f240005701
4 changed files with 22 additions and 4 deletions

21
desc.c
View File

@ -669,8 +669,8 @@ struct tcb *tcp;
return 0;
}
int
sys_epoll_wait(tcp)
static void
epoll_wait_common(tcp)
struct tcb *tcp;
{
if (entering(tcp))
@ -708,6 +708,23 @@ struct tcb *tcp;
}
tprintf(", %ld, %ld", tcp->u_arg[2], tcp->u_arg[3]);
}
}
int
sys_epoll_wait(tcp)
struct tcb *tcp;
{
epoll_wait_common(tcp);
return 0;
}
int
sys_epoll_pwait(tcp)
struct tcb *tcp;
{
epoll_wait_common(tcp);
if (exiting(tcp))
print_sigset(tcp, tcp->u_arg[4], 0);
return 0;
}

View File

@ -102,7 +102,7 @@ int sys_waitid(), sys_fadvise64(), sys_fadvise64_64();
int sys_mbind(), sys_get_mempolicy(), sys_set_mempolicy(), sys_move_pages();
int sys_arch_prctl();
int sys_io_setup(), sys_io_submit(), sys_io_cancel(), sys_io_getevents(), sys_io_destroy();
int sys_utimensat();
int sys_utimensat(), sys_epoll_pwait();
/* sys_socketcall subcalls */

View File

@ -349,7 +349,7 @@
{ 4, TD, printargs, "vmsplice" }, /* 316 */
{ 6, 0, sys_move_pages, "move_pages" }, /* 317 */
{ 5, 0, printargs, "SYS_318" }, /* 318 */
{ 5, 0, printargs, "SYS_319" }, /* 319 */
{ 5, TD, sys_epoll_pwait, "epoll_pwait" }, /* 319 */
{ 4, TD|TF, sys_utimensat, "utimensat" }, /* 320 */
{ 5, 0, printargs, "SYS_321" }, /* 321 */
{ 5, 0, printargs, "SYS_322" }, /* 322 */

View File

@ -279,3 +279,4 @@
{ 4, TD, printargs, "vmsplice" }, /* 278 */
{ 6, 0, sys_move_pages, "move_pages" }, /* 279 */
{ 4, TD|TF, sys_utimensat, "utimensat" }, /* 280 */
{ 5, TD, sys_epoll_pwait, "epoll_pwait" }, /* 281 */