OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2012 The Chromium Authors. All rights reserved. | 2 * Copyright (c) 2012 The Chromium Authors. All rights reserved. |
3 * Use of this source code is governed by a BSD-style license that can be | 3 * Use of this source code is governed by a BSD-style license that can be |
4 * found in the LICENSE file. | 4 * found in the LICENSE file. |
5 */ | 5 */ |
6 | 6 |
7 #define NACL_LOG_MODULE_NAME "Plugin::ServiceRuntime" | 7 #define NACL_LOG_MODULE_NAME "Plugin::ServiceRuntime" |
8 | 8 |
9 #include "ppapi/native_client/src/trusted/plugin/service_runtime.h" | 9 #include "ppapi/native_client/src/trusted/plugin/service_runtime.h" |
10 | 10 |
(...skipping 710 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
721 | 721 |
722 nacl::scoped_ptr<SelLdrLauncherChrome> | 722 nacl::scoped_ptr<SelLdrLauncherChrome> |
723 tmp_subprocess(new SelLdrLauncherChrome()); | 723 tmp_subprocess(new SelLdrLauncherChrome()); |
724 if (NULL == tmp_subprocess.get()) { | 724 if (NULL == tmp_subprocess.get()) { |
725 NaClLog(LOG_ERROR, "ServiceRuntime::Start (subprocess create failed)\n"); | 725 NaClLog(LOG_ERROR, "ServiceRuntime::Start (subprocess create failed)\n"); |
726 params.error_info->SetReport( | 726 params.error_info->SetReport( |
727 ERROR_SEL_LDR_CREATE_LAUNCHER, | 727 ERROR_SEL_LDR_CREATE_LAUNCHER, |
728 "ServiceRuntime: failed to create sel_ldr launcher"); | 728 "ServiceRuntime: failed to create sel_ldr launcher"); |
729 return false; | 729 return false; |
730 } | 730 } |
| 731 nacl::string error_message; |
731 bool started = tmp_subprocess->Start(plugin_->pp_instance(), | 732 bool started = tmp_subprocess->Start(plugin_->pp_instance(), |
732 params.url.c_str(), | 733 params.url.c_str(), |
733 params.uses_irt, | 734 params.uses_irt, |
734 params.uses_ppapi, | 735 params.uses_ppapi, |
735 params.enable_dev_interfaces, | 736 params.enable_dev_interfaces, |
736 params.enable_dyncode_syscalls, | 737 params.enable_dyncode_syscalls, |
737 params.enable_exception_handling); | 738 params.enable_exception_handling, |
| 739 &error_message); |
738 if (!started) { | 740 if (!started) { |
739 NaClLog(LOG_ERROR, "ServiceRuntime::Start (start failed)\n"); | 741 NaClLog(LOG_ERROR, "ServiceRuntime::Start (start failed)\n"); |
740 params.error_info->SetReport(ERROR_SEL_LDR_LAUNCH, | 742 params.error_info->SetReportWithConsoleOnlyError( |
741 "ServiceRuntime: failed to start"); | 743 ERROR_SEL_LDR_LAUNCH, |
| 744 "ServiceRuntime: failed to start", |
| 745 error_message); |
742 return false; | 746 return false; |
743 } | 747 } |
744 | 748 |
745 subprocess_.reset(tmp_subprocess.release()); | 749 subprocess_.reset(tmp_subprocess.release()); |
746 NaClLog(4, "ServiceRuntime::StartSelLdr (return 1)\n"); | 750 NaClLog(4, "ServiceRuntime::StartSelLdr (return 1)\n"); |
747 return true; | 751 return true; |
748 } | 752 } |
749 | 753 |
750 void ServiceRuntime::WaitForSelLdrStart() { | 754 void ServiceRuntime::WaitForSelLdrStart() { |
751 nacl::MutexLocker take(&mu_); | 755 nacl::MutexLocker take(&mu_); |
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
871 | 875 |
872 nacl::string ServiceRuntime::GetCrashLogOutput() { | 876 nacl::string ServiceRuntime::GetCrashLogOutput() { |
873 if (NULL != subprocess_.get()) { | 877 if (NULL != subprocess_.get()) { |
874 return subprocess_->GetCrashLogOutput(); | 878 return subprocess_->GetCrashLogOutput(); |
875 } else { | 879 } else { |
876 return std::string(); | 880 return std::string(); |
877 } | 881 } |
878 } | 882 } |
879 | 883 |
880 } // namespace plugin | 884 } // namespace plugin |
OLD | NEW |