Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(280)

Side by Side Diff: src/trusted/service_runtime/sel_ldr.h

Issue 153453002: Expose NaClAppSetDesc() to Chromium for use at startup (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: Rebase and fix Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « src/public/nacl_app.h ('k') | src/trusted/service_runtime/sel_ldr.c » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 Simple/secure ELF loader (NaCl SEL). 8 * NaCl Simple/secure ELF loader (NaCl SEL).
9 * 9 *
10 * This loader can only process NaCl object files as produced using 10 * This loader can only process NaCl object files as produced using
(...skipping 15 matching lines...) Expand all
26 */ 26 */
27 27
28 #ifndef NATIVE_CLIENT_SRC_TRUSTED_SERVICE_RUNTIME_SEL_LDR_H_ 28 #ifndef NATIVE_CLIENT_SRC_TRUSTED_SERVICE_RUNTIME_SEL_LDR_H_
29 #define NATIVE_CLIENT_SRC_TRUSTED_SERVICE_RUNTIME_SEL_LDR_H_ 1 29 #define NATIVE_CLIENT_SRC_TRUSTED_SERVICE_RUNTIME_SEL_LDR_H_ 1
30 30
31 #include "native_client/src/include/atomic_ops.h" 31 #include "native_client/src/include/atomic_ops.h"
32 #include "native_client/src/include/nacl_base.h" 32 #include "native_client/src/include/nacl_base.h"
33 #include "native_client/src/include/portability.h" 33 #include "native_client/src/include/portability.h"
34 #include "native_client/src/include/elf.h" 34 #include "native_client/src/include/elf.h"
35 35
36 #include "native_client/src/public/nacl_app.h"
37
36 #include "native_client/src/shared/platform/nacl_host_desc.h" 38 #include "native_client/src/shared/platform/nacl_host_desc.h"
37 #include "native_client/src/shared/platform/nacl_log.h" 39 #include "native_client/src/shared/platform/nacl_log.h"
38 #include "native_client/src/shared/platform/nacl_threads.h" 40 #include "native_client/src/shared/platform/nacl_threads.h"
39 41
40 #include "native_client/src/shared/srpc/nacl_srpc.h" 42 #include "native_client/src/shared/srpc/nacl_srpc.h"
41 43
42 #include "native_client/src/trusted/interval_multiset/nacl_interval_multiset.h" 44 #include "native_client/src/trusted/interval_multiset/nacl_interval_multiset.h"
43 #include "native_client/src/trusted/interval_multiset/nacl_interval_range_tree.h " 45 #include "native_client/src/trusted/interval_multiset/nacl_interval_range_tree.h "
44 46
45 #include "native_client/src/trusted/service_runtime/dyn_array.h" 47 #include "native_client/src/trusted/service_runtime/dyn_array.h"
(...skipping 587 matching lines...) Expand 10 before | Expand all | Expand 10 after
633 635
634 /* 636 /*
635 * Looks up a descriptor in the open-file table. An additional 637 * Looks up a descriptor in the open-file table. An additional
636 * reference is taken on the returned NaClDesc object (if non-NULL). 638 * reference is taken on the returned NaClDesc object (if non-NULL).
637 * The caller is responsible for invoking NaClDescUnref() on it when 639 * The caller is responsible for invoking NaClDescUnref() on it when
638 * done. 640 * done.
639 */ 641 */
640 struct NaClDesc *NaClAppGetDesc(struct NaClApp *nap, 642 struct NaClDesc *NaClAppGetDesc(struct NaClApp *nap,
641 int d); 643 int d);
642 644
643 /* 645 /* NaClAppSetDesc() is defined in src/public/chrome_main.h. */
644 * Takes ownership of ndp.
645 */
646 void NaClAppSetDesc(struct NaClApp *nap,
647 int d,
648 struct NaClDesc *ndp);
649
650 646
651 int32_t NaClAppSetDescAvail(struct NaClApp *nap, 647 int32_t NaClAppSetDescAvail(struct NaClApp *nap,
652 struct NaClDesc *ndp); 648 struct NaClDesc *ndp);
653 649
654 /* 650 /*
655 * Versions that are called while already holding the desc_mu lock 651 * Versions that are called while already holding the desc_mu lock
656 */ 652 */
657 struct NaClDesc *NaClAppGetDescMu(struct NaClApp *nap, 653 struct NaClDesc *NaClAppGetDescMu(struct NaClApp *nap,
658 int d); 654 int d);
659 655
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
891 #else 887 #else
892 static INLINE void NaClHandleBootstrapArgs(int *argc_p, char ***argv_p) { 888 static INLINE void NaClHandleBootstrapArgs(int *argc_p, char ***argv_p) {
893 UNREFERENCED_PARAMETER(argc_p); 889 UNREFERENCED_PARAMETER(argc_p);
894 UNREFERENCED_PARAMETER(argv_p); 890 UNREFERENCED_PARAMETER(argv_p);
895 } 891 }
896 #endif 892 #endif
897 893
898 EXTERN_C_END 894 EXTERN_C_END
899 895
900 #endif /* NATIVE_CLIENT_SRC_TRUSTED_SERVICE_RUNTIME_SEL_LDR_H_ */ 896 #endif /* NATIVE_CLIENT_SRC_TRUSTED_SERVICE_RUNTIME_SEL_LDR_H_ */
OLDNEW
« no previous file with comments | « src/public/nacl_app.h ('k') | src/trusted/service_runtime/sel_ldr.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698