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

Side by Side Diff: src/trusted/service_runtime/sel_main_chrome.c

Issue 10134056: Refactor the process of choosing validators. (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: more aesthetics Created 8 years, 6 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
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 #include "native_client/src/trusted/service_runtime/sel_main_chrome.h" 7 #include "native_client/src/trusted/service_runtime/sel_main_chrome.h"
8 8
9 #include "native_client/src/include/portability.h" 9 #include "native_client/src/include/portability.h"
10 #include "native_client/src/include/portability_io.h" 10 #include "native_client/src/include/portability_io.h"
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 NaClSetCreateMemoryObjectFunc(args->create_memory_object_func); 155 NaClSetCreateMemoryObjectFunc(args->create_memory_object_func);
156 156
157 /* Inject the validation caching interface, if it exists. */ 157 /* Inject the validation caching interface, if it exists. */
158 nap->validation_cache = args->validation_cache; 158 nap->validation_cache = args->validation_cache;
159 159
160 #if NACL_WINDOWS 160 #if NACL_WINDOWS
161 if (args->broker_duplicate_handle_func != NULL) 161 if (args->broker_duplicate_handle_func != NULL)
162 NaClSetBrokerDuplicateHandleFunc(args->broker_duplicate_handle_func); 162 NaClSetBrokerDuplicateHandleFunc(args->broker_duplicate_handle_func);
163 #endif 163 #endif
164 164
165 if (getenv("NACL_DANGEROUS_USE_DFA_VALIDATOR") != NULL) {
166 fprintf(stderr, "DANGER! USING THE UNSTABLE DFA VALIDATOR!\n");
167 nap->enable_dfa_validator = 1;
168 }
169
170 NaClAppInitialDescriptorHookup(nap); 165 NaClAppInitialDescriptorHookup(nap);
171 166
172 /* 167 /*
173 * NACL_SERVICE_PORT_DESCRIPTOR and NACL_SERVICE_ADDRESS_DESCRIPTOR 168 * NACL_SERVICE_PORT_DESCRIPTOR and NACL_SERVICE_ADDRESS_DESCRIPTOR
174 * are 3 and 4. 169 * are 3 and 4.
175 */ 170 */
176 171
177 /* import IMC handle - used to be "-i" */ 172 /* import IMC handle - used to be "-i" */
178 NaClAddImcHandle(nap, args->imc_bootstrap_handle, export_addr_to); 173 NaClAddImcHandle(nap, args->imc_bootstrap_handle, export_addr_to);
179 174
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
360 if (LOAD_OK != errcode) { 355 if (LOAD_OK != errcode) {
361 NaClBlockIfCommandChannelExists(nap); 356 NaClBlockIfCommandChannelExists(nap);
362 } 357 }
363 358
364 done_ctor: 359 done_ctor:
365 360
366 NaClAllModulesFini(); 361 NaClAllModulesFini();
367 362
368 NaClExit(ret_code); 363 NaClExit(ret_code);
369 } 364 }
OLDNEW
« no previous file with comments | « src/trusted/service_runtime/sel_main.c ('k') | src/trusted/service_runtime/sel_validate_image.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698