OLD | NEW |
---|---|
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 Loading... | |
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_LINUX) || defined(OS_MACOSX) | |
37 int number_of_cores = sysconf(_SC_NPROCESSORS_ONLN); | |
38 #endif | |
39 | |
36 if (!no_sandbox) { | 40 if (!no_sandbox) { |
37 platform.EnableSandbox(); | 41 platform.EnableSandbox(); |
38 } | 42 } |
39 bool sandbox_test_result = platform.RunSandboxTests(); | 43 bool sandbox_test_result = platform.RunSandboxTests(); |
40 | 44 |
41 if (sandbox_test_result) { | 45 if (sandbox_test_result) { |
42 NaClListener listener; | 46 NaClListener listener; |
47 #if defined(OS_LINUX) || defined(OS_MACOSX) | |
48 listener.set_number_of_cores(number_of_cores); | |
jvoung (off chromium)
2013/04/16 18:37:38
Still looking through the CL, but why do you have
bsy
2013/04/17 15:05:37
Nope. One in ctor is superfluous and unnecessary,
| |
49 #endif | |
43 listener.Listen(); | 50 listener.Listen(); |
44 } else { | 51 } else { |
45 // This indirectly prevents the test-harness-success-cookie from being set, | 52 // This indirectly prevents the test-harness-success-cookie from being set, |
46 // as a way of communicating test failure, because the nexe won't reply. | 53 // as a way of communicating test failure, because the nexe won't reply. |
47 // TODO(jvoung): find a better way to indicate failure that doesn't | 54 // TODO(jvoung): find a better way to indicate failure that doesn't |
48 // require waiting for a timeout. | 55 // require waiting for a timeout. |
49 VLOG(1) << "Sandbox test failed: Not launching NaCl process"; | 56 VLOG(1) << "Sandbox test failed: Not launching NaCl process"; |
50 } | 57 } |
51 #else | 58 #else |
52 NOTIMPLEMENTED() << " not implemented startup, plugin startup dialog etc."; | 59 NOTIMPLEMENTED() << " not implemented startup, plugin startup dialog etc."; |
53 #endif | 60 #endif |
54 | 61 |
55 platform.PlatformUninitialize(); | 62 platform.PlatformUninitialize(); |
56 return 0; | 63 return 0; |
57 } | 64 } |
OLD | NEW |