Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(202)

Unified Diff: components/nacl/loader/nonsfi/nonsfi_main.cc

Issue 230413002: NonSFI NaCl: Plumb Exception IRT enough for breakpad. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: revise Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/nacl/loader/nonsfi/nonsfi_main.cc
diff --git a/components/nacl/loader/nonsfi/nonsfi_main.cc b/components/nacl/loader/nonsfi/nonsfi_main.cc
index 5293498e98891f61e9a2df33014aaf084d90a8ea..b21f88a2482961629ff3024fd491aeee638f6bb2 100644
--- a/components/nacl/loader/nonsfi/nonsfi_main.cc
+++ b/components/nacl/loader/nonsfi/nonsfi_main.cc
@@ -10,6 +10,7 @@
#include "base/threading/platform_thread.h"
#include "base/threading/thread_restrictions.h"
#include "components/nacl/loader/nonsfi/elf_loader.h"
+#include "components/nacl/loader/nonsfi/irt_exception_handling.h"
#include "components/nacl/loader/nonsfi/irt_interfaces.h"
#include "native_client/src/include/elf_auxv.h"
#include "native_client/src/include/nacl_macros.h"
@@ -20,6 +21,7 @@
#include "native_client/src/trusted/desc/nrd_all_modules.h"
#include "native_client/src/trusted/desc/nrd_xfer.h"
#include "native_client/src/trusted/service_runtime/nacl_error_code.h"
+#include "native_client/src/trusted/service_runtime/nacl_signal.h"
namespace nacl {
namespace nonsfi {
@@ -178,6 +180,9 @@ void ServiceAccept(struct NaClDesc* port) {
} // namespace
void MainStart(NaClHandle imc_bootstrap_handle) {
+ // TODO(uekawa): Do I need to move it before InitializeBPFSandbox?
+ InitializeSignalHandler();
Junichi Uekawa 2014/04/14 22:51:04 I'm not too sure when I need to initialize the han
hamaji 2014/04/15 15:23:35 As chatted, this won't succeed after seccomp-bpf f
Junichi Uekawa 2014/04/17 07:54:56 I've moved it around.
+
NaClSrpcModuleInit();
struct NaClDesc* secure_pair[2] = { NULL, NULL };

Powered by Google App Engine
This is Rietveld 408576698