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 "native_client/src/trusted/plugin/service_runtime.h" | 9 #include "native_client/src/trusted/plugin/service_runtime.h" |
10 | 10 |
11 #include <string.h> | 11 #include <string.h> |
12 #include <set> | 12 #include <set> |
13 #include <string> | 13 #include <string> |
14 #include <utility> | 14 #include <utility> |
15 | 15 |
16 #include "base/compiler_specific.h" | 16 #include "base/compiler_specific.h" |
17 | 17 |
18 #include "native_client/src/include/checked_cast.h" | 18 #include "native_client/src/include/checked_cast.h" |
19 #include "native_client/src/include/portability_io.h" | 19 #include "native_client/src/include/portability_io.h" |
20 #include "native_client/src/include/portability_string.h" | 20 #include "native_client/src/include/portability_string.h" |
21 #include "native_client/src/include/nacl_macros.h" | 21 #include "native_client/src/include/nacl_macros.h" |
22 #include "native_client/src/include/nacl_scoped_ptr.h" | 22 #include "native_client/src/include/nacl_scoped_ptr.h" |
23 #include "native_client/src/include/nacl_string.h" | 23 #include "native_client/src/include/nacl_string.h" |
24 #include "native_client/src/shared/imc/nacl_imc.h" | |
25 #include "native_client/src/shared/platform/nacl_check.h" | 24 #include "native_client/src/shared/platform/nacl_check.h" |
26 #include "native_client/src/shared/platform/nacl_log.h" | 25 #include "native_client/src/shared/platform/nacl_log.h" |
27 #include "native_client/src/shared/platform/nacl_sync.h" | 26 #include "native_client/src/shared/platform/nacl_sync.h" |
28 #include "native_client/src/shared/platform/nacl_sync_checked.h" | 27 #include "native_client/src/shared/platform/nacl_sync_checked.h" |
29 #include "native_client/src/shared/platform/nacl_sync_raii.h" | 28 #include "native_client/src/shared/platform/nacl_sync_raii.h" |
30 #include "native_client/src/shared/platform/scoped_ptr_refcount.h" | 29 #include "native_client/src/shared/platform/scoped_ptr_refcount.h" |
31 #include "native_client/src/trusted/desc/nacl_desc_imc.h" | 30 #include "native_client/src/trusted/desc/nacl_desc_imc.h" |
32 // remove when we no longer need to cast the DescWrapper below. | 31 // remove when we no longer need to cast the DescWrapper below. |
33 #include "native_client/src/trusted/desc/nacl_desc_io.h" | 32 #include "native_client/src/trusted/desc/nacl_desc_io.h" |
34 #include "native_client/src/trusted/desc/nrd_xfer.h" | 33 #include "native_client/src/trusted/desc/nrd_xfer.h" |
(...skipping 807 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
842 | 841 |
843 nacl::string ServiceRuntime::GetCrashLogOutput() { | 842 nacl::string ServiceRuntime::GetCrashLogOutput() { |
844 if (NULL != subprocess_.get()) { | 843 if (NULL != subprocess_.get()) { |
845 return subprocess_->GetCrashLogOutput(); | 844 return subprocess_->GetCrashLogOutput(); |
846 } else { | 845 } else { |
847 return ""; | 846 return ""; |
848 } | 847 } |
849 } | 848 } |
850 | 849 |
851 } // namespace plugin | 850 } // namespace plugin |
OLD | NEW |