diff --git a/BUILD b/BUILD index 55d4002b2c6..05d3cce9407 100644 --- a/BUILD +++ b/BUILD @@ -2189,7 +2189,6 @@ grpc_cc_library( grpc_cc_library( name = "iomgr_timer", srcs = [ - "src/core/lib/iomgr/time_averaged_stats.cc", "src/core/lib/iomgr/timer.cc", "src/core/lib/iomgr/timer_generic.cc", "src/core/lib/iomgr/timer_heap.cc", @@ -2200,7 +2199,6 @@ grpc_cc_library( "src/core/lib/iomgr/timer_generic.h", "src/core/lib/iomgr/timer_heap.h", "src/core/lib/iomgr/timer_manager.h", - "src/core/lib/iomgr/time_averaged_stats.h", ] + [ # TODO(hork): deduplicate "src/core/lib/iomgr/iomgr.h", @@ -2218,6 +2216,7 @@ grpc_cc_library( "grpc_trace", "iomgr_port", "time", + "time_averaged_stats", "useful", ], ) @@ -2286,10 +2285,10 @@ grpc_cc_library( ) grpc_cc_library( - name = "iomgr_ee_time_averaged_stats", - srcs = ["src/core/lib/event_engine/iomgr_engine/time_averaged_stats.cc"], + name = "time_averaged_stats", + srcs = ["src/core/lib/gprpp/time_averaged_stats.cc"], hdrs = [ - "src/core/lib/event_engine/iomgr_engine/time_averaged_stats.h", + "src/core/lib/gprpp/time_averaged_stats.h", ], tags = ["grpc-autodeps"], deps = ["gpr_base"], @@ -2313,8 +2312,8 @@ grpc_cc_library( deps = [ "event_engine_base_hdrs", "gpr_base", - "iomgr_ee_time_averaged_stats", "time", + "time_averaged_stats", "useful", ], ) diff --git a/CMakeLists.txt b/CMakeLists.txt index 676aea102db..dfa908a094b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -831,7 +831,6 @@ if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) add_dependencies(buildtests_c tcp_server_posix_test) endif() - add_dependencies(buildtests_c test_core_iomgr_time_averaged_stats_test) add_dependencies(buildtests_c test_core_iomgr_timer_heap_test) add_dependencies(buildtests_c test_core_iomgr_timer_list_test) @@ -1166,7 +1165,6 @@ if(gRPC_BUILD_TESTS) add_dependencies(buildtests_cxx sync_test) add_dependencies(buildtests_cxx system_roots_test) add_dependencies(buildtests_cxx table_test) - add_dependencies(buildtests_cxx test_core_event_engine_iomgr_event_engine_time_averaged_stats_test) add_dependencies(buildtests_cxx test_core_event_engine_iomgr_event_engine_timer_heap_test) add_dependencies(buildtests_cxx test_core_event_engine_iomgr_event_engine_timer_list_test) add_dependencies(buildtests_cxx test_core_event_engine_slice_buffer_test) @@ -2072,7 +2070,6 @@ add_library(grpc src/core/lib/event_engine/event_engine.cc src/core/lib/event_engine/iomgr_engine/iomgr_engine.cc src/core/lib/event_engine/iomgr_engine/thread_pool.cc - src/core/lib/event_engine/iomgr_engine/time_averaged_stats.cc src/core/lib/event_engine/iomgr_engine/timer.cc src/core/lib/event_engine/iomgr_engine/timer_heap.cc src/core/lib/event_engine/iomgr_engine/timer_manager.cc @@ -2083,6 +2080,7 @@ add_library(grpc src/core/lib/event_engine/trace.cc src/core/lib/gprpp/status_helper.cc src/core/lib/gprpp/time.cc + src/core/lib/gprpp/time_averaged_stats.cc src/core/lib/gprpp/work_serializer.cc src/core/lib/http/format_request.cc src/core/lib/http/httpcli.cc @@ -2150,7 +2148,6 @@ add_library(grpc src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc src/core/lib/iomgr/tcp_server_windows.cc src/core/lib/iomgr/tcp_windows.cc - src/core/lib/iomgr/time_averaged_stats.cc src/core/lib/iomgr/timer.cc src/core/lib/iomgr/timer_generic.cc src/core/lib/iomgr/timer_heap.cc @@ -2701,7 +2698,6 @@ add_library(grpc_unsecure src/core/lib/event_engine/event_engine.cc src/core/lib/event_engine/iomgr_engine/iomgr_engine.cc src/core/lib/event_engine/iomgr_engine/thread_pool.cc - src/core/lib/event_engine/iomgr_engine/time_averaged_stats.cc src/core/lib/event_engine/iomgr_engine/timer.cc src/core/lib/event_engine/iomgr_engine/timer_heap.cc src/core/lib/event_engine/iomgr_engine/timer_manager.cc @@ -2712,6 +2708,7 @@ add_library(grpc_unsecure src/core/lib/event_engine/trace.cc src/core/lib/gprpp/status_helper.cc src/core/lib/gprpp/time.cc + src/core/lib/gprpp/time_averaged_stats.cc src/core/lib/gprpp/work_serializer.cc src/core/lib/http/format_request.cc src/core/lib/http/httpcli.cc @@ -2778,7 +2775,6 @@ add_library(grpc_unsecure src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc src/core/lib/iomgr/tcp_server_windows.cc src/core/lib/iomgr/tcp_windows.cc - src/core/lib/iomgr/time_averaged_stats.cc src/core/lib/iomgr/timer.cc src/core/lib/iomgr/timer_generic.cc src/core/lib/iomgr/timer_heap.cc @@ -5061,33 +5057,6 @@ endif() endif() if(gRPC_BUILD_TESTS) -add_executable(test_core_iomgr_time_averaged_stats_test - test/core/iomgr/time_averaged_stats_test.cc -) - -target_include_directories(test_core_iomgr_time_averaged_stats_test - PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/include - ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_RE2_INCLUDE_DIR} - ${_gRPC_SSL_INCLUDE_DIR} - ${_gRPC_UPB_GENERATED_DIR} - ${_gRPC_UPB_GRPC_GENERATED_DIR} - ${_gRPC_UPB_INCLUDE_DIR} - ${_gRPC_XXHASH_INCLUDE_DIR} - ${_gRPC_ZLIB_INCLUDE_DIR} -) - -target_link_libraries(test_core_iomgr_time_averaged_stats_test - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_test_util -) - - -endif() -if(gRPC_BUILD_TESTS) - add_executable(test_core_iomgr_timer_heap_test test/core/iomgr/timer_heap_test.cc ) @@ -16657,100 +16626,10 @@ target_link_libraries(table_test ) -endif() -if(gRPC_BUILD_TESTS) - -add_executable(test_core_event_engine_iomgr_event_engine_time_averaged_stats_test - src/core/lib/event_engine/iomgr_engine/time_averaged_stats.cc - src/core/lib/gpr/alloc.cc - src/core/lib/gpr/atm.cc - src/core/lib/gpr/cpu_iphone.cc - src/core/lib/gpr/cpu_linux.cc - src/core/lib/gpr/cpu_posix.cc - src/core/lib/gpr/cpu_windows.cc - src/core/lib/gpr/env_linux.cc - src/core/lib/gpr/env_posix.cc - src/core/lib/gpr/env_windows.cc - src/core/lib/gpr/log.cc - src/core/lib/gpr/log_android.cc - src/core/lib/gpr/log_linux.cc - src/core/lib/gpr/log_posix.cc - src/core/lib/gpr/log_windows.cc - src/core/lib/gpr/murmur_hash.cc - src/core/lib/gpr/string.cc - src/core/lib/gpr/string_posix.cc - src/core/lib/gpr/string_util_windows.cc - src/core/lib/gpr/string_windows.cc - src/core/lib/gpr/sync.cc - src/core/lib/gpr/sync_abseil.cc - src/core/lib/gpr/sync_posix.cc - src/core/lib/gpr/sync_windows.cc - src/core/lib/gpr/time.cc - src/core/lib/gpr/time_posix.cc - src/core/lib/gpr/time_precise.cc - src/core/lib/gpr/time_windows.cc - src/core/lib/gpr/tmpfile_msys.cc - src/core/lib/gpr/tmpfile_posix.cc - src/core/lib/gpr/tmpfile_windows.cc - src/core/lib/gpr/wrap_memcpy.cc - src/core/lib/gprpp/examine_stack.cc - src/core/lib/gprpp/fork.cc - src/core/lib/gprpp/global_config_env.cc - src/core/lib/gprpp/host_port.cc - src/core/lib/gprpp/mpscq.cc - src/core/lib/gprpp/stat_posix.cc - src/core/lib/gprpp/stat_windows.cc - src/core/lib/gprpp/thd_posix.cc - src/core/lib/gprpp/thd_windows.cc - src/core/lib/gprpp/time_util.cc - src/core/lib/profiling/basic_timers.cc - src/core/lib/profiling/stap_timers.cc - test/core/event_engine/iomgr_event_engine/time_averaged_stats_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc -) - -target_include_directories(test_core_event_engine_iomgr_event_engine_time_averaged_stats_test - PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/include - ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_RE2_INCLUDE_DIR} - ${_gRPC_SSL_INCLUDE_DIR} - ${_gRPC_UPB_GENERATED_DIR} - ${_gRPC_UPB_GRPC_GENERATED_DIR} - ${_gRPC_UPB_INCLUDE_DIR} - ${_gRPC_XXHASH_INCLUDE_DIR} - ${_gRPC_ZLIB_INCLUDE_DIR} - third_party/googletest/googletest/include - third_party/googletest/googletest - third_party/googletest/googlemock/include - third_party/googletest/googlemock - ${_gRPC_PROTO_GENS_DIR} -) - -target_link_libraries(test_core_event_engine_iomgr_event_engine_time_averaged_stats_test - ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ALLTARGETS_LIBRARIES} - absl::base - absl::core_headers - absl::memory - absl::random_random - absl::status - absl::cord - absl::str_format - absl::strings - absl::synchronization - absl::time - absl::optional -) - - endif() if(gRPC_BUILD_TESTS) add_executable(test_core_event_engine_iomgr_event_engine_timer_heap_test - src/core/lib/event_engine/iomgr_engine/time_averaged_stats.cc src/core/lib/event_engine/iomgr_engine/timer.cc src/core/lib/event_engine/iomgr_engine/timer_heap.cc src/core/lib/gpr/alloc.cc @@ -16794,6 +16673,7 @@ add_executable(test_core_event_engine_iomgr_event_engine_timer_heap_test src/core/lib/gprpp/thd_posix.cc src/core/lib/gprpp/thd_windows.cc src/core/lib/gprpp/time.cc + src/core/lib/gprpp/time_averaged_stats.cc src/core/lib/gprpp/time_util.cc src/core/lib/profiling/basic_timers.cc src/core/lib/profiling/stap_timers.cc @@ -16844,7 +16724,6 @@ endif() if(gRPC_BUILD_TESTS) add_executable(test_core_event_engine_iomgr_event_engine_timer_list_test - src/core/lib/event_engine/iomgr_engine/time_averaged_stats.cc src/core/lib/event_engine/iomgr_engine/timer.cc src/core/lib/event_engine/iomgr_engine/timer_heap.cc src/core/lib/gpr/alloc.cc @@ -16888,6 +16767,7 @@ add_executable(test_core_event_engine_iomgr_event_engine_timer_list_test src/core/lib/gprpp/thd_posix.cc src/core/lib/gprpp/thd_windows.cc src/core/lib/gprpp/time.cc + src/core/lib/gprpp/time_averaged_stats.cc src/core/lib/gprpp/time_util.cc src/core/lib/profiling/basic_timers.cc src/core/lib/profiling/stap_timers.cc diff --git a/Makefile b/Makefile index caaa4d72379..bc0081894ea 100644 --- a/Makefile +++ b/Makefile @@ -1451,7 +1451,6 @@ LIBGRPC_SRC = \ src/core/lib/event_engine/event_engine.cc \ src/core/lib/event_engine/iomgr_engine/iomgr_engine.cc \ src/core/lib/event_engine/iomgr_engine/thread_pool.cc \ - src/core/lib/event_engine/iomgr_engine/time_averaged_stats.cc \ src/core/lib/event_engine/iomgr_engine/timer.cc \ src/core/lib/event_engine/iomgr_engine/timer_heap.cc \ src/core/lib/event_engine/iomgr_engine/timer_manager.cc \ @@ -1462,6 +1461,7 @@ LIBGRPC_SRC = \ src/core/lib/event_engine/trace.cc \ src/core/lib/gprpp/status_helper.cc \ src/core/lib/gprpp/time.cc \ + src/core/lib/gprpp/time_averaged_stats.cc \ src/core/lib/gprpp/work_serializer.cc \ src/core/lib/http/format_request.cc \ src/core/lib/http/httpcli.cc \ @@ -1529,7 +1529,6 @@ LIBGRPC_SRC = \ src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc \ src/core/lib/iomgr/tcp_server_windows.cc \ src/core/lib/iomgr/tcp_windows.cc \ - src/core/lib/iomgr/time_averaged_stats.cc \ src/core/lib/iomgr/timer.cc \ src/core/lib/iomgr/timer_generic.cc \ src/core/lib/iomgr/timer_heap.cc \ @@ -1919,7 +1918,6 @@ LIBGRPC_UNSECURE_SRC = \ src/core/lib/event_engine/event_engine.cc \ src/core/lib/event_engine/iomgr_engine/iomgr_engine.cc \ src/core/lib/event_engine/iomgr_engine/thread_pool.cc \ - src/core/lib/event_engine/iomgr_engine/time_averaged_stats.cc \ src/core/lib/event_engine/iomgr_engine/timer.cc \ src/core/lib/event_engine/iomgr_engine/timer_heap.cc \ src/core/lib/event_engine/iomgr_engine/timer_manager.cc \ @@ -1930,6 +1928,7 @@ LIBGRPC_UNSECURE_SRC = \ src/core/lib/event_engine/trace.cc \ src/core/lib/gprpp/status_helper.cc \ src/core/lib/gprpp/time.cc \ + src/core/lib/gprpp/time_averaged_stats.cc \ src/core/lib/gprpp/work_serializer.cc \ src/core/lib/http/format_request.cc \ src/core/lib/http/httpcli.cc \ @@ -1996,7 +1995,6 @@ LIBGRPC_UNSECURE_SRC = \ src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc \ src/core/lib/iomgr/tcp_server_windows.cc \ src/core/lib/iomgr/tcp_windows.cc \ - src/core/lib/iomgr/time_averaged_stats.cc \ src/core/lib/iomgr/timer.cc \ src/core/lib/iomgr/timer_generic.cc \ src/core/lib/iomgr/timer_heap.cc \ diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml index 9de35e68099..87fd2935114 100644 --- a/build_autogenerated.yaml +++ b/build_autogenerated.yaml @@ -750,7 +750,6 @@ libs: - src/core/lib/event_engine/handle_containers.h - src/core/lib/event_engine/iomgr_engine/iomgr_engine.h - src/core/lib/event_engine/iomgr_engine/thread_pool.h - - src/core/lib/event_engine/iomgr_engine/time_averaged_stats.h - src/core/lib/event_engine/iomgr_engine/timer.h - src/core/lib/event_engine/iomgr_engine/timer_heap.h - src/core/lib/event_engine/iomgr_engine/timer_manager.h @@ -770,6 +769,7 @@ libs: - src/core/lib/gprpp/status_helper.h - src/core/lib/gprpp/table.h - src/core/lib/gprpp/time.h + - src/core/lib/gprpp/time_averaged_stats.h - src/core/lib/gprpp/unique_type_name.h - src/core/lib/gprpp/work_serializer.h - src/core/lib/http/format_request.h @@ -831,7 +831,6 @@ libs: - src/core/lib/iomgr/tcp_server.h - src/core/lib/iomgr/tcp_server_utils_posix.h - src/core/lib/iomgr/tcp_windows.h - - src/core/lib/iomgr/time_averaged_stats.h - src/core/lib/iomgr/timer.h - src/core/lib/iomgr/timer_generic.h - src/core/lib/iomgr/timer_heap.h @@ -1429,7 +1428,6 @@ libs: - src/core/lib/event_engine/event_engine.cc - src/core/lib/event_engine/iomgr_engine/iomgr_engine.cc - src/core/lib/event_engine/iomgr_engine/thread_pool.cc - - src/core/lib/event_engine/iomgr_engine/time_averaged_stats.cc - src/core/lib/event_engine/iomgr_engine/timer.cc - src/core/lib/event_engine/iomgr_engine/timer_heap.cc - src/core/lib/event_engine/iomgr_engine/timer_manager.cc @@ -1440,6 +1438,7 @@ libs: - src/core/lib/event_engine/trace.cc - src/core/lib/gprpp/status_helper.cc - src/core/lib/gprpp/time.cc + - src/core/lib/gprpp/time_averaged_stats.cc - src/core/lib/gprpp/work_serializer.cc - src/core/lib/http/format_request.cc - src/core/lib/http/httpcli.cc @@ -1507,7 +1506,6 @@ libs: - src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc - src/core/lib/iomgr/tcp_server_windows.cc - src/core/lib/iomgr/tcp_windows.cc - - src/core/lib/iomgr/time_averaged_stats.cc - src/core/lib/iomgr/timer.cc - src/core/lib/iomgr/timer_generic.cc - src/core/lib/iomgr/timer_heap.cc @@ -1966,7 +1964,6 @@ libs: - src/core/lib/event_engine/handle_containers.h - src/core/lib/event_engine/iomgr_engine/iomgr_engine.h - src/core/lib/event_engine/iomgr_engine/thread_pool.h - - src/core/lib/event_engine/iomgr_engine/time_averaged_stats.h - src/core/lib/event_engine/iomgr_engine/timer.h - src/core/lib/event_engine/iomgr_engine/timer_heap.h - src/core/lib/event_engine/iomgr_engine/timer_manager.h @@ -1986,6 +1983,7 @@ libs: - src/core/lib/gprpp/status_helper.h - src/core/lib/gprpp/table.h - src/core/lib/gprpp/time.h + - src/core/lib/gprpp/time_averaged_stats.h - src/core/lib/gprpp/unique_type_name.h - src/core/lib/gprpp/work_serializer.h - src/core/lib/http/format_request.h @@ -2046,7 +2044,6 @@ libs: - src/core/lib/iomgr/tcp_server.h - src/core/lib/iomgr/tcp_server_utils_posix.h - src/core/lib/iomgr/tcp_windows.h - - src/core/lib/iomgr/time_averaged_stats.h - src/core/lib/iomgr/timer.h - src/core/lib/iomgr/timer_generic.h - src/core/lib/iomgr/timer_heap.h @@ -2292,7 +2289,6 @@ libs: - src/core/lib/event_engine/event_engine.cc - src/core/lib/event_engine/iomgr_engine/iomgr_engine.cc - src/core/lib/event_engine/iomgr_engine/thread_pool.cc - - src/core/lib/event_engine/iomgr_engine/time_averaged_stats.cc - src/core/lib/event_engine/iomgr_engine/timer.cc - src/core/lib/event_engine/iomgr_engine/timer_heap.cc - src/core/lib/event_engine/iomgr_engine/timer_manager.cc @@ -2303,6 +2299,7 @@ libs: - src/core/lib/event_engine/trace.cc - src/core/lib/gprpp/status_helper.cc - src/core/lib/gprpp/time.cc + - src/core/lib/gprpp/time_averaged_stats.cc - src/core/lib/gprpp/work_serializer.cc - src/core/lib/http/format_request.cc - src/core/lib/http/httpcli.cc @@ -2369,7 +2366,6 @@ libs: - src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc - src/core/lib/iomgr/tcp_server_windows.cc - src/core/lib/iomgr/tcp_windows.cc - - src/core/lib/iomgr/time_averaged_stats.cc - src/core/lib/iomgr/timer.cc - src/core/lib/iomgr/timer_generic.cc - src/core/lib/iomgr/timer_heap.cc @@ -3506,15 +3502,6 @@ targets: - linux - posix - mac -- name: test_core_iomgr_time_averaged_stats_test - build: test - language: c - headers: [] - src: - - test/core/iomgr/time_averaged_stats_test.cc - deps: - - grpc_test_util - uses_polling: false - name: test_core_iomgr_timer_heap_test build: test language: c @@ -8264,104 +8251,11 @@ targets: - absl/types:optional - absl/utility:utility uses_polling: false -- name: test_core_event_engine_iomgr_event_engine_time_averaged_stats_test - gtest: true - build: test - language: c++ - headers: - - src/core/lib/event_engine/iomgr_engine/time_averaged_stats.h - - src/core/lib/gpr/alloc.h - - src/core/lib/gpr/env.h - - src/core/lib/gpr/murmur_hash.h - - src/core/lib/gpr/spinlock.h - - src/core/lib/gpr/string.h - - src/core/lib/gpr/string_windows.h - - src/core/lib/gpr/time_precise.h - - src/core/lib/gpr/tls.h - - src/core/lib/gpr/tmpfile.h - - src/core/lib/gpr/useful.h - - src/core/lib/gprpp/construct_destruct.h - - src/core/lib/gprpp/debug_location.h - - src/core/lib/gprpp/examine_stack.h - - src/core/lib/gprpp/fork.h - - src/core/lib/gprpp/global_config.h - - src/core/lib/gprpp/global_config_custom.h - - src/core/lib/gprpp/global_config_env.h - - src/core/lib/gprpp/global_config_generic.h - - src/core/lib/gprpp/host_port.h - - src/core/lib/gprpp/manual_constructor.h - - src/core/lib/gprpp/memory.h - - src/core/lib/gprpp/mpscq.h - - src/core/lib/gprpp/stat.h - - src/core/lib/gprpp/sync.h - - src/core/lib/gprpp/thd.h - - src/core/lib/gprpp/time_util.h - - src/core/lib/profiling/timers.h - src: - - src/core/lib/event_engine/iomgr_engine/time_averaged_stats.cc - - src/core/lib/gpr/alloc.cc - - src/core/lib/gpr/atm.cc - - src/core/lib/gpr/cpu_iphone.cc - - src/core/lib/gpr/cpu_linux.cc - - src/core/lib/gpr/cpu_posix.cc - - src/core/lib/gpr/cpu_windows.cc - - src/core/lib/gpr/env_linux.cc - - src/core/lib/gpr/env_posix.cc - - src/core/lib/gpr/env_windows.cc - - src/core/lib/gpr/log.cc - - src/core/lib/gpr/log_android.cc - - src/core/lib/gpr/log_linux.cc - - src/core/lib/gpr/log_posix.cc - - src/core/lib/gpr/log_windows.cc - - src/core/lib/gpr/murmur_hash.cc - - src/core/lib/gpr/string.cc - - src/core/lib/gpr/string_posix.cc - - src/core/lib/gpr/string_util_windows.cc - - src/core/lib/gpr/string_windows.cc - - src/core/lib/gpr/sync.cc - - src/core/lib/gpr/sync_abseil.cc - - src/core/lib/gpr/sync_posix.cc - - src/core/lib/gpr/sync_windows.cc - - src/core/lib/gpr/time.cc - - src/core/lib/gpr/time_posix.cc - - src/core/lib/gpr/time_precise.cc - - src/core/lib/gpr/time_windows.cc - - src/core/lib/gpr/tmpfile_msys.cc - - src/core/lib/gpr/tmpfile_posix.cc - - src/core/lib/gpr/tmpfile_windows.cc - - src/core/lib/gpr/wrap_memcpy.cc - - src/core/lib/gprpp/examine_stack.cc - - src/core/lib/gprpp/fork.cc - - src/core/lib/gprpp/global_config_env.cc - - src/core/lib/gprpp/host_port.cc - - src/core/lib/gprpp/mpscq.cc - - src/core/lib/gprpp/stat_posix.cc - - src/core/lib/gprpp/stat_windows.cc - - src/core/lib/gprpp/thd_posix.cc - - src/core/lib/gprpp/thd_windows.cc - - src/core/lib/gprpp/time_util.cc - - src/core/lib/profiling/basic_timers.cc - - src/core/lib/profiling/stap_timers.cc - - test/core/event_engine/iomgr_event_engine/time_averaged_stats_test.cc - deps: - - absl/base:base - - absl/base:core_headers - - absl/memory:memory - - absl/random:random - - absl/status:status - - absl/strings:cord - - absl/strings:str_format - - absl/strings:strings - - absl/synchronization:synchronization - - absl/time:time - - absl/types:optional - uses_polling: false - name: test_core_event_engine_iomgr_event_engine_timer_heap_test gtest: true build: test language: c++ headers: - - src/core/lib/event_engine/iomgr_engine/time_averaged_stats.h - src/core/lib/event_engine/iomgr_engine/timer.h - src/core/lib/event_engine/iomgr_engine/timer_heap.h - src/core/lib/gpr/alloc.h @@ -8391,10 +8285,10 @@ targets: - src/core/lib/gprpp/sync.h - src/core/lib/gprpp/thd.h - src/core/lib/gprpp/time.h + - src/core/lib/gprpp/time_averaged_stats.h - src/core/lib/gprpp/time_util.h - src/core/lib/profiling/timers.h src: - - src/core/lib/event_engine/iomgr_engine/time_averaged_stats.cc - src/core/lib/event_engine/iomgr_engine/timer.cc - src/core/lib/event_engine/iomgr_engine/timer_heap.cc - src/core/lib/gpr/alloc.cc @@ -8438,6 +8332,7 @@ targets: - src/core/lib/gprpp/thd_posix.cc - src/core/lib/gprpp/thd_windows.cc - src/core/lib/gprpp/time.cc + - src/core/lib/gprpp/time_averaged_stats.cc - src/core/lib/gprpp/time_util.cc - src/core/lib/profiling/basic_timers.cc - src/core/lib/profiling/stap_timers.cc @@ -8462,7 +8357,6 @@ targets: build: test language: c++ headers: - - src/core/lib/event_engine/iomgr_engine/time_averaged_stats.h - src/core/lib/event_engine/iomgr_engine/timer.h - src/core/lib/event_engine/iomgr_engine/timer_heap.h - src/core/lib/gpr/alloc.h @@ -8491,10 +8385,10 @@ targets: - src/core/lib/gprpp/sync.h - src/core/lib/gprpp/thd.h - src/core/lib/gprpp/time.h + - src/core/lib/gprpp/time_averaged_stats.h - src/core/lib/gprpp/time_util.h - src/core/lib/profiling/timers.h src: - - src/core/lib/event_engine/iomgr_engine/time_averaged_stats.cc - src/core/lib/event_engine/iomgr_engine/timer.cc - src/core/lib/event_engine/iomgr_engine/timer_heap.cc - src/core/lib/gpr/alloc.cc @@ -8538,6 +8432,7 @@ targets: - src/core/lib/gprpp/thd_posix.cc - src/core/lib/gprpp/thd_windows.cc - src/core/lib/gprpp/time.cc + - src/core/lib/gprpp/time_averaged_stats.cc - src/core/lib/gprpp/time_util.cc - src/core/lib/profiling/basic_timers.cc - src/core/lib/profiling/stap_timers.cc diff --git a/config.m4 b/config.m4 index bb50d377670..5a983a6081b 100644 --- a/config.m4 +++ b/config.m4 @@ -469,7 +469,6 @@ if test "$PHP_GRPC" != "no"; then src/core/lib/event_engine/event_engine.cc \ src/core/lib/event_engine/iomgr_engine/iomgr_engine.cc \ src/core/lib/event_engine/iomgr_engine/thread_pool.cc \ - src/core/lib/event_engine/iomgr_engine/time_averaged_stats.cc \ src/core/lib/event_engine/iomgr_engine/timer.cc \ src/core/lib/event_engine/iomgr_engine/timer_heap.cc \ src/core/lib/event_engine/iomgr_engine/timer_manager.cc \ @@ -520,6 +519,7 @@ if test "$PHP_GRPC" != "no"; then src/core/lib/gprpp/thd_posix.cc \ src/core/lib/gprpp/thd_windows.cc \ src/core/lib/gprpp/time.cc \ + src/core/lib/gprpp/time_averaged_stats.cc \ src/core/lib/gprpp/time_util.cc \ src/core/lib/gprpp/work_serializer.cc \ src/core/lib/http/format_request.cc \ @@ -588,7 +588,6 @@ if test "$PHP_GRPC" != "no"; then src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc \ src/core/lib/iomgr/tcp_server_windows.cc \ src/core/lib/iomgr/tcp_windows.cc \ - src/core/lib/iomgr/time_averaged_stats.cc \ src/core/lib/iomgr/timer.cc \ src/core/lib/iomgr/timer_generic.cc \ src/core/lib/iomgr/timer_heap.cc \ diff --git a/config.w32 b/config.w32 index a6d86ef2bcd..16d8e735f95 100644 --- a/config.w32 +++ b/config.w32 @@ -435,7 +435,6 @@ if (PHP_GRPC != "no") { "src\\core\\lib\\event_engine\\event_engine.cc " + "src\\core\\lib\\event_engine\\iomgr_engine\\iomgr_engine.cc " + "src\\core\\lib\\event_engine\\iomgr_engine\\thread_pool.cc " + - "src\\core\\lib\\event_engine\\iomgr_engine\\time_averaged_stats.cc " + "src\\core\\lib\\event_engine\\iomgr_engine\\timer.cc " + "src\\core\\lib\\event_engine\\iomgr_engine\\timer_heap.cc " + "src\\core\\lib\\event_engine\\iomgr_engine\\timer_manager.cc " + @@ -486,6 +485,7 @@ if (PHP_GRPC != "no") { "src\\core\\lib\\gprpp\\thd_posix.cc " + "src\\core\\lib\\gprpp\\thd_windows.cc " + "src\\core\\lib\\gprpp\\time.cc " + + "src\\core\\lib\\gprpp\\time_averaged_stats.cc " + "src\\core\\lib\\gprpp\\time_util.cc " + "src\\core\\lib\\gprpp\\work_serializer.cc " + "src\\core\\lib\\http\\format_request.cc " + @@ -554,7 +554,6 @@ if (PHP_GRPC != "no") { "src\\core\\lib\\iomgr\\tcp_server_utils_posix_noifaddrs.cc " + "src\\core\\lib\\iomgr\\tcp_server_windows.cc " + "src\\core\\lib\\iomgr\\tcp_windows.cc " + - "src\\core\\lib\\iomgr\\time_averaged_stats.cc " + "src\\core\\lib\\iomgr\\timer.cc " + "src\\core\\lib\\iomgr\\timer_generic.cc " + "src\\core\\lib\\iomgr\\timer_heap.cc " + diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec index 787bd788c81..6c76f384b57 100644 --- a/gRPC-C++.podspec +++ b/gRPC-C++.podspec @@ -683,7 +683,6 @@ Pod::Spec.new do |s| 'src/core/lib/event_engine/handle_containers.h', 'src/core/lib/event_engine/iomgr_engine/iomgr_engine.h', 'src/core/lib/event_engine/iomgr_engine/thread_pool.h', - 'src/core/lib/event_engine/iomgr_engine/time_averaged_stats.h', 'src/core/lib/event_engine/iomgr_engine/timer.h', 'src/core/lib/event_engine/iomgr_engine/timer_heap.h', 'src/core/lib/event_engine/iomgr_engine/timer_manager.h', @@ -728,6 +727,7 @@ Pod::Spec.new do |s| 'src/core/lib/gprpp/table.h', 'src/core/lib/gprpp/thd.h', 'src/core/lib/gprpp/time.h', + 'src/core/lib/gprpp/time_averaged_stats.h', 'src/core/lib/gprpp/time_util.h', 'src/core/lib/gprpp/unique_type_name.h', 'src/core/lib/gprpp/work_serializer.h', @@ -790,7 +790,6 @@ Pod::Spec.new do |s| 'src/core/lib/iomgr/tcp_server.h', 'src/core/lib/iomgr/tcp_server_utils_posix.h', 'src/core/lib/iomgr/tcp_windows.h', - 'src/core/lib/iomgr/time_averaged_stats.h', 'src/core/lib/iomgr/timer.h', 'src/core/lib/iomgr/timer_generic.h', 'src/core/lib/iomgr/timer_heap.h', @@ -1522,7 +1521,6 @@ Pod::Spec.new do |s| 'src/core/lib/event_engine/handle_containers.h', 'src/core/lib/event_engine/iomgr_engine/iomgr_engine.h', 'src/core/lib/event_engine/iomgr_engine/thread_pool.h', - 'src/core/lib/event_engine/iomgr_engine/time_averaged_stats.h', 'src/core/lib/event_engine/iomgr_engine/timer.h', 'src/core/lib/event_engine/iomgr_engine/timer_heap.h', 'src/core/lib/event_engine/iomgr_engine/timer_manager.h', @@ -1567,6 +1565,7 @@ Pod::Spec.new do |s| 'src/core/lib/gprpp/table.h', 'src/core/lib/gprpp/thd.h', 'src/core/lib/gprpp/time.h', + 'src/core/lib/gprpp/time_averaged_stats.h', 'src/core/lib/gprpp/time_util.h', 'src/core/lib/gprpp/unique_type_name.h', 'src/core/lib/gprpp/work_serializer.h', @@ -1629,7 +1628,6 @@ Pod::Spec.new do |s| 'src/core/lib/iomgr/tcp_server.h', 'src/core/lib/iomgr/tcp_server_utils_posix.h', 'src/core/lib/iomgr/tcp_windows.h', - 'src/core/lib/iomgr/time_averaged_stats.h', 'src/core/lib/iomgr/timer.h', 'src/core/lib/iomgr/timer_generic.h', 'src/core/lib/iomgr/timer_heap.h', diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index fff9c0c27a8..7e54ca062a4 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -1050,8 +1050,6 @@ Pod::Spec.new do |s| 'src/core/lib/event_engine/iomgr_engine/iomgr_engine.h', 'src/core/lib/event_engine/iomgr_engine/thread_pool.cc', 'src/core/lib/event_engine/iomgr_engine/thread_pool.h', - 'src/core/lib/event_engine/iomgr_engine/time_averaged_stats.cc', - 'src/core/lib/event_engine/iomgr_engine/time_averaged_stats.h', 'src/core/lib/event_engine/iomgr_engine/timer.cc', 'src/core/lib/event_engine/iomgr_engine/timer.h', 'src/core/lib/event_engine/iomgr_engine/timer_heap.cc', @@ -1146,6 +1144,8 @@ Pod::Spec.new do |s| 'src/core/lib/gprpp/thd_windows.cc', 'src/core/lib/gprpp/time.cc', 'src/core/lib/gprpp/time.h', + 'src/core/lib/gprpp/time_averaged_stats.cc', + 'src/core/lib/gprpp/time_averaged_stats.h', 'src/core/lib/gprpp/time_util.cc', 'src/core/lib/gprpp/time_util.h', 'src/core/lib/gprpp/unique_type_name.h', @@ -1276,8 +1276,6 @@ Pod::Spec.new do |s| 'src/core/lib/iomgr/tcp_server_windows.cc', 'src/core/lib/iomgr/tcp_windows.cc', 'src/core/lib/iomgr/tcp_windows.h', - 'src/core/lib/iomgr/time_averaged_stats.cc', - 'src/core/lib/iomgr/time_averaged_stats.h', 'src/core/lib/iomgr/timer.cc', 'src/core/lib/iomgr/timer.h', 'src/core/lib/iomgr/timer_generic.cc', @@ -2132,7 +2130,6 @@ Pod::Spec.new do |s| 'src/core/lib/event_engine/handle_containers.h', 'src/core/lib/event_engine/iomgr_engine/iomgr_engine.h', 'src/core/lib/event_engine/iomgr_engine/thread_pool.h', - 'src/core/lib/event_engine/iomgr_engine/time_averaged_stats.h', 'src/core/lib/event_engine/iomgr_engine/timer.h', 'src/core/lib/event_engine/iomgr_engine/timer_heap.h', 'src/core/lib/event_engine/iomgr_engine/timer_manager.h', @@ -2177,6 +2174,7 @@ Pod::Spec.new do |s| 'src/core/lib/gprpp/table.h', 'src/core/lib/gprpp/thd.h', 'src/core/lib/gprpp/time.h', + 'src/core/lib/gprpp/time_averaged_stats.h', 'src/core/lib/gprpp/time_util.h', 'src/core/lib/gprpp/unique_type_name.h', 'src/core/lib/gprpp/work_serializer.h', @@ -2239,7 +2237,6 @@ Pod::Spec.new do |s| 'src/core/lib/iomgr/tcp_server.h', 'src/core/lib/iomgr/tcp_server_utils_posix.h', 'src/core/lib/iomgr/tcp_windows.h', - 'src/core/lib/iomgr/time_averaged_stats.h', 'src/core/lib/iomgr/timer.h', 'src/core/lib/iomgr/timer_generic.h', 'src/core/lib/iomgr/timer_heap.h', diff --git a/grpc.gemspec b/grpc.gemspec index eeaa0965c06..de9e023ec17 100644 --- a/grpc.gemspec +++ b/grpc.gemspec @@ -963,8 +963,6 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/event_engine/iomgr_engine/iomgr_engine.h ) s.files += %w( src/core/lib/event_engine/iomgr_engine/thread_pool.cc ) s.files += %w( src/core/lib/event_engine/iomgr_engine/thread_pool.h ) - s.files += %w( src/core/lib/event_engine/iomgr_engine/time_averaged_stats.cc ) - s.files += %w( src/core/lib/event_engine/iomgr_engine/time_averaged_stats.h ) s.files += %w( src/core/lib/event_engine/iomgr_engine/timer.cc ) s.files += %w( src/core/lib/event_engine/iomgr_engine/timer.h ) s.files += %w( src/core/lib/event_engine/iomgr_engine/timer_heap.cc ) @@ -1059,6 +1057,8 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/gprpp/thd_windows.cc ) s.files += %w( src/core/lib/gprpp/time.cc ) s.files += %w( src/core/lib/gprpp/time.h ) + s.files += %w( src/core/lib/gprpp/time_averaged_stats.cc ) + s.files += %w( src/core/lib/gprpp/time_averaged_stats.h ) s.files += %w( src/core/lib/gprpp/time_util.cc ) s.files += %w( src/core/lib/gprpp/time_util.h ) s.files += %w( src/core/lib/gprpp/unique_type_name.h ) @@ -1189,8 +1189,6 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/iomgr/tcp_server_windows.cc ) s.files += %w( src/core/lib/iomgr/tcp_windows.cc ) s.files += %w( src/core/lib/iomgr/tcp_windows.h ) - s.files += %w( src/core/lib/iomgr/time_averaged_stats.cc ) - s.files += %w( src/core/lib/iomgr/time_averaged_stats.h ) s.files += %w( src/core/lib/iomgr/timer.cc ) s.files += %w( src/core/lib/iomgr/timer.h ) s.files += %w( src/core/lib/iomgr/timer_generic.cc ) diff --git a/grpc.gyp b/grpc.gyp index 1e16f1a5ad6..5a410f4e4fc 100644 --- a/grpc.gyp +++ b/grpc.gyp @@ -802,7 +802,6 @@ 'src/core/lib/event_engine/event_engine.cc', 'src/core/lib/event_engine/iomgr_engine/iomgr_engine.cc', 'src/core/lib/event_engine/iomgr_engine/thread_pool.cc', - 'src/core/lib/event_engine/iomgr_engine/time_averaged_stats.cc', 'src/core/lib/event_engine/iomgr_engine/timer.cc', 'src/core/lib/event_engine/iomgr_engine/timer_heap.cc', 'src/core/lib/event_engine/iomgr_engine/timer_manager.cc', @@ -813,6 +812,7 @@ 'src/core/lib/event_engine/trace.cc', 'src/core/lib/gprpp/status_helper.cc', 'src/core/lib/gprpp/time.cc', + 'src/core/lib/gprpp/time_averaged_stats.cc', 'src/core/lib/gprpp/work_serializer.cc', 'src/core/lib/http/format_request.cc', 'src/core/lib/http/httpcli.cc', @@ -880,7 +880,6 @@ 'src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc', 'src/core/lib/iomgr/tcp_server_windows.cc', 'src/core/lib/iomgr/tcp_windows.cc', - 'src/core/lib/iomgr/time_averaged_stats.cc', 'src/core/lib/iomgr/timer.cc', 'src/core/lib/iomgr/timer_generic.cc', 'src/core/lib/iomgr/timer_heap.cc', @@ -1263,7 +1262,6 @@ 'src/core/lib/event_engine/event_engine.cc', 'src/core/lib/event_engine/iomgr_engine/iomgr_engine.cc', 'src/core/lib/event_engine/iomgr_engine/thread_pool.cc', - 'src/core/lib/event_engine/iomgr_engine/time_averaged_stats.cc', 'src/core/lib/event_engine/iomgr_engine/timer.cc', 'src/core/lib/event_engine/iomgr_engine/timer_heap.cc', 'src/core/lib/event_engine/iomgr_engine/timer_manager.cc', @@ -1274,6 +1272,7 @@ 'src/core/lib/event_engine/trace.cc', 'src/core/lib/gprpp/status_helper.cc', 'src/core/lib/gprpp/time.cc', + 'src/core/lib/gprpp/time_averaged_stats.cc', 'src/core/lib/gprpp/work_serializer.cc', 'src/core/lib/http/format_request.cc', 'src/core/lib/http/httpcli.cc', @@ -1340,7 +1339,6 @@ 'src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc', 'src/core/lib/iomgr/tcp_server_windows.cc', 'src/core/lib/iomgr/tcp_windows.cc', - 'src/core/lib/iomgr/time_averaged_stats.cc', 'src/core/lib/iomgr/timer.cc', 'src/core/lib/iomgr/timer_generic.cc', 'src/core/lib/iomgr/timer_heap.cc', diff --git a/package.xml b/package.xml index 7784fbc45e9..ee63ec518fd 100644 --- a/package.xml +++ b/package.xml @@ -945,8 +945,6 @@ - - @@ -1041,6 +1039,8 @@ + + @@ -1171,8 +1171,6 @@ - - diff --git a/src/core/lib/event_engine/iomgr_engine/timer.h b/src/core/lib/event_engine/iomgr_engine/timer.h index 629e4a00fe3..4d4ca04acc8 100644 --- a/src/core/lib/event_engine/iomgr_engine/timer.h +++ b/src/core/lib/event_engine/iomgr_engine/timer.h @@ -33,10 +33,10 @@ #include -#include "src/core/lib/event_engine/iomgr_engine/time_averaged_stats.h" #include "src/core/lib/event_engine/iomgr_engine/timer_heap.h" #include "src/core/lib/gprpp/sync.h" #include "src/core/lib/gprpp/time.h" +#include "src/core/lib/gprpp/time_averaged_stats.h" namespace grpc_event_engine { namespace iomgr_engine { @@ -151,7 +151,7 @@ class TimerList { ABSL_LOCKS_EXCLUDED(mu); grpc_core::Mutex mu; - TimeAveragedStats stats ABSL_GUARDED_BY(mu); + grpc_core::TimeAveragedStats stats ABSL_GUARDED_BY(mu); /* All and only timers with deadlines < this will be in the heap. */ grpc_core::Timestamp queue_deadline_cap ABSL_GUARDED_BY(mu); /* The deadline of the next timer due in this shard. */ diff --git a/src/core/lib/event_engine/iomgr_engine/time_averaged_stats.cc b/src/core/lib/gprpp/time_averaged_stats.cc similarity index 90% rename from src/core/lib/event_engine/iomgr_engine/time_averaged_stats.cc rename to src/core/lib/gprpp/time_averaged_stats.cc index 89ecdb6e8e0..9077c004221 100644 --- a/src/core/lib/event_engine/iomgr_engine/time_averaged_stats.cc +++ b/src/core/lib/gprpp/time_averaged_stats.cc @@ -18,10 +18,9 @@ #include -#include "src/core/lib/event_engine/iomgr_engine/time_averaged_stats.h" +#include "src/core/lib/gprpp/time_averaged_stats.h" -namespace grpc_event_engine { -namespace iomgr_engine { +namespace grpc_core { TimeAveragedStats::TimeAveragedStats(double init_avg, double regress_weight, double persistence_factor) @@ -58,5 +57,4 @@ double TimeAveragedStats::UpdateAverage() { return aggregate_weighted_avg_; } -} // namespace iomgr_engine -} // namespace grpc_event_engine +} // namespace grpc_core diff --git a/src/core/lib/event_engine/iomgr_engine/time_averaged_stats.h b/src/core/lib/gprpp/time_averaged_stats.h similarity index 90% rename from src/core/lib/event_engine/iomgr_engine/time_averaged_stats.h rename to src/core/lib/gprpp/time_averaged_stats.h index c023a1e133b..b228ad8909b 100644 --- a/src/core/lib/event_engine/iomgr_engine/time_averaged_stats.h +++ b/src/core/lib/gprpp/time_averaged_stats.h @@ -16,11 +16,10 @@ * */ -#ifndef GRPC_CORE_LIB_EVENT_ENGINE_IOMGR_ENGINE_TIME_AVERAGED_STATS_H -#define GRPC_CORE_LIB_EVENT_ENGINE_IOMGR_ENGINE_TIME_AVERAGED_STATS_H +#ifndef GRPC_CORE_LIB_GPRPP_TIME_AVERAGED_STATS_H +#define GRPC_CORE_LIB_GPRPP_TIME_AVERAGED_STATS_H -namespace grpc_event_engine { -namespace iomgr_engine { +namespace grpc_core { /* This tracks a time-decaying weighted average. It works by collecting batches of samples and then mixing their average into a time-decaying @@ -75,7 +74,6 @@ class TimeAveragedStats { double aggregate_weighted_avg_ = init_avg_; }; -} // namespace iomgr_engine -} // namespace grpc_event_engine +} // namespace grpc_core -#endif /* GRPC_CORE_LIB_EVENT_ENGINE_IOMGR_ENGINE_TIME_AVERAGED_STATS_H */ +#endif /* GRPC_CORE_LIB_GPRPP_TIME_AVERAGED_STATS_H */ diff --git a/src/core/lib/iomgr/time_averaged_stats.cc b/src/core/lib/iomgr/time_averaged_stats.cc deleted file mode 100644 index 6369e48db0e..00000000000 --- a/src/core/lib/iomgr/time_averaged_stats.cc +++ /dev/null @@ -1,64 +0,0 @@ -/* - * - * Copyright 2015 gRPC authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include - -#include "src/core/lib/iomgr/time_averaged_stats.h" - -void grpc_time_averaged_stats_init(grpc_time_averaged_stats* stats, - double init_avg, double regress_weight, - double persistence_factor) { - stats->init_avg = init_avg; - stats->regress_weight = regress_weight; - stats->persistence_factor = persistence_factor; - stats->batch_total_value = 0; - stats->batch_num_samples = 0; - stats->aggregate_total_weight = 0; - stats->aggregate_weighted_avg = init_avg; -} - -void grpc_time_averaged_stats_add_sample(grpc_time_averaged_stats* stats, - double value) { - stats->batch_total_value += value; - ++stats->batch_num_samples; -} - -double grpc_time_averaged_stats_update_average( - grpc_time_averaged_stats* stats) { - /* Start with the current batch: */ - double weighted_sum = stats->batch_total_value; - double total_weight = stats->batch_num_samples; - if (stats->regress_weight > 0) { - /* Add in the regression towards init_avg_: */ - weighted_sum += stats->regress_weight * stats->init_avg; - total_weight += stats->regress_weight; - } - if (stats->persistence_factor > 0) { - /* Add in the persistence: */ - const double prev_sample_weight = - stats->persistence_factor * stats->aggregate_total_weight; - weighted_sum += prev_sample_weight * stats->aggregate_weighted_avg; - total_weight += prev_sample_weight; - } - stats->aggregate_weighted_avg = - (total_weight > 0) ? (weighted_sum / total_weight) : stats->init_avg; - stats->aggregate_total_weight = total_weight; - stats->batch_num_samples = 0; - stats->batch_total_value = 0; - return stats->aggregate_weighted_avg; -} diff --git a/src/core/lib/iomgr/time_averaged_stats.h b/src/core/lib/iomgr/time_averaged_stats.h deleted file mode 100644 index 877d1bec0e3..00000000000 --- a/src/core/lib/iomgr/time_averaged_stats.h +++ /dev/null @@ -1,72 +0,0 @@ -/* - * - * Copyright 2015 gRPC authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#ifndef GRPC_CORE_LIB_IOMGR_TIME_AVERAGED_STATS_H -#define GRPC_CORE_LIB_IOMGR_TIME_AVERAGED_STATS_H - -/* This tracks a time-decaying weighted average. It works by collecting - batches of samples and then mixing their average into a time-decaying - weighted mean. It is designed for batch operations where we do many adds - before updating the average. */ - -struct grpc_time_averaged_stats { - /* The initial average value. This is the reported average until the first - grpc_time_averaged_stats_update_average call. If a positive regress_weight - is used, we also regress towards this value on each update. */ - double init_avg; - /* The sample weight of "init_avg" that is mixed in with each call to - grpc_time_averaged_stats_update_average. If the calls to - grpc_time_averaged_stats_add_sample stop, this will cause the average to - regress back to the mean. This should be non-negative. Set it to 0 to - disable the bias. A value of 1 has the effect of adding in 1 bonus sample - with value init_avg to each sample period. */ - double regress_weight; - /* This determines the rate of decay of the time-averaging from one period - to the next by scaling the aggregate_total_weight of samples from prior - periods when combining with the latest period. It should be in the range - [0,1]. A higher value adapts more slowly. With a value of 0.5, if the - batches each have k samples, the samples_in_avg_ will grow to 2 k, so the - weighting of the time average will eventually be 1/3 new batch and 2/3 - old average. */ - double persistence_factor; - - /* The total value of samples since the last UpdateAverage(). */ - double batch_total_value; - /* The number of samples since the last UpdateAverage(). */ - double batch_num_samples; - /* The time-decayed sum of batch_num_samples_ over previous batches. This is - the "weight" of the old aggregate_weighted_avg_ when updating the - average. */ - double aggregate_total_weight; - /* A time-decayed average of the (batch_total_value_ / batch_num_samples_), - computed by decaying the samples_in_avg_ weight in the weighted average. */ - double aggregate_weighted_avg; -}; -/* See the comments on the members above for an explanation of init_avg, - regress_weight, and persistence_factor. */ -void grpc_time_averaged_stats_init(grpc_time_averaged_stats* stats, - double init_avg, double regress_weight, - double persistence_factor); -/* Add a sample to the current batch. */ -void grpc_time_averaged_stats_add_sample(grpc_time_averaged_stats* stats, - double value); -/* Complete a batch and compute the new estimate of the average sample - value. */ -double grpc_time_averaged_stats_update_average(grpc_time_averaged_stats* stats); - -#endif /* GRPC_CORE_LIB_IOMGR_TIME_AVERAGED_STATS_H */ diff --git a/src/core/lib/iomgr/timer_generic.cc b/src/core/lib/iomgr/timer_generic.cc index e4e0e6abb44..779ce0929dd 100644 --- a/src/core/lib/iomgr/timer_generic.cc +++ b/src/core/lib/iomgr/timer_generic.cc @@ -33,10 +33,11 @@ #include "src/core/lib/gpr/spinlock.h" #include "src/core/lib/gpr/tls.h" #include "src/core/lib/gpr/useful.h" +#include "src/core/lib/gprpp/manual_constructor.h" #include "src/core/lib/gprpp/time.h" +#include "src/core/lib/gprpp/time_averaged_stats.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/port.h" -#include "src/core/lib/iomgr/time_averaged_stats.h" #include "src/core/lib/iomgr/timer.h" #include "src/core/lib/iomgr/timer_heap.h" @@ -60,7 +61,7 @@ grpc_core::TraceFlag grpc_timer_check_trace(false, "timer_check"); */ struct timer_shard { gpr_mu mu; - grpc_time_averaged_stats stats; + grpc_core::ManualConstructor stats; /* All and only timers with deadlines < this will be in the heap. */ grpc_core::Timestamp queue_deadline_cap; /* The deadline of the next timer due in this shard. */ @@ -259,8 +260,7 @@ static void timer_list_init() { for (i = 0; i < g_num_shards; i++) { timer_shard* shard = &g_shards[i]; gpr_mu_init(&shard->mu); - grpc_time_averaged_stats_init(&shard->stats, 1.0 / ADD_DEADLINE_SCALE, 0.1, - 0.5); + shard->stats.Init(1.0 / ADD_DEADLINE_SCALE, 0.1, 0.5); shard->queue_deadline_cap = g_shared_mutables.min_timer; shard->shard_queue_index = i; grpc_timer_heap_init(&shard->heap); @@ -367,8 +367,7 @@ static void timer_init(grpc_timer* timer, grpc_core::Timestamp deadline, return; } - grpc_time_averaged_stats_add_sample(&shard->stats, - (deadline - now).millis() / 1000.0); + shard->stats->AddSample((deadline - now).millis() / 1000.0); ADD_TO_HASH_TABLE(timer); @@ -473,8 +472,7 @@ static void timer_cancel(grpc_timer* timer) { static bool refill_heap(timer_shard* shard, grpc_core::Timestamp now) { /* Compute the new queue window width and bound by the limits: */ double computed_deadline_delta = - grpc_time_averaged_stats_update_average(&shard->stats) * - ADD_DEADLINE_SCALE; + shard->stats->UpdateAverage() * ADD_DEADLINE_SCALE; double deadline_delta = grpc_core::Clamp(computed_deadline_delta, MIN_QUEUE_WINDOW_DURATION, MAX_QUEUE_WINDOW_DURATION); diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py index 6ff0742ea09..548b8e4e929 100644 --- a/src/python/grpcio/grpc_core_dependencies.py +++ b/src/python/grpcio/grpc_core_dependencies.py @@ -444,7 +444,6 @@ CORE_SOURCE_FILES = [ 'src/core/lib/event_engine/event_engine.cc', 'src/core/lib/event_engine/iomgr_engine/iomgr_engine.cc', 'src/core/lib/event_engine/iomgr_engine/thread_pool.cc', - 'src/core/lib/event_engine/iomgr_engine/time_averaged_stats.cc', 'src/core/lib/event_engine/iomgr_engine/timer.cc', 'src/core/lib/event_engine/iomgr_engine/timer_heap.cc', 'src/core/lib/event_engine/iomgr_engine/timer_manager.cc', @@ -495,6 +494,7 @@ CORE_SOURCE_FILES = [ 'src/core/lib/gprpp/thd_posix.cc', 'src/core/lib/gprpp/thd_windows.cc', 'src/core/lib/gprpp/time.cc', + 'src/core/lib/gprpp/time_averaged_stats.cc', 'src/core/lib/gprpp/time_util.cc', 'src/core/lib/gprpp/work_serializer.cc', 'src/core/lib/http/format_request.cc', @@ -563,7 +563,6 @@ CORE_SOURCE_FILES = [ 'src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc', 'src/core/lib/iomgr/tcp_server_windows.cc', 'src/core/lib/iomgr/tcp_windows.cc', - 'src/core/lib/iomgr/time_averaged_stats.cc', 'src/core/lib/iomgr/timer.cc', 'src/core/lib/iomgr/timer_generic.cc', 'src/core/lib/iomgr/timer_heap.cc', diff --git a/test/core/event_engine/iomgr_event_engine/BUILD b/test/core/event_engine/iomgr_event_engine/BUILD index 363114eebd6..3204974dab7 100644 --- a/test/core/event_engine/iomgr_event_engine/BUILD +++ b/test/core/event_engine/iomgr_event_engine/BUILD @@ -21,19 +21,6 @@ grpc_package( visibility = "public", ) # Useful for third party devs to test their io manager implementation. -grpc_cc_test( - name = "time_averaged_stats_test", - srcs = ["time_averaged_stats_test.cc"], - external_deps = ["gtest"], - language = "C++", - uses_event_engine = False, - uses_polling = False, - deps = [ - "//:iomgr_ee_time_averaged_stats", - "//test/core/util:grpc_suppressions", - ], -) - grpc_cc_test( name = "timer_heap_test", srcs = ["timer_heap_test.cc"], diff --git a/test/core/event_engine/iomgr_event_engine/time_averaged_stats_test.cc b/test/core/gprpp/time_averaged_stats_test.cc similarity index 96% rename from test/core/event_engine/iomgr_event_engine/time_averaged_stats_test.cc rename to test/core/gprpp/time_averaged_stats_test.cc index 4abeb86b9b7..80c3d2cbe74 100644 --- a/test/core/event_engine/iomgr_event_engine/time_averaged_stats_test.cc +++ b/test/core/gprpp/time_averaged_stats_test.cc @@ -16,14 +16,14 @@ * */ -#include "src/core/lib/event_engine/iomgr_engine/time_averaged_stats.h" +#include "src/core/lib/gprpp/time_averaged_stats.h" #include #include -namespace grpc_event_engine { -namespace iomgr_engine { +namespace grpc_core { +namespace { TEST(TimeAveragedStatsTest, NoRegressNoPersistTest1) { TimeAveragedStats tas(1000, 0, 0.0); @@ -170,8 +170,8 @@ TEST(TimeAveragedStatsTest, SomeRegressSomePersistTest) { EXPECT_DOUBLE_EQ(2.8304, tas.aggregate_total_weight()); } -} // namespace iomgr_engine -} // namespace grpc_event_engine +} // namespace +} // namespace grpc_core int main(int argc, char** argv) { ::testing::InitGoogleTest(&argc, argv); diff --git a/test/core/iomgr/BUILD b/test/core/iomgr/BUILD index 9e8820bb50b..e9f8ac620f1 100644 --- a/test/core/iomgr/BUILD +++ b/test/core/iomgr/BUILD @@ -261,19 +261,6 @@ grpc_cc_test( ], ) -grpc_cc_test( - name = "time_averaged_stats_test", - srcs = ["time_averaged_stats_test.cc"], - language = "C++", - uses_event_engine = False, - uses_polling = False, - deps = [ - "//:gpr", - "//:grpc", - "//test/core/util:grpc_test_util", - ], -) - grpc_cc_test( name = "timer_heap_test", srcs = ["timer_heap_test.cc"], diff --git a/test/core/iomgr/time_averaged_stats_test.cc b/test/core/iomgr/time_averaged_stats_test.cc deleted file mode 100644 index 3b5d2413e6e..00000000000 --- a/test/core/iomgr/time_averaged_stats_test.cc +++ /dev/null @@ -1,194 +0,0 @@ -/* - * - * Copyright 2015 gRPC authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include "src/core/lib/iomgr/time_averaged_stats.h" - -#include - -#include - -#include "test/core/util/test_config.h" - -#define EXPECT_EQ(a, b) GPR_ASSERT((a) == (b)) -#define EXPECT_DOUBLE_EQ(a, b) GPR_ASSERT(fabs((a) - (b)) < 1e-9) - -static void no_regress_no_persist_test_1(void) { - grpc_time_averaged_stats tas; - grpc_time_averaged_stats_init(&tas, 1000, 0, 0.0); - EXPECT_DOUBLE_EQ(1000, tas.aggregate_weighted_avg); - EXPECT_DOUBLE_EQ(0, tas.aggregate_total_weight); - - /* Should have no effect */ - grpc_time_averaged_stats_update_average(&tas); - EXPECT_DOUBLE_EQ(1000, tas.aggregate_weighted_avg); - EXPECT_DOUBLE_EQ(0, tas.aggregate_total_weight); - - /* Should replace old average */ - grpc_time_averaged_stats_add_sample(&tas, 2000); - grpc_time_averaged_stats_update_average(&tas); - EXPECT_DOUBLE_EQ(2000, tas.aggregate_weighted_avg); - EXPECT_DOUBLE_EQ(1, tas.aggregate_total_weight); -} - -static void no_regress_no_persist_test_2(void) { - grpc_time_averaged_stats tas; - grpc_time_averaged_stats_init(&tas, 1000, 0, 0.0); - EXPECT_DOUBLE_EQ(1000, tas.aggregate_weighted_avg); - /* Should replace init value */ - grpc_time_averaged_stats_add_sample(&tas, 2000); - grpc_time_averaged_stats_update_average(&tas); - EXPECT_DOUBLE_EQ(2000, tas.aggregate_weighted_avg); - EXPECT_DOUBLE_EQ(1, tas.aggregate_total_weight); - - grpc_time_averaged_stats_add_sample(&tas, 3000); - grpc_time_averaged_stats_update_average(&tas); - EXPECT_DOUBLE_EQ(3000, tas.aggregate_weighted_avg); - EXPECT_DOUBLE_EQ(1, tas.aggregate_total_weight); -} - -static void no_regress_no_persist_test_3(void) { - grpc_time_averaged_stats tas; - grpc_time_averaged_stats_init(&tas, 1000, 0, 0.0); - EXPECT_DOUBLE_EQ(1000, tas.aggregate_weighted_avg); - /* Should replace init value */ - grpc_time_averaged_stats_add_sample(&tas, 2500); - grpc_time_averaged_stats_update_average(&tas); - EXPECT_DOUBLE_EQ(2500, tas.aggregate_weighted_avg); - EXPECT_DOUBLE_EQ(1, tas.aggregate_total_weight); - - grpc_time_averaged_stats_add_sample(&tas, 3500); - grpc_time_averaged_stats_add_sample(&tas, 4500); - grpc_time_averaged_stats_update_average(&tas); - EXPECT_DOUBLE_EQ(4000, tas.aggregate_weighted_avg); - EXPECT_DOUBLE_EQ(2, tas.aggregate_total_weight); -} - -static void some_regress_no_persist_test(void) { - grpc_time_averaged_stats tas; - grpc_time_averaged_stats_init(&tas, 1000, 0.5, 0.0); - EXPECT_DOUBLE_EQ(1000, tas.aggregate_weighted_avg); - EXPECT_DOUBLE_EQ(0, tas.aggregate_total_weight); - grpc_time_averaged_stats_add_sample(&tas, 2000); - grpc_time_averaged_stats_add_sample(&tas, 2000); - grpc_time_averaged_stats_update_average(&tas); - /* (2 * 2000 + 0.5 * 1000) / 2.5 */ - EXPECT_DOUBLE_EQ(1800, tas.aggregate_weighted_avg); - EXPECT_DOUBLE_EQ(2.5, tas.aggregate_total_weight); -} - -static void some_decay_test(void) { - grpc_time_averaged_stats tas; - grpc_time_averaged_stats_init(&tas, 1000, 1, 0.0); - EXPECT_EQ(1000, tas.aggregate_weighted_avg); - /* Should avg with init value */ - grpc_time_averaged_stats_add_sample(&tas, 2000); - grpc_time_averaged_stats_update_average(&tas); - EXPECT_DOUBLE_EQ(1500, tas.aggregate_weighted_avg); - EXPECT_DOUBLE_EQ(2, tas.aggregate_total_weight); - - grpc_time_averaged_stats_add_sample(&tas, 2000); - grpc_time_averaged_stats_update_average(&tas); - EXPECT_DOUBLE_EQ(1500, tas.aggregate_weighted_avg); - EXPECT_DOUBLE_EQ(2, tas.aggregate_total_weight); - - grpc_time_averaged_stats_add_sample(&tas, 2000); - grpc_time_averaged_stats_update_average(&tas); - EXPECT_DOUBLE_EQ(1500, tas.aggregate_weighted_avg); - EXPECT_DOUBLE_EQ(2, tas.aggregate_total_weight); -} - -static void no_regress_full_persist_test(void) { - grpc_time_averaged_stats tas; - grpc_time_averaged_stats_init(&tas, 1000, 0, 1.0); - EXPECT_DOUBLE_EQ(1000, tas.aggregate_weighted_avg); - EXPECT_DOUBLE_EQ(0, tas.aggregate_total_weight); - - /* Should replace init value */ - grpc_time_averaged_stats_add_sample(&tas, 2000); - grpc_time_averaged_stats_update_average(&tas); - EXPECT_EQ(2000, tas.aggregate_weighted_avg); - EXPECT_EQ(1, tas.aggregate_total_weight); - - /* Will result in average of the 3 samples. */ - grpc_time_averaged_stats_add_sample(&tas, 2300); - grpc_time_averaged_stats_add_sample(&tas, 2300); - grpc_time_averaged_stats_update_average(&tas); - EXPECT_DOUBLE_EQ(2200, tas.aggregate_weighted_avg); - EXPECT_DOUBLE_EQ(3, tas.aggregate_total_weight); -} - -static void no_regress_some_persist_test(void) { - grpc_time_averaged_stats tas; - grpc_time_averaged_stats_init(&tas, 1000, 0, 0.5); - /* Should replace init value */ - grpc_time_averaged_stats_add_sample(&tas, 2000); - grpc_time_averaged_stats_update_average(&tas); - EXPECT_DOUBLE_EQ(2000, tas.aggregate_weighted_avg); - EXPECT_DOUBLE_EQ(1, tas.aggregate_total_weight); - - grpc_time_averaged_stats_add_sample(&tas, 2500); - grpc_time_averaged_stats_add_sample(&tas, 4000); - grpc_time_averaged_stats_update_average(&tas); - EXPECT_DOUBLE_EQ(3000, tas.aggregate_weighted_avg); - EXPECT_DOUBLE_EQ(2.5, tas.aggregate_total_weight); -} - -static void some_regress_some_persist_test(void) { - grpc_time_averaged_stats tas; - grpc_time_averaged_stats_init(&tas, 1000, 0.4, 0.6); - /* Sample weight = 0 */ - EXPECT_EQ(1000, tas.aggregate_weighted_avg); - EXPECT_EQ(0, tas.aggregate_total_weight); - - grpc_time_averaged_stats_update_average(&tas); - /* (0.6 * 0 * 1000 + 0.4 * 1000 / 0.4) */ - EXPECT_DOUBLE_EQ(1000, tas.aggregate_weighted_avg); - EXPECT_DOUBLE_EQ(0.4, tas.aggregate_total_weight); - - grpc_time_averaged_stats_add_sample(&tas, 2640); - grpc_time_averaged_stats_update_average(&tas); - /* (1 * 2640 + 0.6 * 0.4 * 1000 + 0.4 * 1000 / (1 + 0.6 * 0.4 + 0.4) */ - EXPECT_DOUBLE_EQ(2000, tas.aggregate_weighted_avg); - EXPECT_DOUBLE_EQ(1.64, tas.aggregate_total_weight); - - grpc_time_averaged_stats_add_sample(&tas, 2876.8); - grpc_time_averaged_stats_update_average(&tas); - /* (1 * 2876.8 + 0.6 * 1.64 * 2000 + 0.4 * 1000 / (1 + 0.6 * 1.64 + 0.4) */ - EXPECT_DOUBLE_EQ(2200, tas.aggregate_weighted_avg); - EXPECT_DOUBLE_EQ(2.384, tas.aggregate_total_weight); - - grpc_time_averaged_stats_add_sample(&tas, 4944.32); - grpc_time_averaged_stats_update_average(&tas); - /* (1 * 4944.32 + 0.6 * 2.384 * 2200 + 0.4 * 1000) / - (1 + 0.6 * 2.384 + 0.4) */ - EXPECT_DOUBLE_EQ(3000, tas.aggregate_weighted_avg); - EXPECT_DOUBLE_EQ(2.8304, tas.aggregate_total_weight); -} - -int main(int argc, char** argv) { - grpc::testing::TestEnvironment env(&argc, argv); - no_regress_no_persist_test_1(); - no_regress_no_persist_test_2(); - no_regress_no_persist_test_3(); - some_regress_no_persist_test(); - some_decay_test(); - no_regress_full_persist_test(); - no_regress_some_persist_test(); - some_regress_some_persist_test(); - return 0; -} diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal index 1b3da26b761..7ce7260d5a9 100644 --- a/tools/doxygen/Doxyfile.c++.internal +++ b/tools/doxygen/Doxyfile.c++.internal @@ -1946,8 +1946,6 @@ src/core/lib/event_engine/iomgr_engine/iomgr_engine.cc \ src/core/lib/event_engine/iomgr_engine/iomgr_engine.h \ src/core/lib/event_engine/iomgr_engine/thread_pool.cc \ src/core/lib/event_engine/iomgr_engine/thread_pool.h \ -src/core/lib/event_engine/iomgr_engine/time_averaged_stats.cc \ -src/core/lib/event_engine/iomgr_engine/time_averaged_stats.h \ src/core/lib/event_engine/iomgr_engine/timer.cc \ src/core/lib/event_engine/iomgr_engine/timer.h \ src/core/lib/event_engine/iomgr_engine/timer_heap.cc \ @@ -2042,6 +2040,8 @@ src/core/lib/gprpp/thd_posix.cc \ src/core/lib/gprpp/thd_windows.cc \ src/core/lib/gprpp/time.cc \ src/core/lib/gprpp/time.h \ +src/core/lib/gprpp/time_averaged_stats.cc \ +src/core/lib/gprpp/time_averaged_stats.h \ src/core/lib/gprpp/time_util.cc \ src/core/lib/gprpp/time_util.h \ src/core/lib/gprpp/unique_type_name.h \ @@ -2172,8 +2172,6 @@ src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc \ src/core/lib/iomgr/tcp_server_windows.cc \ src/core/lib/iomgr/tcp_windows.cc \ src/core/lib/iomgr/tcp_windows.h \ -src/core/lib/iomgr/time_averaged_stats.cc \ -src/core/lib/iomgr/time_averaged_stats.h \ src/core/lib/iomgr/timer.cc \ src/core/lib/iomgr/timer.h \ src/core/lib/iomgr/timer_generic.cc \ diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal index d10e124faa7..5ae3993c362 100644 --- a/tools/doxygen/Doxyfile.core.internal +++ b/tools/doxygen/Doxyfile.core.internal @@ -1737,8 +1737,6 @@ src/core/lib/event_engine/iomgr_engine/iomgr_engine.cc \ src/core/lib/event_engine/iomgr_engine/iomgr_engine.h \ src/core/lib/event_engine/iomgr_engine/thread_pool.cc \ src/core/lib/event_engine/iomgr_engine/thread_pool.h \ -src/core/lib/event_engine/iomgr_engine/time_averaged_stats.cc \ -src/core/lib/event_engine/iomgr_engine/time_averaged_stats.h \ src/core/lib/event_engine/iomgr_engine/timer.cc \ src/core/lib/event_engine/iomgr_engine/timer.h \ src/core/lib/event_engine/iomgr_engine/timer_heap.cc \ @@ -1835,6 +1833,8 @@ src/core/lib/gprpp/thd_posix.cc \ src/core/lib/gprpp/thd_windows.cc \ src/core/lib/gprpp/time.cc \ src/core/lib/gprpp/time.h \ +src/core/lib/gprpp/time_averaged_stats.cc \ +src/core/lib/gprpp/time_averaged_stats.h \ src/core/lib/gprpp/time_util.cc \ src/core/lib/gprpp/time_util.h \ src/core/lib/gprpp/unique_type_name.h \ @@ -1966,8 +1966,6 @@ src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc \ src/core/lib/iomgr/tcp_server_windows.cc \ src/core/lib/iomgr/tcp_windows.cc \ src/core/lib/iomgr/tcp_windows.h \ -src/core/lib/iomgr/time_averaged_stats.cc \ -src/core/lib/iomgr/time_averaged_stats.h \ src/core/lib/iomgr/timer.cc \ src/core/lib/iomgr/timer.h \ src/core/lib/iomgr/timer_generic.cc \ diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json index b03a7125601..8b1e5a914f4 100644 --- a/tools/run_tests/generated/tests.json +++ b/tools/run_tests/generated/tests.json @@ -623,30 +623,6 @@ ], "uses_polling": true }, - { - "args": [], - "benchmark": false, - "ci_platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "cpu_cost": 1.0, - "exclude_configs": [], - "exclude_iomgrs": [], - "flaky": false, - "gtest": false, - "language": "c", - "name": "test_core_iomgr_time_averaged_stats_test", - "platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "uses_polling": false - }, { "args": [], "benchmark": false, @@ -6703,30 +6679,6 @@ ], "uses_polling": false }, - { - "args": [], - "benchmark": false, - "ci_platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "cpu_cost": 1.0, - "exclude_configs": [], - "exclude_iomgrs": [], - "flaky": false, - "gtest": true, - "language": "c++", - "name": "test_core_event_engine_iomgr_event_engine_time_averaged_stats_test", - "platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "uses_polling": false - }, { "args": [], "benchmark": false,