Native Client side changes for debugging support: stdout/err -> postmessage.

src/trusted/service_runtime/sel_ldr.c

 /*
  * Copyright (c) 2011 The Native Client 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 <string.h>
 
 /*
  * NaCl Simple/secure ELF loader (NaCl SEL).
@@ skipping 26 matching lines @@
 #include "native_client/src/trusted/gio/gio_shm.h"
 #include "native_client/src/trusted/service_runtime/arch/sel_ldr_arch.h"
 #include "native_client/src/trusted/service_runtime/include/bits/nacl_syscalls.h"
 #include "native_client/src/trusted/service_runtime/include/sys/fcntl.h"
 #include "native_client/src/trusted/service_runtime/include/sys/stat.h"
 #include "native_client/src/trusted/service_runtime/include/sys/time.h"
 #include "native_client/src/trusted/service_runtime/nacl_app.h"
 #include "native_client/src/trusted/service_runtime/nacl_app_thread.h"
 #include "native_client/src/trusted/service_runtime/nacl_desc_effector_ldr.h"
 #include "native_client/src/trusted/service_runtime/nacl_globals.h"
+#include "native_client/src/trusted/service_runtime/nacl_resource.h"
 #include "native_client/src/trusted/service_runtime/nacl_syscall_common.h"
 #include "native_client/src/trusted/service_runtime/nacl_syscall_handlers.h"
 #include "native_client/src/trusted/service_runtime/nacl_valgrind_hooks.h"
 #include "native_client/src/trusted/service_runtime/sel_addrspace.h"
 #include "native_client/src/trusted/service_runtime/sel_ldr.h"
 #include "native_client/src/trusted/service_runtime/sel_memory.h"
 
 #include "native_client/src/trusted/service_runtime/name_service/default_name_service.h"
 #include "native_client/src/trusted/service_runtime/name_service/name_service.h"
 
@@ skipping 78 matching lines @@
 
   nap->dynamic_mapcache_offset = 0;
   nap->dynamic_mapcache_size = 0;
   nap->dynamic_mapcache_ret = 0;
 
   nap->service_port = NULL;
   nap->service_address = NULL;
   nap->secure_service = NULL;
   nap->manifest_proxy = NULL;
   nap->kern_service = NULL;
+  nap->resource_phase = NACL_RESOURCE_PHASE_START;
+  if (!NaClResourceNaClAppInit(&nap->resources, nap)) {
+    goto cleanup_dynamic_load_mutex;
+  }
   nap->reverse_client = NULL;
   nap->reverse_channel_initialization_state =
       NACL_REVERSE_CHANNEL_UNINITIALIZED;
 
   if (!NaClMutexCtor(&nap->mu)) {
     goto cleanup_dynamic_load_mutex;
   }
   if (!NaClCondVarCtor(&nap->cv)) {
     goto cleanup_mu;
   }
@@ skipping 497 matching lines @@
   if (NULL == dp) {
     NaClLog(LOG_FATAL, "NaClAddImcHandle: no memory\n");
   }
   if (!NaClDescImcDescCtor(dp, h)) {
     NaClLog(LOG_FATAL, ("NaClAddImcHandle: cannot construct"
                         " IMC descriptor object\n"));
   }
   NaClSetDesc(nap, nacl_desc, (struct NaClDesc *) dp);
 }
 
+
+static void NaClProcessRedirControl(struct NaClApp *nap) {
+  static struct {
+    int         d;
+    char const  *env_name;
+    int         nacl_flags;
+    int         mode;
+  } redir_control[] = {
+    { 0, "NACL_EXE_STDIN",
+      NACL_ABI_O_RDONLY, 0, },
+    { 1, "NACL_EXE_STDOUT",
+      NACL_ABI_O_WRONLY | NACL_ABI_O_APPEND, 0777, },
+    { 2, "NACL_EXE_STDERR",
+      NACL_ABI_O_WRONLY | NACL_ABI_O_APPEND, 0777, },
+  };
+
+  size_t          ix;
+  char const      *env;
+  struct NaClDesc *ndp;
+
+  for (ix = 0; ix < NACL_ARRAY_SIZE(redir_control); ++ix) {
+    if (NULL != (env = getenv(redir_control[ix].env_name))) {
+      NaClLog(4, "getenv(%s) -> %s\n", redir_control[ix].env_name, env);
+      ndp = NaClResourceOpen((struct NaClResource *) &nap->resources,
+                             env,
+                             redir_control[ix].nacl_flags,
+                             redir_control[ix].mode);
+      NaClLog(4, " NaClResourceOpen returned %"NACL_PRIxPTR"\n",
+              (uintptr_t) ndp);
+      if (NULL != ndp) {
+        NaClLog(4, "Setting descriptor %d\n", (int) ix);
+        NaClSetDesc(nap, (int) ix, ndp);
+        ndp = NULL;
+      }
+    } else if (NACL_RESOURCE_PHASE_START == nap->resource_phase) {
+      /*
+       * Environment not set -- handle default inheritance.
+       */
+      NaClAddHostDescriptor(nap, DUP(redir_control[ix].d),
+                            redir_control[ix].nacl_flags, (int) ix);
+    }
+  }
+}
+
 /*
  * Process default descriptor inheritance.  This means dup'ing
  * descriptors 0-2 and making them available to the NaCl App.
  *
  * When standard input is inherited, this could result in a NaCl
  * module competing for input from the terminal; for graphical /
  * browser plugin environments, this never is allowed to happen, and
  * having this is useful for debugging, and for potential standalone
  * text-mode applications of NaCl.
  *
  * TODO(bsy): consider whether default inheritance should occur only
  * in debug mode.
  */
 void NaClAppInitialDescriptorHookup(struct NaClApp  *nap) {
-  static struct {
-    int         d;
-    char const  *env_name;
-    int         flags;
-    int         mode;
-    int         nacl_flags;
-  } redir_control[] = {
-    { 0, "NACL_EXE_STDIN",  O_RDONLY, 0,
-      NACL_ABI_O_RDONLY, },
-    { 1, "NACL_EXE_STDOUT", O_WRONLY | O_APPEND | O_CREAT, 0777,
-      NACL_ABI_O_WRONLY | NACL_ABI_O_APPEND, },
-    { 2, "NACL_EXE_STDERR", O_WRONLY | O_APPEND | O_CREAT, 0777,
-      NACL_ABI_O_WRONLY | NACL_ABI_O_APPEND, },
-  };
 
-  size_t  ix;
-  char    *env;
-  int     d;
-
-  for (ix = 0; ix < NACL_ARRAY_SIZE(redir_control); ++ix) {
-    d = -1;
-    if (NULL != (env = getenv(redir_control[ix].env_name))) {
-      d = open(env, redir_control[ix].flags, redir_control[ix].mode);
-      /* may return -1, esp sandbox */
-    }
-    if (-1 == d) {
-      d = DUP(redir_control[ix].d);
-    }
-    NaClAddHostDescriptor(nap, d, redir_control[ix].nacl_flags, (int) ix);
-  }
+  NaClLog(4, "Processing I/O redirection/inheritance from environment\n");
+  nap->resource_phase = NACL_RESOURCE_PHASE_START;
+  NaClProcessRedirControl(nap);
+  NaClLog(4, "... done.\n");
 }
 
 void NaClAppVmmapUpdate(struct NaClApp    *nap,
                         uintptr_t         page_num,
                         size_t            npages,
                         int               prot,
                         struct NaClMemObj *nmop,
                         int               remove) {
   NaClXMutexLock(&nap->mu);
   NaClVmmapUpdate(&nap->mem_map,
@@ skipping 191 matching lines @@
     case NACL_DESC_CONNECTED_SOCKET:
     case NACL_DESC_SYSV_SHM:
     case NACL_DESC_MUTEX:
     case NACL_DESC_CONDVAR:
     case NACL_DESC_SEMAPHORE:
     case NACL_DESC_SYNC_SOCKET:
     case NACL_DESC_TRANSFERABLE_DATA_SOCKET:
     case NACL_DESC_IMC_SOCKET:
     case NACL_DESC_QUOTA:
     case NACL_DESC_DEVICE_RNG:
+    case NACL_DESC_DEVICE_POSTMESSAGE:
       /* Unsupported stuff */
       rpc->result = NACL_SRPC_RESULT_APP_ERROR;
       goto cleanup;
   }
 
   /*
    * do not use default case label, to make sure that the compiler
    * will generate a warning with -Wswitch-enum for new entries in
    * NaClDescTypeTag introduced in nacl_desc_base.h for which there is no
    * corresponding entry here.  instead, we pretend that fall-through
@@ skipping 368 matching lines @@
     free(rev);
     rpc->result = NACL_SRPC_RESULT_APP_ERROR;
     goto done;
   }
   nap->reverse_client = (struct NaClSecureReverseClient *) NaClRefCountRef(
       (struct NaClRefCount *) rev);
   out_args[0]->u.hval = NaClDescRef(rev->base.bound_and_cap[1]);
   rpc->result = NACL_SRPC_RESULT_OK;
 
   /*
+   * Hook up reverse-channel enabled resources, e.g.,
+   * DEBUG_ONLY:dev://postmessage.  NB: Resources specified by
+   * file:path should have been taken care of earlier, in
+   * NaClAppInitialDescriptorHookup.
+   */
+  nap->resource_phase = NACL_RESOURCE_PHASE_REV_CHAN;
+  NaClLog(4, "Processing dev I/O redirection/inheritance from environment\n");
+  NaClProcessRedirControl(nap);
+  NaClLog(4, "... done.\n");
+
+  /*
    * Service thread takes the reference rev.
    */
   if (!NaClSimpleRevClientStartServiceThread(&rev->base)) {
     NaClLog(LOG_FATAL, "Could not start reverse service thread\n");
   }
 
 done:
   NaClXMutexUnlock(&nap->mu);
   (*done->Run)(done);
   NaClLog(4, "Leaving NaClSecureReverseClientSetup\n");
@@ skipping 344 matching lines @@
   NaClSandboxMemoryStartForValgrind(mem_start);
 
 #ifdef __GNUC__
   _ovly_debug_event ();
 #endif
 }
 
 void NaClGdbHook(struct NaClApp const *nap) {
   StopForDebuggerInit(nap->mem_start);
 }