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

Side by Side Diff: trunk/src/chrome/nacl/nacl_main.cc

Issue 14320030: Revert 195190 "Set up NaClChromeMainArgs number_of_cores member ..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "build/build_config.h" 5 #include "build/build_config.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/hi_res_timer_manager.h" 8 #include "base/hi_res_timer_manager.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "base/power_monitor/power_monitor.h" 10 #include "base/power_monitor/power_monitor.h"
(...skipping 15 matching lines...) Expand all
26 base::PowerMonitor power_monitor; 26 base::PowerMonitor power_monitor;
27 HighResolutionTimerManager hi_res_timer_manager; 27 HighResolutionTimerManager hi_res_timer_manager;
28 28
29 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) 29 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
30 NaClMainPlatformDelegate platform(parameters); 30 NaClMainPlatformDelegate platform(parameters);
31 31
32 platform.PlatformInitialize(); 32 platform.PlatformInitialize();
33 bool no_sandbox = parsed_command_line.HasSwitch(switches::kNoSandbox); 33 bool no_sandbox = parsed_command_line.HasSwitch(switches::kNoSandbox);
34 platform.InitSandboxTests(no_sandbox); 34 platform.InitSandboxTests(no_sandbox);
35 35
36 #if defined(OS_POSIX)
37 // The number of cores must be obtained before the invocation of
38 // platform.EnableSandbox(), so cannot simply be inlined below.
39 int number_of_cores = sysconf(_SC_NPROCESSORS_ONLN);
40 #endif
41
42 if (!no_sandbox) { 36 if (!no_sandbox) {
43 platform.EnableSandbox(); 37 platform.EnableSandbox();
44 } 38 }
45 bool sandbox_test_result = platform.RunSandboxTests(); 39 bool sandbox_test_result = platform.RunSandboxTests();
46 40
47 if (sandbox_test_result) { 41 if (sandbox_test_result) {
48 NaClListener listener; 42 NaClListener listener;
49 #if defined(OS_POSIX)
50 listener.set_number_of_cores(number_of_cores);
51 #endif
52 listener.Listen(); 43 listener.Listen();
53 } else { 44 } else {
54 // This indirectly prevents the test-harness-success-cookie from being set, 45 // This indirectly prevents the test-harness-success-cookie from being set,
55 // as a way of communicating test failure, because the nexe won't reply. 46 // as a way of communicating test failure, because the nexe won't reply.
56 // TODO(jvoung): find a better way to indicate failure that doesn't 47 // TODO(jvoung): find a better way to indicate failure that doesn't
57 // require waiting for a timeout. 48 // require waiting for a timeout.
58 VLOG(1) << "Sandbox test failed: Not launching NaCl process"; 49 VLOG(1) << "Sandbox test failed: Not launching NaCl process";
59 } 50 }
60 #else 51 #else
61 NOTIMPLEMENTED() << " not implemented startup, plugin startup dialog etc."; 52 NOTIMPLEMENTED() << " not implemented startup, plugin startup dialog etc.";
62 #endif 53 #endif
63 54
64 platform.PlatformUninitialize(); 55 platform.PlatformUninitialize();
65 return 0; 56 return 0;
66 } 57 }
OLDNEW
« no previous file with comments | « trunk/src/chrome/nacl/nacl_listener.cc ('k') | trunk/src/chrome/test/data/nacl/nacl_test_data.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698