NaCl repo side changes to make crash reporting more reliable.

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).
  */
 #include "native_client/src/include/portability_io.h"
 #include "native_client/src/include/portability_string.h"
 #include "native_client/src/include/nacl_macros.h"
 
 #include "native_client/src/shared/gio/gio.h"
 #include "native_client/src/shared/platform/nacl_check.h"
 #include "native_client/src/shared/platform/nacl_exit.h"
 #include "native_client/src/shared/platform/nacl_log.h"
 #include "native_client/src/shared/platform/nacl_sync.h"
 #include "native_client/src/shared/platform/nacl_sync_checked.h"
+#include "native_client/src/shared/platform/nacl_time.h"
 #include "native_client/src/shared/srpc/nacl_srpc.h"
 
 
 #include "native_client/src/trusted/desc/nacl_desc_base.h"
 #include "native_client/src/trusted/desc/nacl_desc_conn_cap.h"
 #include "native_client/src/trusted/desc/nacl_desc_imc.h"
 #include "native_client/src/trusted/desc/nacl_desc_io.h"
 #include "native_client/src/trusted/desc/nrd_xfer.h"
 
 #include "native_client/src/trusted/fault_injection/fault_injection.h"
@@ skipping 17 matching lines @@
 #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"
 
 #include "native_client/src/trusted/service_runtime/sel_ldr_thread_interface.h"
 #include "native_client/src/trusted/threading/nacl_thread_interface.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/simple_service/nacl_simple_rservice.h"
 #include "native_client/src/trusted/simple_service/nacl_simple_service.h"
 
 #include "native_client/src/trusted/threading/nacl_thread_interface.h"
 
 static int IsEnvironmentVariableSet(char const *env_name) {
   return NULL != getenv(env_name);
 }
 
@@ skipping 1056 matching lines @@
             "NaClWaitForStartModuleCommand: awaken, module_may_start %d\n",
             nap->module_may_start);
   }
   status = nap->module_load_status;
   NaClXMutexUnlock(&nap->mu);
   NaClLog(4, "NaClWaitForStartModuleCommand finished\n");
 
   return status;
 }
 
+void NaClBlockIfCommandChannelExists(struct NaClApp *nap) {
+  if (NULL != nap->secure_service) {
+    for (;;) {
+      struct nacl_abi_timespec req;
+      req.tv_sec = 1000;
+      req.tv_nsec = 0;
+      NaClNanosleep(&req, (struct nacl_abi_timespec *) NULL);
+    }
+  }
+}
+
 
 /*
  * Secure command channels.
  */
 
 struct NaClSecureService {
   struct NaClSimpleService      base;
   struct NaClApp                *nap;
 };
 
@@ skipping 560 matching lines @@
   NaClSandboxMemoryStartForValgrind(mem_start);
 
 #ifdef __GNUC__
   _ovly_debug_event ();
 #endif
 }
 
 void NaClGdbHook(struct NaClApp const *nap) {
   StopForDebuggerInit(nap->mem_start);
 }