From b6b4451142d871d6b9d9162e465dff5d4511cef9 Mon Sep 17 00:00:00 2001 From: "ted.mielczarek" Date: Fri, 20 Jul 2012 12:24:25 +0000 Subject: =?UTF-8?q?Add=20a=20filter=20callback=20to=20CrashGenerationServe?= =?UTF-8?q?r=20on=20mac=20A=3DRafael=20=C3=81vila=20de=20Esp=C3=ADndola=20?= =?UTF-8?q?=20R=3Dted=20at=20https://bugzilla.mozi?= =?UTF-8?q?lla.org/show=5Fbug.cgi=3Fid=3D732173?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@990 4c0a9323-5329-0410-9bdc-e9ce6186880e --- src/client/mac/crash_generation/crash_generation_server.cc | 6 +++++- src/client/mac/crash_generation/crash_generation_server.h | 9 +++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) (limited to 'src/client/mac/crash_generation') diff --git a/src/client/mac/crash_generation/crash_generation_server.cc b/src/client/mac/crash_generation/crash_generation_server.cc index 44548ef0..b3eb403f 100644 --- a/src/client/mac/crash_generation/crash_generation_server.cc +++ b/src/client/mac/crash_generation/crash_generation_server.cc @@ -37,6 +37,8 @@ namespace google_breakpad { CrashGenerationServer::CrashGenerationServer( const char *mach_port_name, + FilterCallback filter, + void *filter_context, OnClientDumpRequestCallback dump_callback, void *dump_context, OnClientExitingCallback exit_callback, @@ -44,6 +46,8 @@ CrashGenerationServer::CrashGenerationServer( bool generate_dumps, const std::string &dump_path) : dump_callback_(dump_callback), + filter_(filter), + filter_context_(filter_context), dump_context_(dump_context), exit_callback_(exit_callback), exit_context_(exit_context), @@ -110,7 +114,7 @@ bool CrashGenerationServer::WaitForOneMessage() { bool result; std::string dump_path; - if (generate_dumps_) { + if (generate_dumps_ && (!filter_ || filter_(filter_context_))) { ScopedTaskSuspend suspend(remote_task); MinidumpGenerator generator(remote_task, handler_thread); diff --git a/src/client/mac/crash_generation/crash_generation_server.h b/src/client/mac/crash_generation/crash_generation_server.h index 6e6cb44d..85bd5b5e 100644 --- a/src/client/mac/crash_generation/crash_generation_server.h +++ b/src/client/mac/crash_generation/crash_generation_server.h @@ -65,10 +65,14 @@ class CrashGenerationServer { typedef void (*OnClientExitingCallback)(void *context, const ClientInfo &client_info); + // If a FilterCallback returns false, the dump will not be written. + typedef bool (*FilterCallback)(void *context); // Create an instance with the given parameters. // // mach_port_name: Named server port to listen on. + // filter: Callback for a client to cancel writing a dump. + // filter_context: Context for the filter callback. // dump_callback: Callback for a client crash dump request. // dump_context: Context for client crash dump request callback. // exit_callback: Callback for client process exit. @@ -80,6 +84,8 @@ class CrashGenerationServer { // dump_path: Path for generating dumps; required only if true is // passed for generateDumps parameter; NULL can be passed otherwise. CrashGenerationServer(const char *mach_port_name, + FilterCallback filter, + void *filter_context, OnClientDumpRequestCallback dump_callback, void *dump_context, OnClientExitingCallback exit_callback, @@ -109,6 +115,9 @@ class CrashGenerationServer { // if a quit message was received or if an error occurred. bool WaitForOneMessage(); + FilterCallback filter_; + void *filter_context_; + OnClientDumpRequestCallback dump_callback_; void *dump_context_; -- cgit v1.2.1