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

native_client_sdk/src/libraries/nacl_io/kernel_intercept.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 "nacl_io/kernel_intercept.h"
 
 #include <assert.h>
 #include <errno.h>
 #include <string.h>
 
 #include "nacl_io/kernel_proxy.h"
 #include "nacl_io/kernel_wrap.h"
 #include "nacl_io/kernel_wrap_real.h"
+#include "nacl_io/log.h"
 #include "nacl_io/osmman.h"
 #include "nacl_io/ossocket.h"
 #include "nacl_io/pepper_interface.h"
 #include "nacl_io/real_pepper_interface.h"
 
 using namespace nacl_io;
 
 #define ON_NOSYS_RETURN(x)    \
   if (!ki_is_initialized()) { \
     errno = ENOSYS;           \
@@ skipping 17 matching lines @@
   if (s_saved_state.kp != NULL)
     return 1;
   s_saved_state = s_state;
   s_state.kp = NULL;
   s_state.ppapi = NULL;
   s_state.kp_owned = false;
   return 0;
 }
 
 int ki_init(void* kp) {
+  LOG_TRACE("ki_init: %p", kp);
   return ki_init_ppapi(kp, 0, NULL);
 }
 
 int ki_init_ppapi(void* kp,
                    PP_Instance instance,
                    PPB_GetInterface get_browser_interface) {
   assert(!s_state.kp);
   if (s_state.kp != NULL)
     return 1;
   PepperInterface* ppapi = NULL;
   if (instance && get_browser_interface) {
     ppapi = new RealPepperInterface(instance, get_browser_interface);
     s_state.ppapi = ppapi;
   }
   int rtn = ki_init_interface(kp, ppapi);
   return rtn;
 }
 
 int ki_init_interface(void* kp, void* pepper_interface) {
+  LOG_TRACE("ki_init_interface: %p %p", kp, pepper_interface);
   assert(!s_state.kp);
   if (s_state.kp != NULL)
     return 1;
   PepperInterface* ppapi = static_cast<PepperInterface*>(pepper_interface);
   kernel_wrap_init();
 
   if (kp == NULL) {
     s_state.kp = new KernelProxy();
     s_state.kp_owned = true;
   } else {
     s_state.kp = static_cast<KernelProxy*>(kp);
     s_state.kp_owned = false;
   }
 
   if (s_state.kp->Init(ppapi) != 0)
     return 1;
 
   return 0;
 }
 
 int ki_is_initialized() {
   return s_state.kp != NULL;
 }
 
 void ki_uninit() {
+  LOG_TRACE("ki_uninit");
   if (s_saved_state.kp == NULL)
     kernel_wrap_uninit();
 
   // If we are going to delete the KernelProxy don't do it
   // until we've swapped it out.
   KernelInterceptState state_to_delete = s_state;
 
   // Swap out the KernelProxy. This will normally reset the
   // proxy to NULL, aside from in test code that has called
   // ki_push_state_for_testing().
@@ skipping 423 matching lines @@
 int ki_socket(int domain, int type, int protocol) {
   ON_NOSYS_RETURN(-1);
   return s_state.kp->socket(domain, type, protocol);
 }
 
 int ki_socketpair(int domain, int type, int protocol, int* sv) {
   ON_NOSYS_RETURN(-1);
   return s_state.kp->socketpair(domain, type, protocol, sv);
 }
 #endif  // PROVIDES_SOCKET_API