aboutsummaryrefslogtreecommitdiff
path: root/src/client/mac/crash_generation/crash_generation_server.cc
diff options
context:
space:
mode:
authorted.mielczarek@gmail.com <ted.mielczarek@gmail.com@4c0a9323-5329-0410-9bdc-e9ce6186880e>2010-08-16 16:48:59 +0000
committerted.mielczarek@gmail.com <ted.mielczarek@gmail.com@4c0a9323-5329-0410-9bdc-e9ce6186880e>2010-08-16 16:48:59 +0000
commit14889c340ffe6edeb362232318a8723a96b43a22 (patch)
tree9b46975cb11d44d50b726c43ae8200a7b212b742 /src/client/mac/crash_generation/crash_generation_server.cc
parentPut MachIPC into the google_breakpad namespace (diff)
downloadbreakpad-14889c340ffe6edeb362232318a8723a96b43a22.tar.xz
Change ClientInfo into a class to match other platforms, rename the current ClientInfo to ExceptionInfo
R=mark at http://breakpad.appspot.com/156001/show git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@651 4c0a9323-5329-0410-9bdc-e9ce6186880e
Diffstat (limited to 'src/client/mac/crash_generation/crash_generation_server.cc')
-rw-r--r--src/client/mac/crash_generation/crash_generation_server.cc14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/client/mac/crash_generation/crash_generation_server.cc b/src/client/mac/crash_generation/crash_generation_server.cc
index 417dac6a..44548ef0 100644
--- a/src/client/mac/crash_generation/crash_generation_server.cc
+++ b/src/client/mac/crash_generation/crash_generation_server.cc
@@ -98,12 +98,15 @@ bool CrashGenerationServer::WaitForOneMessage() {
if (result == KERN_SUCCESS) {
switch (message.GetMessageID()) {
case kDumpRequestMessage: {
- ClientInfo &info = (ClientInfo &)*message.GetData();
+ ExceptionInfo &info = (ExceptionInfo &)*message.GetData();
mach_port_t remote_task = message.GetTranslatedPort(0);
mach_port_t crashing_thread = message.GetTranslatedPort(1);
mach_port_t handler_thread = message.GetTranslatedPort(2);
mach_port_t ack_port = message.GetTranslatedPort(3);
+ pid_t remote_pid = -1;
+ pid_for_task(remote_task, &remote_pid);
+ ClientInfo client(remote_pid);
bool result;
std::string dump_path;
@@ -125,12 +128,12 @@ bool CrashGenerationServer::WaitForOneMessage() {
}
if (result && dump_callback_) {
- dump_callback_(dump_context_, info, dump_path);
+ dump_callback_(dump_context_, client, dump_path);
}
// TODO(ted): support a way for the client to send additional data,
- // perhaps with a callback so users of the server can read the data
- // themselves?
+ // perhaps with a callback so users of the server can read the data
+ // themselves?
if (ack_port != MACH_PORT_DEAD && ack_port != MACH_PORT_NULL) {
MachPortSender sender(ack_port);
@@ -141,7 +144,7 @@ bool CrashGenerationServer::WaitForOneMessage() {
}
if (exit_callback_) {
- exit_callback_(exit_context_, info);
+ exit_callback_(exit_context_, client);
}
break;
}
@@ -149,7 +152,6 @@ bool CrashGenerationServer::WaitForOneMessage() {
return false;
}
} else { // result != KERN_SUCCESS
- mach_error("WaitForMessage", result);
return false;
}
return true;