summaryrefslogtreecommitdiffstats
path: root/components
diff options
context:
space:
mode:
authorsehr@google.com <sehr@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-19 22:27:07 +0000
committersehr@google.com <sehr@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-19 22:27:07 +0000
commite17f5ab5ad39cb3001da16482c1c79988ad15fcb (patch)
tree9f414eed4db0ac4f150840d1a1649bac41f65e22 /components
parentd3b92ff32f9a8b97e127888be7df4d8ed5d42abf (diff)
downloadchromium_src-e17f5ab5ad39cb3001da16482c1c79988ad15fcb.zip
chromium_src-e17f5ab5ad39cb3001da16482c1c79988ad15fcb.tar.gz
chromium_src-e17f5ab5ad39cb3001da16482c1c79988ad15fcb.tar.bz2
Re-enable crash throttling for PNaCl processes.
This version of the change only applies to sel_ldr processes created on behalf of a pnacl application. This includes the translator nexes and the translated application nexe. BUG= https://code.google.com/p/nativeclient/issues/detail?id=359 R=bbudge@chromium.org, jln@chromium.org, jvoung@chromium.org, mseaborn@chromium.org, yzshen@chromium.org Review URL: https://codereview.chromium.org/22877019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@218341 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components')
-rw-r--r--components/nacl/common/nacl_host_messages.h1
-rw-r--r--components/nacl/common/nacl_types.cc10
-rw-r--r--components/nacl/common/nacl_types.h4
3 files changed, 11 insertions, 4 deletions
diff --git a/components/nacl/common/nacl_host_messages.h b/components/nacl/common/nacl_host_messages.h
index d9a835b..0e3880a 100644
--- a/components/nacl/common/nacl_host_messages.h
+++ b/components/nacl/common/nacl_host_messages.h
@@ -26,6 +26,7 @@ IPC_STRUCT_TRAITS_BEGIN(nacl::NaClLaunchParams)
IPC_STRUCT_TRAITS_MEMBER(uses_irt)
IPC_STRUCT_TRAITS_MEMBER(enable_dyncode_syscalls)
IPC_STRUCT_TRAITS_MEMBER(enable_exception_handling)
+ IPC_STRUCT_TRAITS_MEMBER(enable_crash_throttling)
IPC_STRUCT_TRAITS_END()
IPC_STRUCT_TRAITS_BEGIN(nacl::NaClLaunchResult)
diff --git a/components/nacl/common/nacl_types.cc b/components/nacl/common/nacl_types.cc
index dea02391..6b2f51e 100644
--- a/components/nacl/common/nacl_types.cc
+++ b/components/nacl/common/nacl_types.cc
@@ -24,7 +24,8 @@ NaClLaunchParams::NaClLaunchParams()
permission_bits(0),
uses_irt(false),
enable_dyncode_syscalls(false),
- enable_exception_handling(false) {
+ enable_exception_handling(false),
+ enable_crash_throttling(false) {
}
NaClLaunchParams::NaClLaunchParams(const std::string& manifest_url,
@@ -32,13 +33,15 @@ NaClLaunchParams::NaClLaunchParams(const std::string& manifest_url,
uint32 permission_bits,
bool uses_irt,
bool enable_dyncode_syscalls,
- bool enable_exception_handling)
+ bool enable_exception_handling,
+ bool enable_crash_throttling)
: manifest_url(manifest_url),
render_view_id(render_view_id),
permission_bits(permission_bits),
uses_irt(uses_irt),
enable_dyncode_syscalls(enable_dyncode_syscalls),
- enable_exception_handling(enable_exception_handling) {
+ enable_exception_handling(enable_exception_handling),
+ enable_crash_throttling(enable_crash_throttling) {
}
NaClLaunchParams::NaClLaunchParams(const NaClLaunchParams& l) {
@@ -48,6 +51,7 @@ NaClLaunchParams::NaClLaunchParams(const NaClLaunchParams& l) {
uses_irt = l.uses_irt;
enable_dyncode_syscalls = l.enable_dyncode_syscalls;
enable_exception_handling = l.enable_exception_handling;
+ enable_crash_throttling = l.enable_crash_throttling;
}
NaClLaunchParams::~NaClLaunchParams() {
diff --git a/components/nacl/common/nacl_types.h b/components/nacl/common/nacl_types.h
index b3fee25..47fccdd 100644
--- a/components/nacl/common/nacl_types.h
+++ b/components/nacl/common/nacl_types.h
@@ -70,7 +70,8 @@ struct NaClLaunchParams {
NaClLaunchParams();
NaClLaunchParams(const std::string& u, int r, uint32 p, bool uses_irt,
bool enable_dyncode_syscalls,
- bool enable_exception_handling);
+ bool enable_exception_handling,
+ bool enable_crash_throttling);
NaClLaunchParams(const NaClLaunchParams& l);
~NaClLaunchParams();
@@ -80,6 +81,7 @@ struct NaClLaunchParams {
bool uses_irt;
bool enable_dyncode_syscalls;
bool enable_exception_handling;
+ bool enable_crash_throttling;
};
struct NaClLaunchResult {