From 6dfa7e6ea3dbe23923b2a32b0c976d5004a0d11d Mon Sep 17 00:00:00 2001
From: Vijay Pai <vpai@google.com>
Date: Mon, 13 Apr 2015 10:41:40 -0700
Subject: [PATCH] Move files to a new "profiling" directory to better
distinguish from census statistics
---
BUILD | 8 ++++----
Makefile | 14 +++++++-------
build.json | 6 +++---
src/core/{statistics => profiling}/timers.c | 0
src/core/{statistics => profiling}/timers.h | 0
src/core/surface/init.c | 2 +-
test/core/{statistics => profiling}/timers_test.c | 2 +-
tools/run_tests/tests.json | 5 +++++
8 files changed, 21 insertions(+), 16 deletions(-)
rename src/core/{statistics => profiling}/timers.c (100%)
rename src/core/{statistics => profiling}/timers.h (100%)
rename test/core/{statistics => profiling}/timers_test.c (98%)
diff --git a/BUILD b/BUILD
index 599a84674d..5372cf23ba 100644
--- a/BUILD
+++ b/BUILD
@@ -186,12 +186,12 @@ cc_library(
"src/core/json/json_common.h",
"src/core/json/json_reader.h",
"src/core/json/json_writer.h",
+ "src/core/profiling/timers.h",
"src/core/statistics/census_interface.h",
"src/core/statistics/census_log.h",
"src/core/statistics/census_rpc_stats.h",
"src/core/statistics/census_tracing.h",
"src/core/statistics/hash_table.h",
- "src/core/statistics/timers.h",
"src/core/statistics/window_stats.h",
"src/core/surface/byte_buffer_queue.h",
"src/core/surface/call.h",
@@ -298,12 +298,12 @@ cc_library(
"src/core/json/json_reader.c",
"src/core/json/json_string.c",
"src/core/json/json_writer.c",
+ "src/core/profiling/timers.c",
"src/core/statistics/census_init.c",
"src/core/statistics/census_log.c",
"src/core/statistics/census_rpc_stats.c",
"src/core/statistics/census_tracing.c",
"src/core/statistics/hash_table.c",
- "src/core/statistics/timers.c",
"src/core/statistics/window_stats.c",
"src/core/surface/byte_buffer.c",
"src/core/surface/byte_buffer_queue.c",
@@ -415,12 +415,12 @@ cc_library(
"src/core/json/json_common.h",
"src/core/json/json_reader.h",
"src/core/json/json_writer.h",
+ "src/core/profiling/timers.h",
"src/core/statistics/census_interface.h",
"src/core/statistics/census_log.h",
"src/core/statistics/census_rpc_stats.h",
"src/core/statistics/census_tracing.h",
"src/core/statistics/hash_table.h",
- "src/core/statistics/timers.h",
"src/core/statistics/window_stats.h",
"src/core/surface/byte_buffer_queue.h",
"src/core/surface/call.h",
@@ -507,12 +507,12 @@ cc_library(
"src/core/json/json_reader.c",
"src/core/json/json_string.c",
"src/core/json/json_writer.c",
+ "src/core/profiling/timers.c",
"src/core/statistics/census_init.c",
"src/core/statistics/census_log.c",
"src/core/statistics/census_rpc_stats.c",
"src/core/statistics/census_tracing.c",
"src/core/statistics/hash_table.c",
- "src/core/statistics/timers.c",
"src/core/statistics/window_stats.c",
"src/core/surface/byte_buffer.c",
"src/core/surface/byte_buffer_queue.c",
diff --git a/Makefile b/Makefile
index 486df3c32e..f44833ae21 100644
--- a/Makefile
+++ b/Makefile
@@ -2636,12 +2636,12 @@ LIBGRPC_SRC = \
src/core/json/json_reader.c \
src/core/json/json_string.c \
src/core/json/json_writer.c \
+ src/core/profiling/timers.c \
src/core/statistics/census_init.c \
src/core/statistics/census_log.c \
src/core/statistics/census_rpc_stats.c \
src/core/statistics/census_tracing.c \
src/core/statistics/hash_table.c \
- src/core/statistics/timers.c \
src/core/statistics/window_stats.c \
src/core/surface/byte_buffer.c \
src/core/surface/byte_buffer_queue.c \
@@ -2784,12 +2784,12 @@ src/core/json/json.c: $(OPENSSL_DEP)
src/core/json/json_reader.c: $(OPENSSL_DEP)
src/core/json/json_string.c: $(OPENSSL_DEP)
src/core/json/json_writer.c: $(OPENSSL_DEP)
+src/core/profiling/timers.c: $(OPENSSL_DEP)
src/core/statistics/census_init.c: $(OPENSSL_DEP)
src/core/statistics/census_log.c: $(OPENSSL_DEP)
src/core/statistics/census_rpc_stats.c: $(OPENSSL_DEP)
src/core/statistics/census_tracing.c: $(OPENSSL_DEP)
src/core/statistics/hash_table.c: $(OPENSSL_DEP)
-src/core/statistics/timers.c: $(OPENSSL_DEP)
src/core/statistics/window_stats.c: $(OPENSSL_DEP)
src/core/surface/byte_buffer.c: $(OPENSSL_DEP)
src/core/surface/byte_buffer_queue.c: $(OPENSSL_DEP)
@@ -2948,12 +2948,12 @@ $(OBJDIR)/$(CONFIG)/src/core/json/json.o:
$(OBJDIR)/$(CONFIG)/src/core/json/json_reader.o:
$(OBJDIR)/$(CONFIG)/src/core/json/json_string.o:
$(OBJDIR)/$(CONFIG)/src/core/json/json_writer.o:
+$(OBJDIR)/$(CONFIG)/src/core/profiling/timers.o:
$(OBJDIR)/$(CONFIG)/src/core/statistics/census_init.o:
$(OBJDIR)/$(CONFIG)/src/core/statistics/census_log.o:
$(OBJDIR)/$(CONFIG)/src/core/statistics/census_rpc_stats.o:
$(OBJDIR)/$(CONFIG)/src/core/statistics/census_tracing.o:
$(OBJDIR)/$(CONFIG)/src/core/statistics/hash_table.o:
-$(OBJDIR)/$(CONFIG)/src/core/statistics/timers.o:
$(OBJDIR)/$(CONFIG)/src/core/statistics/window_stats.o:
$(OBJDIR)/$(CONFIG)/src/core/surface/byte_buffer.o:
$(OBJDIR)/$(CONFIG)/src/core/surface/byte_buffer_queue.o:
@@ -3125,12 +3125,12 @@ LIBGRPC_UNSECURE_SRC = \
src/core/json/json_reader.c \
src/core/json/json_string.c \
src/core/json/json_writer.c \
+ src/core/profiling/timers.c \
src/core/statistics/census_init.c \
src/core/statistics/census_log.c \
src/core/statistics/census_rpc_stats.c \
src/core/statistics/census_tracing.c \
src/core/statistics/hash_table.c \
- src/core/statistics/timers.c \
src/core/statistics/window_stats.c \
src/core/surface/byte_buffer.c \
src/core/surface/byte_buffer_queue.c \
@@ -3266,12 +3266,12 @@ $(OBJDIR)/$(CONFIG)/src/core/json/json.o:
$(OBJDIR)/$(CONFIG)/src/core/json/json_reader.o:
$(OBJDIR)/$(CONFIG)/src/core/json/json_string.o:
$(OBJDIR)/$(CONFIG)/src/core/json/json_writer.o:
+$(OBJDIR)/$(CONFIG)/src/core/profiling/timers.o:
$(OBJDIR)/$(CONFIG)/src/core/statistics/census_init.o:
$(OBJDIR)/$(CONFIG)/src/core/statistics/census_log.o:
$(OBJDIR)/$(CONFIG)/src/core/statistics/census_rpc_stats.o:
$(OBJDIR)/$(CONFIG)/src/core/statistics/census_tracing.o:
$(OBJDIR)/$(CONFIG)/src/core/statistics/hash_table.o:
-$(OBJDIR)/$(CONFIG)/src/core/statistics/timers.o:
$(OBJDIR)/$(CONFIG)/src/core/statistics/window_stats.o:
$(OBJDIR)/$(CONFIG)/src/core/surface/byte_buffer.o:
$(OBJDIR)/$(CONFIG)/src/core/surface/byte_buffer_queue.o:
@@ -8160,7 +8160,7 @@ endif
TIMERS_TEST_SRC = \
- test/core/statistics/timers_test.c \
+ test/core/profiling/timers_test.c \
TIMERS_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(TIMERS_TEST_SRC))))
@@ -8179,7 +8179,7 @@ $(BINDIR)/$(CONFIG)/timers_test: $(TIMERS_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc
endif
-$(OBJDIR)/$(CONFIG)/test/core/statistics/timers_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/profiling/timers_test.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
deps_timers_test: $(TIMERS_TEST_OBJS:.o=.dep)
diff --git a/build.json b/build.json
index 577324620c..c8654891a0 100644
--- a/build.json
+++ b/build.json
@@ -137,12 +137,12 @@
"src/core/json/json_common.h",
"src/core/json/json_reader.h",
"src/core/json/json_writer.h",
+ "src/core/profiling/timers.h",
"src/core/statistics/census_interface.h",
"src/core/statistics/census_log.h",
"src/core/statistics/census_rpc_stats.h",
"src/core/statistics/census_tracing.h",
"src/core/statistics/hash_table.h",
- "src/core/statistics/timers.h",
"src/core/statistics/window_stats.h",
"src/core/surface/byte_buffer_queue.h",
"src/core/surface/call.h",
@@ -230,12 +230,12 @@
"src/core/json/json_reader.c",
"src/core/json/json_string.c",
"src/core/json/json_writer.c",
+ "src/core/profiling/timers.c",
"src/core/statistics/census_init.c",
"src/core/statistics/census_log.c",
"src/core/statistics/census_rpc_stats.c",
"src/core/statistics/census_tracing.c",
"src/core/statistics/hash_table.c",
- "src/core/statistics/timers.c",
"src/core/statistics/window_stats.c",
"src/core/surface/byte_buffer.c",
"src/core/surface/byte_buffer_queue.c",
@@ -1726,7 +1726,7 @@
"build": "test",
"language": "c",
"src": [
- "test/core/statistics/timers_test.c"
+ "test/core/profiling/timers_test.c"
],
"deps": [
"grpc_test_util",
diff --git a/src/core/statistics/timers.c b/src/core/profiling/timers.c
similarity index 100%
rename from src/core/statistics/timers.c
rename to src/core/profiling/timers.c
diff --git a/src/core/statistics/timers.h b/src/core/profiling/timers.h
similarity index 100%
rename from src/core/statistics/timers.h
rename to src/core/profiling/timers.h
diff --git a/src/core/surface/init.c b/src/core/surface/init.c
index 5d0eaadf1c..4de51a666f 100644
--- a/src/core/surface/init.c
+++ b/src/core/surface/init.c
@@ -36,7 +36,7 @@
#include "src/core/debug/trace.h"
#include "src/core/iomgr/iomgr.h"
#include "src/core/statistics/census_interface.h"
-#include "src/core/statistics/timers.h"
+#include "src/core/profiling/timers.h"
#include "src/core/surface/call.h"
#include "src/core/surface/init.h"
#include "src/core/surface/surface_trace.h"
diff --git a/test/core/statistics/timers_test.c b/test/core/profiling/timers_test.c
similarity index 98%
rename from test/core/statistics/timers_test.c
rename to test/core/profiling/timers_test.c
index efd90ed728..b7219d7859 100644
--- a/test/core/statistics/timers_test.c
+++ b/test/core/profiling/timers_test.c
@@ -31,7 +31,7 @@
*
*/
-#include "src/core/statistics/timers.h"
+#include "src/core/profiling/timers.h"
#include <stdlib.h>
#include "test/core/util/test_config.h"
diff --git a/tools/run_tests/tests.json b/tools/run_tests/tests.json
index b25616474d..605f7180fc 100644
--- a/tools/run_tests/tests.json
+++ b/tools/run_tests/tests.json
@@ -331,6 +331,11 @@
"language": "c",
"name": "timeout_encoding_test"
},
+ {
+ "flaky": false,
+ "language": "c",
+ "name": "timers_test"
+ },
{
"flaky": false,
"language": "c",
--
GitLab