From 7176b800fa5570a14d9d403183131f5115158baf Mon Sep 17 00:00:00 2001 From: Benoît Ganne Date: Mon, 16 Dec 2019 15:26:49 +0100 Subject: perfmon: fix per-worker data initialization MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When perfmon_init is called at initialization time worker threads are not created yet and vec_len(vlib_mains) returns 1. Initialize per-worker data when the number of workers is known, when enabling data collection instead. Type: fix Change-Id: I36887cc7b2a3e88d9728d3cd7262d9b1c968dd3c Signed-off-by: Benoît Ganne --- src/plugins/perfmon/perfmon.c | 6 ------ 1 file changed, 6 deletions(-) (limited to 'src/plugins/perfmon/perfmon.c') diff --git a/src/plugins/perfmon/perfmon.c b/src/plugins/perfmon/perfmon.c index 552c88757f7..7e276c30810 100644 --- a/src/plugins/perfmon/perfmon.c +++ b/src/plugins/perfmon/perfmon.c @@ -110,14 +110,8 @@ perfmon_init (vlib_main_t * vm) /* Default data collection interval */ pm->timeout_interval = 2.0; /* seconds */ vec_validate (pm->pm_fds, 1); - vec_validate (pm->pm_fds[0], vec_len (vlib_mains) - 1); - vec_validate (pm->pm_fds[1], vec_len (vlib_mains) - 1); vec_validate (pm->perf_event_pages, 1); - vec_validate (pm->perf_event_pages[0], vec_len (vlib_mains) - 1); - vec_validate (pm->perf_event_pages[1], vec_len (vlib_mains) - 1); vec_validate (pm->rdpmc_indices, 1); - vec_validate (pm->rdpmc_indices[0], vec_len (vlib_mains) - 1); - vec_validate (pm->rdpmc_indices[1], vec_len (vlib_mains) - 1); pm->page_size = getpagesize (); pm->perfmon_table = 0; -- cgit 1.2.3-korg