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

Unified Diff: src/untrusted/crash_dump/untrusted_crash_dump.c

Issue 14876015: Add wrapper library for the nacl_irt_exception_handling IRT interface (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: Cleanup + remove minidump_generator.gyp for now because of pthread.h problem in Gyp build Created 7 years, 7 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
« no previous file with comments | « src/include/nacl/nacl_exception.h ('k') | src/untrusted/minidump_generator/minidump_generator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/untrusted/crash_dump/untrusted_crash_dump.c
diff --git a/src/untrusted/crash_dump/untrusted_crash_dump.c b/src/untrusted/crash_dump/untrusted_crash_dump.c
index 04028fef4f50cd0d46b4e3465583e0347d3c9687..e50d131895f46b88e3ec7a68a4e615ce73488a41 100644
--- a/src/untrusted/crash_dump/untrusted_crash_dump.c
+++ b/src/untrusted/crash_dump/untrusted_crash_dump.c
@@ -21,7 +21,6 @@
#include "native_client/src/include/portability.h"
#include "native_client/src/include/nacl/nacl_exception.h"
-#include "native_client/src/untrusted/irt/irt.h"
#define CRASH_PAGE_CHUNK (64 * 1024)
@@ -31,7 +30,6 @@
static pthread_key_t g_CrashStackKey;
-static struct nacl_irt_exception_handling g_ExceptionHandling;
static int g_ExceptionHandlingEnabled = 0;
@@ -240,14 +238,9 @@ int NaClCrashDumpInit(void) {
int result;
assert(g_ExceptionHandlingEnabled == 0);
- if (nacl_interface_query(NACL_IRT_EXCEPTION_HANDLING_v0_1,
- &g_ExceptionHandling,
- sizeof(g_ExceptionHandling)) == 0) {
- return 0;
- }
result = pthread_key_create(&g_CrashStackKey, NaClCrashDumpThreadDestructor);
assert(result == 0);
- if (g_ExceptionHandling.exception_handler(CrashHandler, NULL) != 0) {
+ if (nacl_exception_set_handler(CrashHandler) != 0) {
return 0;
}
g_ExceptionHandlingEnabled = 1;
@@ -278,7 +271,6 @@ int NaClCrashDumpInitThread(void) {
PROT_NONE, MAP_FIXED | MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
assert(guard == stack);
pthread_setspecific(g_CrashStackKey, stack);
- result = g_ExceptionHandling.exception_stack(
- stack, CRASH_STACK_COMPLETE_SIZE);
+ result = nacl_exception_set_stack(stack, CRASH_STACK_COMPLETE_SIZE);
return result == 0;
}
« no previous file with comments | « src/include/nacl/nacl_exception.h ('k') | src/untrusted/minidump_generator/minidump_generator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698