Chromium Code Reviews| Index: sysdeps/nacl/sysdep.h |
| diff --git a/sysdeps/nacl/sysdep.h b/sysdeps/nacl/sysdep.h |
| index 7cb9d106219c79ce190e687db6e8f6ed0fe21d9a..49b32ca3544a1967ef2cfbb7e43fbec362893342 100644 |
| --- a/sysdeps/nacl/sysdep.h |
| +++ b/sysdeps/nacl/sysdep.h |
| @@ -240,14 +240,15 @@ INTERNAL_SYSCALL_dup3_3 (int *err, int oldfd, int newfd, int flags) |
| __extern_always_inline int |
| INTERNAL_SYSCALL_epoll_create_1 (int *err, int flags) |
| { |
| - *err = (38 /* ENOSYS */); |
| + // here flags is size |
| + *err = __nacl_irt_epoll_create (flags); |
| return 0; |
| } |
| __extern_always_inline int |
| INTERNAL_SYSCALL_epoll_create1_1 (int *err, int flags) |
| { |
| - *err = (38 /* ENOSYS */); |
| + *err = __nacl_irt_epoll_create1 (flags); |
| return 0; |
| } |
| @@ -255,7 +256,7 @@ __extern_always_inline int |
| INTERNAL_SYSCALL_epoll_ctl_4 (int *err, int epfd, int op, int fd, |
| struct epoll_event *event) |
| { |
| - *err = (38 /* ENOSYS */); |
| + *err = __nacl_irt_epoll_ctl (epfd, op, fd, event); |
| return 0; |
| } |
| @@ -264,7 +265,7 @@ INTERNAL_SYSCALL_epoll_pwait_6 (int *err, int epfd, struct epoll_event *events, |
| int maxevents, int timeout, |
| const sigset_t *sigmask, size_t sigsetsize) |
| { |
| - *err = (38 /* ENOSYS */); |
| + *err = __nacl_irt_epoll_pwait (epfd, events, maxevents, timeout, sigmask, sigsetsize); |
|
Evgeniy Stepanov
2012/04/09 11:45:13
80 chars
|
| return 0; |
| } |
| @@ -281,6 +282,7 @@ INTERNAL_SYSCALL_epoll_wait_4 (int *err, int epfd, struct epoll_event *events, |
| int maxevents, int timeout) |
| { |
| *err = (38 /* ENOSYS */); |
| + *err = __nacl_irt_epoll_wait (epfd, events, maxevents, timeout); |
| return 0; |
| } |
| @@ -1164,7 +1166,7 @@ INTERNAL_SYSCALL_pivot_root_2 (int *err, const char *new_root, |
| __extern_always_inline int |
| INTERNAL_SYSCALL_poll_3 (int *err, struct pollfd *fds, nfds_t nfds, int timeout) |
| { |
| - *err = (38 /* ENOSYS */); |
| + *err = __nacl_irt_poll (fds, nfds, timeout); |
| return 0; |
| } |
| @@ -1173,7 +1175,7 @@ INTERNAL_SYSCALL_ppoll_5 (int *err, struct pollfd *fds, nfds_t nfds, |
| const struct timespec *timeout, |
| const sigset_t *sigmask, size_t sigsetsize) |
| { |
| - *err = (38 /* ENOSYS */); |
| + *err = __nacl_irt_ppoll (fds, nfds, timeout, sigmask, sigsetsize); |
| return 0; |
| } |
| @@ -1189,10 +1191,10 @@ INTERNAL_SYSCALL_prctl_5 (int *err, int option, unsigned long arg2, |
| __extern_always_inline int |
| INTERNAL_SYSCALL_pselect6_6 (int *err, int nfds, fd_set *readfds, |
| fd_set *writefds, fd_set *exceptfds, |
| - const struct timespec *timeout, |
| - void *sigmask) |
| + const struct timeval *timeout, |
| + void *sigmask) // const sigset_t *sigmask? |
|
Evgeniy Stepanov
2012/04/09 11:45:13
There were tabs in the original file?? Please repl
khim
2012/04/09 12:21:12
Hold your horses! This is GLibC, not NaCl.
native
|
| { |
| - *err = (38 /* ENOSYS */); |
| + *err = __nacl_irt_pselect (nfds, readfds, writefds, exceptfds, timeout, sigmask); |
|
Evgeniy Stepanov
2012/04/09 11:45:13
80 chars here and below
|
| return 0; |
| } |
| @@ -1428,7 +1430,7 @@ INTERNAL_SYSCALL_select_5 (int *err, int nfds, fd_set *readfds, |
| fd_set *writefds, fd_set *exceptfds, |
| const struct timeval *timeout) |
| { |
| - *err = (38 /* ENOSYS */); |
| + *err = __nacl_irt_select (nfds, readfds, writefds, exceptfds, timeout); |
| return 0; |
| } |
| @@ -1650,7 +1652,65 @@ INTERNAL_SYSCALL_signalfd_3 (int *err, int fd, const sigset_t *mask, |
| __extern_always_inline int |
| INTERNAL_SYSCALL_socket_3 (int *err, int domain, int type, int protocol) |
| { |
| - *err = (38 /* ENOSYS */); |
| + *err = __nacl_irt_socket (domain, type, protocol); |
| + return 0; |
| +} |
| + |
| +__extern_always_inline int |
| +INTERNAL_SYSCALL_accept_3 (int *err, int sockfd, struct sockaddr* addr, socklen_t* addr_len) |
| +{ |
| + *err = __nacl_irt_accept (sockfd, addr, addr_len); |
| + return 0; |
| +} |
| + |
| +__extern_always_inline int |
| +INTERNAL_SYSCALL_bind_3 (int *err, int sockfd, struct sockaddr* addr, socklen_t addr_len) |
| +{ |
| + *err = __nacl_irt_bind (sockfd, addr, addr_len); |
| + return 0; |
| +} |
| + |
| +__extern_always_inline int |
| +INTERNAL_SYSCALL_listen_2 (int *err, int sockfd, int backlog) |
| +{ |
| + *err = __nacl_irt_listen (sockfd, backlog); |
| + return 0; |
| +} |
| + |
| +__extern_always_inline int |
| +INTERNAL_SYSCALL_connect_3 (int *err, int sockfd, struct sockaddr* addr, socklen_t* addr_len) |
| +{ |
| + *err = __nacl_irt_connect (sockfd, addr, addr_len); |
| + return 0; |
| +} |
| + |
| +__extern_always_inline int |
| +INTERNAL_SYSCALL_send_4 (int *err, int sockfd, const void *buf, size_t len, int flags) |
| +{ |
| + *err = __nacl_irt_send (sockfd, buf, len, flags); |
| + return 0; |
| +} |
| + |
| +__extern_always_inline int |
| +INTERNAL_SYSCALL_sendto_6 (int *err, int sockfd, const void *buf, size_t len, int flags, |
| + const struct sockaddr *dest_addr, socklen_t addrlen) |
| +{ |
| + *err = __nacl_irt_sendto (sockfd, buf, len, flags, dest_addr, addrlen); |
| + return 0; |
| +} |
| + |
| +__extern_always_inline int |
| +INTERNAL_SYSCALL_recv_4 (int *err, int sockfd, void *buf, size_t len, int flags) |
| +{ |
| + *err = __nacl_irt_recv (sockfd, buf, len, flags); |
| + return 0; |
| +} |
| + |
| +__extern_always_inline int |
| +INTERNAL_SYSCALL_recvfrom_6 (int *err, int sockfd, void *buf, size_t len, int flags, |
| + struct sockaddr *dest_addr, socklen_t addrlen) |
| +{ |
| + *err = __nacl_irt_recvfrom (sockfd, buf, len, flags, dest_addr, addrlen); |
| return 0; |
| } |