diff options
| author |  Alistair Veitch <aveitch@google.com> | 2016-02-22 14:20:25 -0800 |
|---|---|---|
| committer | Alistair Veitch <aveitch@google.com> | 2016-02-22 14:20:25 -0800 |
| commit | 777154411167400e19201bc32dce4eccbae1a55b (patch) | |
| tree | e447e9e5d21f5a88915cabd331d66e4abb33455f /src | |
| parent | 4f2745030d981f65c6e135950b8686577142a508 (diff) | |
rename census log files to avoid build breakage on MacOS
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/census/mlog.c (renamed from src/core/census/log.c) | 2 | ||||
| -rw-r--r-- | src/core/census/mlog.h (renamed from src/core/census/log.h) | 6 | ||||
| -rw-r--r-- | src/python/grpcio/grpc_core_dependencies.py | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/core/census/log.c b/src/core/census/mlog.c index 91b26941b8..a2cc46d3f2 100644 --- a/src/core/census/log.c +++ b/src/core/census/mlog.c @@ -88,7 +88,7 @@ // include the name of the structure, which will be passed as the first // argument. E.g. cl_block_initialize() will initialize a cl_block. -#include "src/core/census/log.h" +#include "src/core/census/mlog.h" #include <grpc/support/alloc.h> #include <grpc/support/atm.h> #include <grpc/support/cpu.h> diff --git a/src/core/census/log.h b/src/core/census/mlog.h index 05daea066f..aaba9e1535 100644 --- a/src/core/census/log.h +++ b/src/core/census/mlog.h @@ -31,8 +31,10 @@ * */ -#ifndef GRPC_INTERNAL_CORE_CENSUS_LOG_H -#define GRPC_INTERNAL_CORE_CENSUS_LOG_H +/* A very fast in-memory log, optimized for multiple writers. */ + +#ifndef GRPC_INTERNAL_CORE_CENSUS_MLOG_H +#define GRPC_INTERNAL_CORE_CENSUS_MLOG_H #include <grpc/support/port_platform.h> #include <stddef.h> diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py index f43ac5c0a5..a002a5a0a8 100644 --- a/src/python/grpcio/grpc_core_dependencies.py +++ b/src/python/grpcio/grpc_core_dependencies.py @@ -224,7 +224,7 @@ CORE_SOURCE_FILES = [ 'src/core/tsi/transport_security.c', 'src/core/census/context.c', 'src/core/census/initialize.c', - 'src/core/census/log.c', + 'src/core/census/mlog.c', 'src/core/census/operation.c', 'src/core/census/placeholders.c', 'src/core/census/tracing.c', |