OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2012 The Native Client Authors. All rights reserved. | 2 * Copyright (c) 2012 The Native Client 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 "manifest_proxy" | 7 #define NACL_LOG_MODULE_NAME "manifest_proxy" |
8 | 8 |
9 #include <string.h> | 9 #include <string.h> |
10 | 10 |
11 #include "native_client/src/trusted/manifest_name_service_proxy/manifest_proxy.h
" | 11 #include "native_client/src/trusted/manifest_name_service_proxy/manifest_proxy.h
" |
12 | 12 |
13 #include "native_client/src/public/name_service.h" | 13 #include "native_client/src/public/name_service.h" |
| 14 #include "native_client/src/public/nacl_file_info.h" |
14 #include "native_client/src/shared/platform/nacl_log.h" | 15 #include "native_client/src/shared/platform/nacl_log.h" |
15 #include "native_client/src/shared/platform/nacl_sync.h" | 16 #include "native_client/src/shared/platform/nacl_sync.h" |
16 #include "native_client/src/shared/platform/nacl_sync_checked.h" | 17 #include "native_client/src/shared/platform/nacl_sync_checked.h" |
17 #include "native_client/src/shared/srpc/nacl_srpc.h" | 18 #include "native_client/src/shared/srpc/nacl_srpc.h" |
18 #include "native_client/src/trusted/desc/nacl_desc_io.h" | 19 #include "native_client/src/trusted/desc/nacl_desc_io.h" |
19 #include "native_client/src/trusted/desc_cacheability/desc_cacheability.h" | 20 #include "native_client/src/trusted/desc_cacheability/desc_cacheability.h" |
20 #include "native_client/src/trusted/reverse_service/manifest_rpc.h" | 21 #include "native_client/src/trusted/reverse_service/manifest_rpc.h" |
21 #include "native_client/src/trusted/reverse_service/reverse_control_rpc.h" | 22 #include "native_client/src/trusted/reverse_service/reverse_control_rpc.h" |
22 #include "native_client/src/trusted/service_runtime/include/sys/errno.h" | 23 #include "native_client/src/trusted/service_runtime/include/sys/errno.h" |
23 #include "native_client/src/trusted/service_runtime/include/sys/fcntl.h" | 24 #include "native_client/src/trusted/service_runtime/include/sys/fcntl.h" |
24 #include "native_client/src/trusted/service_runtime/nacl_secure_service.h" | 25 #include "native_client/src/trusted/service_runtime/nacl_secure_service.h" |
25 #include "native_client/src/trusted/validator/nacl_file_info.h" | |
26 #include "native_client/src/trusted/validator/rich_file_info.h" | 26 #include "native_client/src/trusted/validator/rich_file_info.h" |
27 #include "native_client/src/trusted/validator/validation_cache.h" | 27 #include "native_client/src/trusted/validator/validation_cache.h" |
28 | 28 |
29 static void NaClManifestWaitForChannel_yield_mu( | 29 static void NaClManifestWaitForChannel_yield_mu( |
30 struct NaClManifestProxyConnection *self) { | 30 struct NaClManifestProxyConnection *self) { |
31 NaClLog(4, "Entered NaClManifestWaitForChannel_yield_mu\n"); | 31 NaClLog(4, "Entered NaClManifestWaitForChannel_yield_mu\n"); |
32 NaClXMutexLock(&self->mu); | 32 NaClXMutexLock(&self->mu); |
33 NaClLog(4, "NaClManifestWaitForChannel_yield_mu: checking channel\n"); | 33 NaClLog(4, "NaClManifestWaitForChannel_yield_mu: checking channel\n"); |
34 while (!self->channel_initialized) { | 34 while (!self->channel_initialized) { |
35 NaClLog(4, "NaClManifestWaitForChannel_yield_mu: waiting\n"); | 35 NaClLog(4, "NaClManifestWaitForChannel_yield_mu: waiting\n"); |
(...skipping 345 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
381 /* | 381 /* |
382 * The NaClManifestProxyConnectionFactory creates a subclass of a | 382 * The NaClManifestProxyConnectionFactory creates a subclass of a |
383 * NaClSimpleServiceConnectionFactory object that uses the reverse | 383 * NaClSimpleServiceConnectionFactory object that uses the reverse |
384 * connection object self->server to obtain a new RPC channel | 384 * connection object self->server to obtain a new RPC channel |
385 * with each manifest connection. | 385 * with each manifest connection. |
386 */ | 386 */ |
387 NaClSimpleServiceAcceptConnection, | 387 NaClSimpleServiceAcceptConnection, |
388 NaClSimpleServiceAcceptAndSpawnHandler, | 388 NaClSimpleServiceAcceptAndSpawnHandler, |
389 NaClSimpleServiceRpcHandler, | 389 NaClSimpleServiceRpcHandler, |
390 }; | 390 }; |
OLD | NEW |