| 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 /* | 7 /* |
| 8 * NaCl Service Runtime. I/O Descriptor / Handle abstraction. Memory | 8 * NaCl Service Runtime. I/O Descriptor / Handle abstraction. Memory |
| 9 * mapping using descriptors. | 9 * mapping using descriptors. |
| 10 */ | 10 */ |
| 11 | 11 |
| 12 #include "native_client/src/include/portability.h" | 12 #include "native_client/src/include/portability.h" |
| 13 | 13 |
| 14 #if NACL_WINDOWS | 14 #if NACL_WINDOWS |
| 15 # include "io.h" | 15 # include "io.h" |
| 16 # include "fcntl.h" | 16 # include "fcntl.h" |
| 17 #endif | 17 #endif |
| 18 | 18 |
| 19 #include "native_client/src/shared/imc/nacl_imc_c.h" | 19 #include "native_client/src/shared/imc/nacl_imc_c.h" |
| 20 #include "native_client/src/trusted/desc/nacl_desc_base.h" | 20 #include "native_client/src/trusted/desc/nacl_desc_base.h" |
| 21 #include "native_client/src/trusted/desc/nacl_desc_effector.h" | 21 #include "native_client/src/trusted/desc/nacl_desc_effector.h" |
| 22 #include "native_client/src/trusted/desc/nacl_desc_io.h" | 22 #include "native_client/src/trusted/desc/nacl_desc_io.h" |
| 23 | 23 |
| 24 #include "native_client/src/shared/platform/nacl_find_addrsp.h" | 24 #include "native_client/src/shared/platform/nacl_find_addrsp.h" |
| 25 #include "native_client/src/shared/platform/nacl_host_desc.h" | 25 #include "native_client/src/shared/platform/nacl_host_desc.h" |
| 26 #include "native_client/src/shared/platform/nacl_log.h" | 26 #include "native_client/src/shared/platform/nacl_log.h" |
| 27 | 27 |
| 28 #include "native_client/src/trusted/service_runtime/include/bits/mman.h" |
| 28 #include "native_client/src/trusted/service_runtime/include/sys/errno.h" | 29 #include "native_client/src/trusted/service_runtime/include/sys/errno.h" |
| 29 #include "native_client/src/trusted/service_runtime/include/sys/fcntl.h" | 30 #include "native_client/src/trusted/service_runtime/include/sys/fcntl.h" |
| 30 #include "native_client/src/trusted/service_runtime/include/sys/mman.h" | |
| 31 #include "native_client/src/trusted/service_runtime/internal_errno.h" | 31 #include "native_client/src/trusted/service_runtime/internal_errno.h" |
| 32 #include "native_client/src/trusted/service_runtime/nacl_config.h" | 32 #include "native_client/src/trusted/service_runtime/nacl_config.h" |
| 33 | 33 |
| 34 | 34 |
| 35 /* | 35 /* |
| 36 * This file contains the implementation for the NaClIoDesc subclass | 36 * This file contains the implementation for the NaClIoDesc subclass |
| 37 * of NaClDesc. | 37 * of NaClDesc. |
| 38 * | 38 * |
| 39 * NaClDescIoDesc is the subclass that wraps host-OS descriptors | 39 * NaClDescIoDesc is the subclass that wraps host-OS descriptors |
| 40 * provided by NaClHostDesc (which gives an OS-independent abstraction | 40 * provided by NaClHostDesc (which gives an OS-independent abstraction |
| (...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 348 cleanup: | 348 cleanup: |
| 349 if (rv < 0) { | 349 if (rv < 0) { |
| 350 free(nhdp); | 350 free(nhdp); |
| 351 free(ndidp); | 351 free(ndidp); |
| 352 if (NACL_INVALID_HANDLE != h) { | 352 if (NACL_INVALID_HANDLE != h) { |
| 353 (void) NaClClose(h); | 353 (void) NaClClose(h); |
| 354 } | 354 } |
| 355 } | 355 } |
| 356 return rv; | 356 return rv; |
| 357 } | 357 } |
| OLD | NEW |