Skip to content

Commit

Permalink
rename census log files to avoid build breakage on MacOS
Browse files Browse the repository at this point in the history
  • Loading branch information
@a-veitch
a-veitch committed Feb 22, 2016
1 parent 4f27450 commit 7771544
Show file tree
Hide file tree
Showing 19 changed files with 47 additions and 45 deletions.
12 changes: 6 additions & 6 deletions BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ cc_library(
"src/core/tsi/transport_security.h",
"src/core/tsi/transport_security_interface.h",
"src/core/census/aggregation.h",
"src/core/census/log.h",
"src/core/census/mlog.h",
"src/core/census/rpc_metric_id.h",
"src/core/census/grpc_context.c",
"src/core/census/grpc_filter.c",
Expand Down Expand Up @@ -436,7 +436,7 @@ cc_library(
"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",
Expand Down Expand Up @@ -589,7 +589,7 @@ cc_library(
"src/core/transport/transport.h",
"src/core/transport/transport_impl.h",
"src/core/census/aggregation.h",
"src/core/census/log.h",
"src/core/census/mlog.h",
"src/core/census/rpc_metric_id.h",
"src/core/surface/init_unsecure.c",
"src/core/census/grpc_context.c",
Expand Down Expand Up @@ -722,7 +722,7 @@ cc_library(
"src/core/transport/transport_op_string.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",
Expand Down Expand Up @@ -1400,7 +1400,7 @@ objc_library(
"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",
Expand Down Expand Up @@ -1548,7 +1548,7 @@ objc_library(
"src/core/tsi/transport_security.h",
"src/core/tsi/transport_security_interface.h",
"src/core/census/aggregation.h",
"src/core/census/log.h",
"src/core/census/mlog.h",
"src/core/census/rpc_metric_id.h",
],
includes = [
Expand Down
8 changes: 4 additions & 4 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2469,7 +2469,7 @@ LIBGRPC_SRC = \
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 \
Expand Down Expand Up @@ -2792,7 +2792,7 @@ LIBGRPC_UNSECURE_SRC = \
src/core/transport/transport_op_string.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 \
Expand Down Expand Up @@ -5877,7 +5877,7 @@ endif


CENSUS_LOG_TEST_SRC = \
test/core/census/log_test.c \
test/core/census/mlog_test.c \

CENSUS_LOG_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(CENSUS_LOG_TEST_SRC))))
ifeq ($(NO_SECURE),true)
Expand All @@ -5897,7 +5897,7 @@ $(BINDIR)/$(CONFIG)/census_log_test: $(CENSUS_LOG_TEST_OBJS) $(LIBDIR)/$(CONFIG)

endif

$(OBJDIR)/$(CONFIG)/test/core/census/log_test.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
$(OBJDIR)/$(CONFIG)/test/core/census/mlog_test.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a

deps_census_log_test: $(CENSUS_LOG_TEST_OBJS:.o=.dep)

Expand Down
2 changes: 1 addition & 1 deletion binding.gyp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -708,7 +708,7 @@
'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',
Expand Down
6 changes: 3 additions & 3 deletions build.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ filegroups:
- include/grpc/census.h
headers:
- src/core/census/aggregation.h
- src/core/census/log.h
- src/core/census/mlog.h
- src/core/census/rpc_metric_id.h
src:
- 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
Expand Down Expand Up @@ -982,7 +982,7 @@ targets:
build: test
language: c
src:
- test/core/census/log_test.c
- test/core/census/mlog_test.c
deps:
- grpc_test_util
- grpc
Expand Down
6 changes: 3 additions & 3 deletions gRPC.podspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ Pod::Spec.new do |s|
'src/core/tsi/transport_security.h',
'src/core/tsi/transport_security_interface.h',
'src/core/census/aggregation.h',
'src/core/census/log.h',
'src/core/census/mlog.h',
'src/core/census/rpc_metric_id.h',
'include/grpc/grpc_security.h',
'include/grpc/impl/codegen/byte_buffer.h',
Expand Down Expand Up @@ -453,7 +453,7 @@ Pod::Spec.new do |s|
'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'
Expand Down Expand Up @@ -597,7 +597,7 @@ Pod::Spec.new do |s|
'src/core/tsi/transport_security.h',
'src/core/tsi/transport_security_interface.h',
'src/core/census/aggregation.h',
'src/core/census/log.h',
'src/core/census/mlog.h',
'src/core/census/rpc_metric_id.h'

ss.header_mappings_dir = '.'
Expand Down
4 changes: 2 additions & 2 deletions grpc.gemspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ Gem::Specification.new do |s|
s.files += %w( src/core/tsi/transport_security.h )
s.files += %w( src/core/tsi/transport_security_interface.h )
s.files += %w( src/core/census/aggregation.h )
s.files += %w( src/core/census/log.h )
s.files += %w( src/core/census/mlog.h )
s.files += %w( src/core/census/rpc_metric_id.h )
s.files += %w( src/core/census/grpc_context.c )
s.files += %w( src/core/census/grpc_filter.c )
Expand Down Expand Up @@ -436,7 +436,7 @@ Gem::Specification.new do |s|
s.files += %w( src/core/tsi/transport_security.c )
s.files += %w( src/core/census/context.c )
s.files += %w( src/core/census/initialize.c )
s.files += %w( src/core/census/log.c )
s.files += %w( src/core/census/mlog.c )
s.files += %w( src/core/census/operation.c )
s.files += %w( src/core/census/placeholders.c )
s.files += %w( src/core/census/tracing.c )
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@
"src/core/tsi/transport_security.h",
"src/core/tsi/transport_security_interface.h",
"src/core/census/aggregation.h",
"src/core/census/log.h",
"src/core/census/mlog.h",
"src/core/census/rpc_metric_id.h",
"src/core/census/grpc_context.c",
"src/core/census/grpc_filter.c",
Expand Down Expand Up @@ -381,7 +381,7 @@
"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",
Expand Down
2 changes: 1 addition & 1 deletion src/core/census/log.c → src/core/census/mlog.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 4 additions & 2 deletions src/core/census/log.h → src/core/census/mlog.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/python/grpcio/grpc_core_dependencies.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@
'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',
Expand Down
2 changes: 1 addition & 1 deletion test/core/census/log_test.c → test/core/census/mlog_test.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
*
*/

#include "src/core/census/log.h"
#include "src/core/census/mlog.h"
#include <grpc/support/cpu.h>
#include <grpc/support/log.h>
#include <grpc/support/port_platform.h>
Expand Down
4 changes: 2 additions & 2 deletions tools/doxygen/Doxyfile.core.internal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -902,7 +902,7 @@ src/core/tsi/ssl_types.h \
src/core/tsi/transport_security.h \
src/core/tsi/transport_security_interface.h \
src/core/census/aggregation.h \
src/core/census/log.h \
src/core/census/mlog.h \
src/core/census/rpc_metric_id.h \
src/core/census/grpc_context.c \
src/core/census/grpc_filter.c \
Expand Down Expand Up @@ -1055,7 +1055,7 @@ src/core/tsi/ssl_transport_security.c \
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 \
Expand Down
14 changes: 7 additions & 7 deletions tools/run_tests/sources_and_headers.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
"language": "c",
"name": "census_log_test",
"src": [
"test/core/census/log_test.c"
"test/core/census/mlog_test.c"
]
},
{
Expand Down Expand Up @@ -2983,7 +2983,7 @@
"include/grpc/status.h",
"src/core/census/aggregation.h",
"src/core/census/grpc_filter.h",
"src/core/census/log.h",
"src/core/census/mlog.h",
"src/core/census/rpc_metric_id.h",
"src/core/channel/channel_args.h",
"src/core/channel/channel_stack.h",
Expand Down Expand Up @@ -3135,8 +3135,8 @@
"src/core/census/grpc_filter.c",
"src/core/census/grpc_filter.h",
"src/core/census/initialize.c",
"src/core/census/log.c",
"src/core/census/log.h",
"src/core/census/mlog.c",
"src/core/census/mlog.h",
"src/core/census/operation.c",
"src/core/census/placeholders.c",
"src/core/census/rpc_metric_id.h",
Expand Down Expand Up @@ -3524,7 +3524,7 @@
"include/grpc/status.h",
"src/core/census/aggregation.h",
"src/core/census/grpc_filter.h",
"src/core/census/log.h",
"src/core/census/mlog.h",
"src/core/census/rpc_metric_id.h",
"src/core/channel/channel_args.h",
"src/core/channel/channel_stack.h",
Expand Down Expand Up @@ -3661,8 +3661,8 @@
"src/core/census/grpc_filter.c",
"src/core/census/grpc_filter.h",
"src/core/census/initialize.c",
"src/core/census/log.c",
"src/core/census/log.h",
"src/core/census/mlog.c",
"src/core/census/mlog.h",
"src/core/census/operation.c",
"src/core/census/placeholders.c",
"src/core/census/rpc_metric_id.h",
Expand Down
4 changes: 2 additions & 2 deletions vsprojects/vcxproj/grpc/grpc.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@
<ClInclude Include="$(SolutionDir)\..\src\core\tsi\transport_security.h" />
<ClInclude Include="$(SolutionDir)\..\src\core\tsi\transport_security_interface.h" />
<ClInclude Include="$(SolutionDir)\..\src\core\census\aggregation.h" />
<ClInclude Include="$(SolutionDir)\..\src\core\census\log.h" />
<ClInclude Include="$(SolutionDir)\..\src\core\census\mlog.h" />
<ClInclude Include="$(SolutionDir)\..\src\core\census\rpc_metric_id.h" />
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -717,7 +717,7 @@
</ClCompile>
<ClCompile Include="$(SolutionDir)\..\src\core\census\initialize.c">
</ClCompile>
<ClCompile Include="$(SolutionDir)\..\src\core\census\log.c">
<ClCompile Include="$(SolutionDir)\..\src\core\census\mlog.c">
</ClCompile>
<ClCompile Include="$(SolutionDir)\..\src\core\census\operation.c">
</ClCompile>
Expand Down
4 changes: 2 additions & 2 deletions vsprojects/vcxproj/grpc/grpc.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@
<ClCompile Include="$(SolutionDir)\..\src\core\census\initialize.c">
<Filter>src\core\census</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)\..\src\core\census\log.c">
<ClCompile Include="$(SolutionDir)\..\src\core\census\mlog.c">
<Filter>src\core\census</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)\..\src\core\census\operation.c">
Expand Down Expand Up @@ -896,7 +896,7 @@
<ClInclude Include="$(SolutionDir)\..\src\core\census\aggregation.h">
<Filter>src\core\census</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)\..\src\core\census\log.h">
<ClInclude Include="$(SolutionDir)\..\src\core\census\mlog.h">
<Filter>src\core\census</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)\..\src\core\census\rpc_metric_id.h">
Expand Down
4 changes: 2 additions & 2 deletions vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@
<ClInclude Include="$(SolutionDir)\..\src\core\transport\transport.h" />
<ClInclude Include="$(SolutionDir)\..\src\core\transport\transport_impl.h" />
<ClInclude Include="$(SolutionDir)\..\src\core\census\aggregation.h" />
<ClInclude Include="$(SolutionDir)\..\src\core\census\log.h" />
<ClInclude Include="$(SolutionDir)\..\src\core\census\mlog.h" />
<ClInclude Include="$(SolutionDir)\..\src\core\census\rpc_metric_id.h" />
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -653,7 +653,7 @@
</ClCompile>
<ClCompile Include="$(SolutionDir)\..\src\core\census\initialize.c">
</ClCompile>
<ClCompile Include="$(SolutionDir)\..\src\core\census\log.c">
<ClCompile Include="$(SolutionDir)\..\src\core\census\mlog.c">
</ClCompile>
<ClCompile Include="$(SolutionDir)\..\src\core\census\operation.c">
</ClCompile>
Expand Down
4 changes: 2 additions & 2 deletions vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@
<ClCompile Include="$(SolutionDir)\..\src\core\census\initialize.c">
<Filter>src\core\census</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)\..\src\core\census\log.c">
<ClCompile Include="$(SolutionDir)\..\src\core\census\mlog.c">
<Filter>src\core\census</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)\..\src\core\census\operation.c">
Expand Down Expand Up @@ -791,7 +791,7 @@
<ClInclude Include="$(SolutionDir)\..\src\core\census\aggregation.h">
<Filter>src\core\census</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)\..\src\core\census\log.h">
<ClInclude Include="$(SolutionDir)\..\src\core\census\mlog.h">
<Filter>src\core\census</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)\..\src\core\census\rpc_metric_id.h">
Expand Down
2 changes: 1 addition & 1 deletion vsprojects/vcxproj/test/census_log_test/census_log_test.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@
</ItemDefinitionGroup>

<ItemGroup>
<ClCompile Include="$(SolutionDir)\..\test\core\census\log_test.c">
<ClCompile Include="$(SolutionDir)\..\test\core\census\mlog_test.c">
</ClCompile>
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion vsprojects/vcxproj/test/census_log_test/census_log_test.vcxproj.filters
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClCompile Include="$(SolutionDir)\..\test\core\census\log_test.c">
<ClCompile Include="$(SolutionDir)\..\test\core\census\mlog_test.c">
<Filter>test\core\census</Filter>
</ClCompile>
</ItemGroup>
Expand Down

0 comments on commit 7771544

Please sign in to comment.