OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ppapi/native_client/src/trusted/plugin/pnacl_translate_thread.h" | 5 #include "ppapi/native_client/src/trusted/plugin/pnacl_translate_thread.h" |
6 | 6 |
7 #include <iterator> | 7 #include <iterator> |
| 8 #include <sstream> |
8 | 9 |
| 10 #include "native_client/src/shared/platform/nacl_check.h" |
9 #include "native_client/src/trusted/desc/nacl_desc_wrapper.h" | 11 #include "native_client/src/trusted/desc/nacl_desc_wrapper.h" |
10 #include "ppapi/cpp/var.h" | 12 #include "ppapi/cpp/var.h" |
11 #include "ppapi/native_client/src/trusted/plugin/plugin.h" | 13 #include "ppapi/native_client/src/trusted/plugin/plugin.h" |
12 #include "ppapi/native_client/src/trusted/plugin/plugin_error.h" | 14 #include "ppapi/native_client/src/trusted/plugin/plugin_error.h" |
13 #include "ppapi/native_client/src/trusted/plugin/pnacl_resources.h" | 15 #include "ppapi/native_client/src/trusted/plugin/pnacl_resources.h" |
14 #include "ppapi/native_client/src/trusted/plugin/srpc_params.h" | 16 #include "ppapi/native_client/src/trusted/plugin/srpc_params.h" |
15 #include "ppapi/native_client/src/trusted/plugin/temporary_file.h" | 17 #include "ppapi/native_client/src/trusted/plugin/temporary_file.h" |
16 #include "ppapi/native_client/src/trusted/plugin/utility.h" | 18 #include "ppapi/native_client/src/trusted/plugin/utility.h" |
17 | 19 |
18 namespace plugin { | 20 namespace plugin { |
(...skipping 413 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
432 AbortSubprocesses(); | 434 AbortSubprocesses(); |
433 if (translate_thread_ != NULL) | 435 if (translate_thread_ != NULL) |
434 NaClThreadJoin(translate_thread_.get()); | 436 NaClThreadJoin(translate_thread_.get()); |
435 PLUGIN_PRINTF(("~PnaclTranslateThread joined\n")); | 437 PLUGIN_PRINTF(("~PnaclTranslateThread joined\n")); |
436 NaClCondVarDtor(&buffer_cond_); | 438 NaClCondVarDtor(&buffer_cond_); |
437 NaClMutexDtor(&cond_mu_); | 439 NaClMutexDtor(&cond_mu_); |
438 NaClMutexDtor(&subprocess_mu_); | 440 NaClMutexDtor(&subprocess_mu_); |
439 } | 441 } |
440 | 442 |
441 } // namespace plugin | 443 } // namespace plugin |
OLD | NEW |