OLD | NEW |
1 // Copyright (c) 2008, Google Inc. | 1 // Copyright (c) 2008, Google Inc. |
2 // All rights reserved. | 2 // All rights reserved. |
3 // | 3 // |
4 // Redistribution and use in source and binary forms, with or without | 4 // Redistribution and use in source and binary forms, with or without |
5 // modification, are permitted provided that the following conditions are | 5 // modification, are permitted provided that the following conditions are |
6 // met: | 6 // met: |
7 // | 7 // |
8 // * Redistributions of source code must retain the above copyright | 8 // * Redistributions of source code must retain the above copyright |
9 // notice, this list of conditions and the following disclaimer. | 9 // notice, this list of conditions and the following disclaimer. |
10 // * Redistributions in binary form must reproduce the above | 10 // * Redistributions in binary form must reproduce the above |
(...skipping 778 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
789 CrashGenerationServer* obj = | 789 CrashGenerationServer* obj = |
790 reinterpret_cast<CrashGenerationServer*>(context); | 790 reinterpret_cast<CrashGenerationServer*>(context); |
791 obj->HandleConnectionRequest(); | 791 obj->HandleConnectionRequest(); |
792 } | 792 } |
793 | 793 |
794 // static | 794 // static |
795 void CALLBACK CrashGenerationServer::OnDumpRequest(void* context, BOOLEAN) { | 795 void CALLBACK CrashGenerationServer::OnDumpRequest(void* context, BOOLEAN) { |
796 assert(context); | 796 assert(context); |
797 ClientInfo* client_info = reinterpret_cast<ClientInfo*>(context); | 797 ClientInfo* client_info = reinterpret_cast<ClientInfo*>(context); |
798 client_info->PopulateCustomInfo(); | 798 client_info->PopulateCustomInfo(); |
| 799 client_info->PopulateCustomDataStream(); |
799 | 800 |
800 CrashGenerationServer* crash_server = client_info->crash_server(); | 801 CrashGenerationServer* crash_server = client_info->crash_server(); |
801 assert(crash_server); | 802 assert(crash_server); |
802 crash_server->HandleDumpRequest(*client_info); | 803 crash_server->HandleDumpRequest(*client_info); |
803 | 804 |
804 ResetEvent(client_info->dump_requested_handle()); | 805 ResetEvent(client_info->dump_requested_handle()); |
805 } | 806 } |
806 | 807 |
807 // static | 808 // static |
808 void CALLBACK CrashGenerationServer::OnClientEnd(void* context, BOOLEAN) { | 809 void CALLBACK CrashGenerationServer::OnClientEnd(void* context, BOOLEAN) { |
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
885 if (!client.GetClientThreadId(&client_thread_id)) { | 886 if (!client.GetClientThreadId(&client_thread_id)) { |
886 return false; | 887 return false; |
887 } | 888 } |
888 | 889 |
889 return dump_generator_->WriteMinidump(client.process_handle(), | 890 return dump_generator_->WriteMinidump(client.process_handle(), |
890 client.pid(), | 891 client.pid(), |
891 client_thread_id, | 892 client_thread_id, |
892 GetCurrentThreadId(), | 893 GetCurrentThreadId(), |
893 client_ex_info, | 894 client_ex_info, |
894 client.assert_info(), | 895 client.assert_info(), |
| 896 client.custom_data_stream(), |
895 client.dump_type(), | 897 client.dump_type(), |
896 true, | 898 true, |
897 dump_path); | 899 dump_path); |
898 } | 900 } |
899 | 901 |
900 } // namespace google_breakpad | 902 } // namespace google_breakpad |
OLD | NEW |