Skip to content
Snippets Groups Projects
Commit d94ad10c authored by ctiller's avatar ctiller Committed by Jan Tattermusch
Browse files

Provide a port of cpu related code to posix, and linux.

Properly set this up in our build environment.
	Change on 2014/12/23 by ctiller <ctiller@google.com>
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=82725899
parent 7e012cf4
No related branches found
No related tags found
No related merge requests found
...@@ -1056,6 +1056,7 @@ LIBGPR_SRC = \ ...@@ -1056,6 +1056,7 @@ LIBGPR_SRC = \
src/core/support/alloc.c \ src/core/support/alloc.c \
src/core/support/cancellable.c \ src/core/support/cancellable.c \
src/core/support/cmdline.c \ src/core/support/cmdline.c \
src/core/support/cpu_linux.c \
src/core/support/cpu_posix.c \ src/core/support/cpu_posix.c \
src/core/support/histogram.c \ src/core/support/histogram.c \
src/core/support/host_port.c \ src/core/support/host_port.c \
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
"src/core/support/alloc.c", "src/core/support/alloc.c",
"src/core/support/cancellable.c", "src/core/support/cancellable.c",
"src/core/support/cmdline.c", "src/core/support/cmdline.c",
"src/core/support/cpu_linux.c",
"src/core/support/cpu_posix.c", "src/core/support/cpu_posix.c",
"src/core/support/histogram.c", "src/core/support/histogram.c",
"src/core/support/host_port.c", "src/core/support/host_port.c",
......
...@@ -51,6 +51,7 @@ ...@@ -51,6 +51,7 @@
#elif defined(ANDROID) || defined(__ANDROID__) #elif defined(ANDROID) || defined(__ANDROID__)
#define GPR_ANDROID 1 #define GPR_ANDROID 1
#define GPR_ARCH_32 1 #define GPR_ARCH_32 1
#define GPR_CPU_LINUX 1
#define GPR_GCC_SYNC 1 #define GPR_GCC_SYNC 1
#define GPR_LIBEVENT 1 #define GPR_LIBEVENT 1
#define GPR_POSIX_SOCKET 1 #define GPR_POSIX_SOCKET 1
...@@ -60,6 +61,7 @@ ...@@ -60,6 +61,7 @@
#define GPR_POSIX_SYNC 1 #define GPR_POSIX_SYNC 1
#define GPR_POSIX_TIME 1 #define GPR_POSIX_TIME 1
#elif defined(__linux__) #elif defined(__linux__)
#define GPR_CPU_LINUX 1
#define GPR_GCC_ATOMIC 1 #define GPR_GCC_ATOMIC 1
#define GPR_LIBEVENT 1 #define GPR_LIBEVENT 1
#define GPR_LINUX 1 #define GPR_LINUX 1
...@@ -74,6 +76,7 @@ ...@@ -74,6 +76,7 @@
#define GPR_ARCH_32 1 #define GPR_ARCH_32 1
#endif /* _LP64 */ #endif /* _LP64 */
#elif defined(__APPLE__) #elif defined(__APPLE__)
#define GPR_CPU_POSIX 1
#define GPR_GCC_ATOMIC 1 #define GPR_GCC_ATOMIC 1
#define GPR_LIBEVENT 1 #define GPR_LIBEVENT 1
#define GPR_POSIX_LOG 1 #define GPR_POSIX_LOG 1
...@@ -120,6 +123,10 @@ ...@@ -120,6 +123,10 @@
#error Must define exactly one of GPR_ARCH_32, GPR_ARCH_64 #error Must define exactly one of GPR_ARCH_32, GPR_ARCH_64
#endif #endif
#if defined(GPR_CPU_LINUX) + defined(GPR_CPU_POSIX) != 1
#error Must define exactly one of GPR_CPU_LINUX, GPR_CPU_POSIX
#endif
typedef int16_t gpr_int16; typedef int16_t gpr_int16;
typedef int32_t gpr_int32; typedef int32_t gpr_int32;
typedef int64_t gpr_int64; typedef int64_t gpr_int64;
......
/*
*
* Copyright 2014, Google Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following disclaimer
* in the documentation and/or other materials provided with the
* distribution.
* * Neither the name of Google Inc. nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
#include <grpc/support/port_platform.h>
#ifdef GPR_CPU_LINUX
#include "src/core/support/cpu.h"
#define _GNU_SOURCE
#define __USE_GNU
#define __USE_MISC
#include <sched.h>
#undef _GNU_SOURCE
#undef __USE_GNU
#undef __USE_MISC
#include <errno.h>
#include <unistd.h>
#include <string.h>
#include <grpc/support/log.h>
int gpr_cpu_num_cores() {
static int ncpus = 0;
if (ncpus == 0) {
ncpus = sysconf(_SC_NPROCESSORS_ONLN);
if (ncpus < 1) {
gpr_log(GPR_ERROR, "Cannot determine number of CPUs: assuming 1");
ncpus = 1;
}
}
return ncpus;
}
int gpr_cpu_current_cpu() {
int cpu = sched_getcpu();
if (cpu < 0) {
gpr_log(GPR_ERROR, "Error determining current CPU: %s\n", strerror(errno));
return 0;
}
return cpu;
}
#endif /* GPR_CPU_LINUX */
...@@ -31,16 +31,11 @@ ...@@ -31,16 +31,11 @@
* *
*/ */
#include "src/core/support/cpu.h" #include <grpc/support/port_platform.h>
#ifdef GPR_CPU_POSIX
#ifdef __linux__ #include "src/core/support/cpu.h"
#define _GNU_SOURCE
#define __USE_GNU
#define __USE_MISC
#include <sched.h>
#undef _GNU_SOURCE
#undef __USE_GNU
#undef __USE_MISC
#include <errno.h> #include <errno.h>
#include <unistd.h> #include <unistd.h>
...@@ -48,6 +43,8 @@ ...@@ -48,6 +43,8 @@
#include <grpc/support/log.h> #include <grpc/support/log.h>
static __thread char magic_thread_local;
int gpr_cpu_num_cores() { int gpr_cpu_num_cores() {
static int ncpus = 0; static int ncpus = 0;
if (ncpus == 0) { if (ncpus == 0) {
...@@ -60,13 +57,18 @@ int gpr_cpu_num_cores() { ...@@ -60,13 +57,18 @@ int gpr_cpu_num_cores() {
return ncpus; return ncpus;
} }
/* This is a cheap, but good enough, pointer hash for sharding things: */
static size_t shard_ptr(const void *info) {
size_t x = (size_t)info;
return ((x >> 4) ^ (x >> 9) ^ (x >> 14)) % gpr_cpu_num_cores();
}
int gpr_cpu_current_cpu() { int gpr_cpu_current_cpu() {
int cpu = sched_getcpu(); /* NOTE: there's no way I know to return the actual cpu index portably...
if (cpu < 0) { most code that's using this is using it to shard across work queues though,
gpr_log(GPR_ERROR, "Error determining current CPU: %s\n", strerror(errno)); so here we use thread identity instead to achieve a similar though not
return 0; identical effect */
} return shard_ptr(&magic_thread_local);
return cpu;
} }
#endif /* __linux__ */ #endif /* GPR_CPU_LINUX */
...@@ -111,6 +111,8 @@ ...@@ -111,6 +111,8 @@
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\core\support\cmdline.c"> <ClCompile Include="..\..\src\core\support\cmdline.c">
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\core\support\cpu_linux.c">
</ClCompile>
<ClCompile Include="..\..\src\core\support\cpu_posix.c"> <ClCompile Include="..\..\src\core\support\cpu_posix.c">
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\core\support\histogram.c"> <ClCompile Include="..\..\src\core\support\histogram.c">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment