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

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

Issue 1867633002: Revert "Debug Stub: Added support for windows in ipc_transport." (Closed) Base URL: https://chromium.googlesource.com/native_client/src/native_client.git@master
Patch Set: Created 4 years, 8 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
« no previous file with comments | « src/trusted/service_runtime/nacl_debug_init.h ('k') | no next file » | 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 #include "native_client/src/public/chrome_main.h" 7 #include "native_client/src/public/chrome_main.h"
8 8
9 #include "native_client/src/include/build_config.h" 9 #include "native_client/src/include/build_config.h"
10 #include "native_client/src/include/portability.h" 10 #include "native_client/src/include/portability.h"
(...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after
304 args->irt_fd = -1; 304 args->irt_fd = -1;
305 } 305 }
306 if (args->irt_desc != NULL) { 306 if (args->irt_desc != NULL) {
307 NaClLoadIrt(nap, args->irt_desc); 307 NaClLoadIrt(nap, args->irt_desc);
308 NaClDescUnref(args->irt_desc); 308 NaClDescUnref(args->irt_desc);
309 args->irt_desc = NULL; 309 args->irt_desc = NULL;
310 } 310 }
311 } 311 }
312 312
313 if (args->enable_debug_stub) { 313 if (args->enable_debug_stub) {
314 #if NACL_LINUX || NACL_OSX
314 if (args->debug_stub_pipe_fd != NACL_INVALID_HANDLE) { 315 if (args->debug_stub_pipe_fd != NACL_INVALID_HANDLE) {
315 NaClDebugStubSetPipe(args->debug_stub_pipe_fd); 316 NaClDebugStubSetPipe(args->debug_stub_pipe_fd);
316 } 317 } else if (args->debug_stub_server_bound_socket_fd != NACL_INVALID_SOCKET) {
317
318 #if NACL_LINUX || NACL_OSX
319 if (args->debug_stub_pipe_fd == NACL_INVALID_HANDLE &&
320 args->debug_stub_server_bound_socket_fd != NACL_INVALID_SOCKET) {
321 NaClDebugSetBoundSocket(args->debug_stub_server_bound_socket_fd); 318 NaClDebugSetBoundSocket(args->debug_stub_server_bound_socket_fd);
322 } 319 }
323 #endif 320 #endif
324 if (!NaClDebugInit(nap)) { 321 if (!NaClDebugInit(nap)) {
325 goto error; 322 goto error;
326 } 323 }
327 #if NACL_WINDOWS 324 #if NACL_WINDOWS
328 if (args->debug_stub_pipe_fd == NACL_INVALID_HANDLE && 325 if (NULL != args->debug_stub_server_port_selected_handler_func) {
329 NULL != args->debug_stub_server_port_selected_handler_func) {
330 args->debug_stub_server_port_selected_handler_func( 326 args->debug_stub_server_port_selected_handler_func(
331 NaClDebugGetBoundPort()); 327 NaClDebugGetBoundPort());
332 } 328 }
333 #endif 329 #endif
334 } 330 }
335 331
336 if (args->load_status_handler_func != NULL) { 332 if (args->load_status_handler_func != NULL) {
337 args->load_status_handler_func(LOAD_OK); 333 args->load_status_handler_func(LOAD_OK);
338 } 334 }
339 return LOAD_OK; 335 return LOAD_OK;
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
400 int NaClChromeMainStart(struct NaClApp *nap, 396 int NaClChromeMainStart(struct NaClApp *nap,
401 struct NaClChromeMainArgs *args, 397 struct NaClChromeMainArgs *args,
402 int *exit_status) { 398 int *exit_status) {
403 int load_ok = LOAD_OK == LoadApp(nap, args); 399 int load_ok = LOAD_OK == LoadApp(nap, args);
404 if (load_ok) { 400 if (load_ok) {
405 *exit_status = StartApp(nap, args); 401 *exit_status = StartApp(nap, args);
406 } 402 }
407 free(args); 403 free(args);
408 return load_ok; 404 return load_ok;
409 } 405 }
OLDNEW
« no previous file with comments | « src/trusted/service_runtime/nacl_debug_init.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698