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

Side by Side Diff: webrtc/system_wrappers/source/cpu_info.cc

Issue 2969623003: Update includes for webrtc/{base => rtc_base} rename (2/3) (Closed)
Patch Set: Rebased onto 224e65939af87443addfc5bb500fbf434728bd1c and restored sorting in clock.cc Created 3 years, 5 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 | « webrtc/system_wrappers/source/clock.cc ('k') | webrtc/system_wrappers/source/event.cc » ('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) 2011 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #include "webrtc/system_wrappers/include/cpu_info.h" 11 #include "webrtc/system_wrappers/include/cpu_info.h"
12 12
13 #if defined(WEBRTC_WIN) 13 #if defined(WEBRTC_WIN)
14 #include <winsock2.h> 14 #include <winsock2.h>
15 #include <windows.h> 15 #include <windows.h>
16 #ifndef EXCLUDE_D3D9 16 #ifndef EXCLUDE_D3D9
17 #include <d3d9.h> 17 #include <d3d9.h>
18 #endif 18 #endif
19 #elif defined(WEBRTC_LINUX) 19 #elif defined(WEBRTC_LINUX)
20 #include <unistd.h> 20 #include <unistd.h>
21 #endif 21 #endif
22 #if defined(WEBRTC_MAC) 22 #if defined(WEBRTC_MAC)
23 #include <sys/sysctl.h> 23 #include <sys/sysctl.h>
24 #endif 24 #endif
25 25
26 #include "webrtc/base/logging.h" 26 #include "webrtc/rtc_base/logging.h"
27 27
28 namespace internal { 28 namespace internal {
29 static int DetectNumberOfCores() { 29 static int DetectNumberOfCores() {
30 // We fall back on assuming a single core in case of errors. 30 // We fall back on assuming a single core in case of errors.
31 int number_of_cores = 1; 31 int number_of_cores = 1;
32 32
33 #if defined(WEBRTC_WIN) 33 #if defined(WEBRTC_WIN)
34 SYSTEM_INFO si; 34 SYSTEM_INFO si;
35 GetSystemInfo(&si); 35 GetSystemInfo(&si);
36 number_of_cores = static_cast<int>(si.dwNumberOfProcessors); 36 number_of_cores = static_cast<int>(si.dwNumberOfProcessors);
(...skipping 23 matching lines...) Expand all
60 // is running in a sandbox, we may only be able to read the value once (before 60 // is running in a sandbox, we may only be able to read the value once (before
61 // the sandbox is initialized) and not thereafter. 61 // the sandbox is initialized) and not thereafter.
62 // For more information see crbug.com/176522. 62 // For more information see crbug.com/176522.
63 static uint32_t logical_cpus = 0; 63 static uint32_t logical_cpus = 0;
64 if (!logical_cpus) 64 if (!logical_cpus)
65 logical_cpus = static_cast<uint32_t>(internal::DetectNumberOfCores()); 65 logical_cpus = static_cast<uint32_t>(internal::DetectNumberOfCores());
66 return logical_cpus; 66 return logical_cpus;
67 } 67 }
68 68
69 } // namespace webrtc 69 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/system_wrappers/source/clock.cc ('k') | webrtc/system_wrappers/source/event.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698