fix: merge conflicts from pulling master

2 years ago · 1230e0bfd9
parent 69c2b4de29
commit 1230e0bfd9
2 changed files with 2 additions and 4 deletions
--- a/runtime/src/listener_thread.c
+++ b/runtime/src/listener_thread.c
@ -410,8 +410,6 @@ listener_thread_main(void *dummy)
 {
 	struct epoll_event epoll_events[RUNTIME_MAX_EPOLL_EVENTS];

-	generic_thread_initialize();
-
 	metrics_server_init();
 	listener_thread_register_metrics_server();

--- a/runtime/src/metrics_server_route_level_metrics.c
+++ b/runtime/src/metrics_server_route_level_metrics.c
@ -6,8 +6,8 @@

 // tenant_database_foreach_cb_t

-static const int p50_idx = PERF_WINDOW_BUFFER_SIZE * 50 / 100;
-static const int p90_idx = PERF_WINDOW_BUFFER_SIZE * 90 / 100;
+static const int p50_idx = perf_window_capacity * 50 / 100;
+static const int p90_idx = perf_window_capacity * 90 / 100;

 void
 render_routes(struct route *route, void *arg_one, void *arg_two)