Resurrection of "Hooks for out-of-process (OOP) debugger" CL.

src/trusted/service_runtime/sel_ldr_standard.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.
  */
 
 /*
  * NaCl Simple/secure ELF loader (NaCl SEL).
  */
 
@@ skipping 13 matching lines @@
 #include "native_client/src/shared/platform/nacl_time.h"
 #include "native_client/src/trusted/perf_counter/nacl_perf_counter.h"
 
 #include "native_client/src/trusted/service_runtime/include/sys/errno.h"
 
 #include "native_client/src/trusted/service_runtime/arch/sel_ldr_arch.h"
 #include "native_client/src/trusted/service_runtime/elf_util.h"
 #include "native_client/src/trusted/service_runtime/nacl_app_thread.h"
 #include "native_client/src/trusted/service_runtime/nacl_closure.h"
 #include "native_client/src/trusted/service_runtime/nacl_debug_init.h"
+#include "native_client/src/trusted/service_runtime/nacl_oop_debugger_hooks.h"
 #include "native_client/src/trusted/service_runtime/nacl_sync_queue.h"
 #include "native_client/src/trusted/service_runtime/nacl_syscall_common.h"
 #include "native_client/src/trusted/service_runtime/nacl_text.h"
 #include "native_client/src/trusted/service_runtime/outer_sandbox.h"
 #include "native_client/src/trusted/service_runtime/sel_memory.h"
 #include "native_client/src/trusted/service_runtime/sel_ldr.h"
 #include "native_client/src/trusted/service_runtime/sel_util.h"
 #include "native_client/src/trusted/service_runtime/sel_addrspace.h"
 
 #if !defined(SIZE_T_MAX)
@@ skipping 650 matching lines @@
 
   /* now actually spawn the thread */
   natp = malloc(sizeof *natp);
   if (!natp) {
     goto cleanup;
   }
 
   /* We are ready to distinguish crashes in trusted and untrusted code. */
   NaClSignalRegisterApp(nap);
 
+  /* NaClApp initialization is completed, call OOP debugger hook. */
+  NaClOopDebuggerAppCreateHook(nap);
+
   NaClXMutexLock(&nap->mu);
   nap->running = 1;
   NaClXMutexUnlock(&nap->mu);
 
   NaClVmHoleWaitToStartThread(nap);
 
   NaClLog(2, "system stack ptr : %016"NACL_PRIxPTR"\n", stack_ptr);
   NaClLog(2, "  user stack ptr : %016"NACL_PRIxPTR"\n",
           NaClSysToUserStackAddr(nap, stack_ptr));
 
@@ skipping 39 matching lines @@
   }
   NaClXMutexUnlock(&nap->mu);
   /*
    * Some thread invoked the exit (exit_group) syscall.
    */
 
   if (NULL != nap->debug_stub_callbacks) {
     nap->debug_stub_callbacks->process_exit_hook(nap->exit_status);
   }
 
+  NaClOopDebuggerAppExitHook(nap->exit_status);
+
   return (nap->exit_status);
 }
 
 /*
  * stack_ptr is from syscall, so a 32-bit address.
  */
 int32_t NaClCreateAdditionalThread(struct NaClApp *nap,
                                    uintptr_t      prog_ctr,
                                    uintptr_t      sys_stack_ptr,
                                    uintptr_t      sys_tdb,
@@ skipping 25 matching lines @@
                                  sys_tdb,
                                  tdb_size)) {
     NaClLog(LOG_WARNING,
             ("NaClCreateAdditionalThread: could not allocate thread index."
              "  Returning EAGAIN per POSIX specs.\n"));
     free(natp);
     return -NACL_ABI_EAGAIN;
   }
   return 0;
 }