[NaCl SDK] nacl_io: Make IRT intercepts (and their test code) more robust.

native_client_sdk/src/libraries/nacl_io/kernel_wrap_glibc.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <sys/types.h>  // Include something that will define __GLIBC__.
 
 // The entire file is wrapped in this #if. We do this so this .cc file can be
 // compiled, even on a non-glibc build.
 #if defined(__native_client__) && defined(__GLIBC__)
 
 #include "nacl_io/kernel_wrap.h"
 
 #include <alloca.h>
 #include <assert.h>
 #include <dirent.h>
 #include <errno.h>
 #include <irt.h>
 #include <irt_syscalls.h>
 #include <nacl_stat.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 
 #include "nacl_io/kernel_intercept.h"
 #include "nacl_io/kernel_wrap_real.h"
+#include "nacl_io/log.h"
 #include "nacl_io/osmman.h"
 
 
 namespace {
 
 void stat_to_nacl_stat(const struct stat* buf, nacl_abi_stat* nacl_buf) {
   memset(nacl_buf, 0, sizeof(struct nacl_abi_stat));
   nacl_buf->nacl_abi_st_dev = buf->st_dev;
   nacl_buf->nacl_abi_st_ino = buf->st_ino;
   nacl_buf->nacl_abi_st_mode = buf->st_mode;
@@ skipping 79 matching lines @@
   REAL(name) = __nacl_irt_##name;
 
 // Switch IRT's pointer to the REAL pointer
 #define USE_REAL(name) \
   __nacl_irt_##name = (typeof(__nacl_irt_##name)) REAL(name)
 
 // Switch IRT's pointer to the WRAP function
 #define USE_WRAP(name) \
   __nacl_irt_##name = (typeof(__nacl_irt_##name)) WRAP(name)
 
-
 #define EXPAND_SYMBOL_LIST_OPERATION(OP) \
   OP(chdir); \
   OP(close); \
   OP(dup); \
   OP(dup2); \
   OP(exit); \
   OP(fstat); \
   OP(getcwd); \
   OP(getdents); \
   OP(mkdir); \
@@ skipping 32 matching lines @@
 // OP(epoll_create1);
 // OP(epoll_ctl);
 // OP(epoll_pwait);
 // OP(ppoll);
 // OP(pselect);
 //
 
 EXPAND_SYMBOL_LIST_OPERATION(DECLARE_REAL_PTR);
 
 int WRAP(chdir)(const char* pathname) {
-  return (ki_chdir(pathname)) ? errno : 0;
+  RTN_ERRNO_IF(ki_chdir(pathname) < 0);
+  return 0;
 }
 
 int WRAP(close)(int fd) {
-  return (ki_close(fd) < 0) ? errno : 0;
+  RTN_ERRNO_IF(ki_close(fd) < 0);
+  return 0;
 }
 
 int WRAP(dup)(int fd, int* newfd) NOTHROW {
   *newfd = ki_dup(fd);
-  return (*newfd < 0) ? errno : 0;
+  RTN_ERRNO_IF(*newfd < 0);
+  return 0;
 }
 
 int WRAP(dup2)(int fd, int newfd) NOTHROW {
-  return (ki_dup2(fd, newfd) < 0) ? errno : 0;
+  RTN_ERRNO_IF(ki_dup2(fd, newfd) < 0);
+  return 0;
 }
 
 void WRAP(exit)(int status) {
   ki_exit(status);
 }
 
 int WRAP(fstat)(int fd, struct nacl_abi_stat *nacl_buf) {
   struct stat buf;
   memset(&buf, 0, sizeof(struct stat));
   int res = ki_fstat(fd, &buf);
-  if (res < 0)
-    return errno;
+  RTN_ERRNO_IF(res < 0);
   stat_to_nacl_stat(&buf, nacl_buf);
   return 0;
 }
 
 int WRAP(getcwd)(char* buf, size_t size) {
-  if (ki_getcwd(buf, size) == NULL)
-    return errno;
+  RTN_ERRNO_IF(ki_getcwd(buf, size) == NULL);
   return 0;
 }
 
 int WRAP(getdents)(int fd, dirent* nacl_buf, size_t nacl_count, size_t *nread) {
   int nacl_offset = 0;
   // "buf" contains dirent(s); "nacl_buf" contains nacl_abi_dirent(s).
   // nacl_abi_dirent(s) are smaller than dirent(s), so nacl_count bytes buffer
   // is enough
   char* buf = (char*)alloca(nacl_count);
   int offset = 0;
   int count;
 
   count = ki_getdents(fd, buf, nacl_count);
-  if (count < 0)
-    return errno;
+  RTN_ERRNO_IF(count < 0);
 
   while (offset < count) {
     dirent* d = (dirent*)(buf + offset);
     nacl_abi_dirent* nacl_d = (nacl_abi_dirent*)((char*)nacl_buf + nacl_offset);
     nacl_d->nacl_abi_d_ino = d->d_ino;
     nacl_d->nacl_abi_d_off = d->d_off;
     nacl_d->nacl_abi_d_reclen = d->d_reclen - d_name_shift;
     size_t d_name_len = d->d_reclen - offsetof(dirent, d_name);
     memcpy(nacl_d->nacl_abi_d_name, d->d_name, d_name_len);
 
     offset += d->d_reclen;
     nacl_offset += nacl_d->nacl_abi_d_reclen;
   }
 
   *nread = nacl_offset;
   return 0;
 }
 
 int WRAP(mkdir)(const char* pathname, mode_t mode) {
-  return (ki_mkdir(pathname, mode)) ? errno : 0;
+  RTN_ERRNO_IF(ki_mkdir(pathname, mode) < 0);
+  return 0;
 }
 
 int WRAP(mmap)(void** addr, size_t length, int prot, int flags, int fd,
                off_t offset) {
   if (flags & MAP_ANONYMOUS)
     return REAL(mmap)(addr, length, prot, flags, fd, offset);
 
   *addr = ki_mmap(*addr, length, prot, flags, fd, offset);
-  return *addr == (void*)-1 ? errno : 0;
+  RTN_ERRNO_IF(*addr == (void*)-1);
+  return 0;
 }
 
 int WRAP(munmap)(void* addr, size_t length) {
   // Always let the real munmap run on the address range. It is not an error if
   // there are no mapped pages in that range.
   ki_munmap(addr, length);
   return REAL(munmap)(addr, length);
 }
 
 int WRAP(open)(const char* pathname, int oflag, mode_t cmode, int* newfd) {
   *newfd = ki_open(pathname, oflag);
-  return (*newfd < 0) ? errno : 0;
+  RTN_ERRNO_IF(*newfd < 0);
+  return 0;
 }
 
 int WRAP(open_resource)(const char* file, int* fd) {
   *fd = ki_open_resource(file);
-  return (*fd < 0) ? errno : 0;
+  RTN_ERRNO_IF(*fd < 0);
+  return 0;
 }
 
 int WRAP(poll)(struct pollfd *fds, nfds_t nfds, int timeout, int* count) {
   *count = ki_poll(fds, nfds, timeout);
-  return (*count < 0) ? errno : 0;
-
+  RTN_ERRNO_IF(*count < 0);
+  return 0;
 }
 
 int WRAP(read)(int fd, void *buf, size_t count, size_t *nread) {
   ssize_t signed_nread = ki_read(fd, buf, count);
   *nread = static_cast<size_t>(signed_nread);
-  return (signed_nread < 0) ? errno : 0;
+  RTN_ERRNO_IF(signed_nread < 0);
+  return 0;
 }
 
 int WRAP(rmdir)(const char* pathname) {
-  return (ki_rmdir(pathname) < 0) ? errno : 0;
+  RTN_ERRNO_IF(ki_rmdir(pathname) < 0);
+  return 0;
 }
 
 int WRAP(seek)(int fd, off_t offset, int whence, off_t* new_offset) {
   *new_offset = ki_lseek(fd, offset, whence);
-  return (*new_offset < 0) ? errno : 0;
+  RTN_ERRNO_IF(*new_offset < 0);
+  return 0;
 }
 
 int WRAP(select)(int nfds, fd_set* readfds, fd_set* writefds,
                  fd_set* exceptfds, struct timeval* timeout, int* count) {
   *count = ki_select(nfds, readfds, writefds, exceptfds, timeout);
-  return (*count < 0) ? errno : 0;
+  RTN_ERRNO_IF(*count < 0);
+  return 0;
 }
 
 int WRAP(stat)(const char *pathname, struct nacl_abi_stat *nacl_buf) {
   struct stat buf;
   memset(&buf, 0, sizeof(struct stat));
   int res = ki_stat(pathname, &buf);
-  if (res < 0)
-    return errno;
+  RTN_ERRNO_IF(res < 0);
   stat_to_nacl_stat(&buf, nacl_buf);
   return 0;
 }
 
 int WRAP(write)(int fd, const void* buf, size_t count, size_t* nwrote) {
   ssize_t signed_nwrote = ki_write(fd, buf, count);
   *nwrote = static_cast<size_t>(signed_nwrote);
-  return (signed_nwrote < 0) ? errno : 0;
+  RTN_ERRNO_IF(signed_nwrote < 0);
+  return 0;
 }
 
 int WRAP(accept)(int sockfd, struct sockaddr* addr,
                  socklen_t* addrlen, int *sd) {
   int result = ki_accept(sockfd, addr, addrlen);
   if (result < 0) {
     *sd = -1;
     return errno;
   } else {
     *sd = result;
@@ skipping 202 matching lines @@
 }
 
 int _real_write(int fd, const void *buf, size_t count, size_t *nwrote) {
   CHECK_REAL(write);
   return REAL(write)(fd, buf, count, nwrote);
 }
 
 static bool s_wrapped = false;
 void kernel_wrap_init() {
   if (!s_wrapped) {
+    LOG_TRACE("kernel_wrap_init");
     assign_real_pointers();
     EXPAND_SYMBOL_LIST_OPERATION(USE_WRAP)
     s_wrapped = true;
   }
 }
 
 void kernel_wrap_uninit() {
   if (s_wrapped) {
+    LOG_TRACE("kernel_wrap_uninit");
     EXPAND_SYMBOL_LIST_OPERATION(USE_REAL)
     s_wrapped = false;
   }
 }
 
 EXTERN_C_END
 
 #endif  // defined(__native_client__) && defined(__GLIBC__)