aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOle Troan <ot@cisco.com>2020-09-30 10:43:00 +0200
committerOle Troan <ot@cisco.com>2020-10-07 12:46:08 +0200
commit65fa036ec71b9b111b22802a69a83af2798ea10e (patch)
treede2b3de644c1b2b6c8b540d5076aaeafa4c9e775
parent1f36023d29137825b8a09578d09b955046c2415b (diff)
api: add heap alloc to vpp stats
The Python VPP Stats module also used the VPP heap. Fix so it now explicitly allocates a heap. Fixes: f68fccfe7e188fec2c9f91da38ca9acf6f67d811 Type: fix Signed-off-by: Ole Troan <ot@cisco.com> Change-Id: I0bd4ae64d6c89cdf634d8d9a91c23ab38017c5cc Signed-off-by: Ole Troan <ot@cisco.com>
-rw-r--r--src/vpp-api/client/client.c6
-rw-r--r--src/vpp-api/python/vpp_papi/vpp_stats.py2
-rw-r--r--src/vpp-api/python/vpp_papi/vpp_transport_shmem.py2
-rw-r--r--test/test_stats_client.py1
4 files changed, 9 insertions, 2 deletions
diff --git a/src/vpp-api/client/client.c b/src/vpp-api/client/client.c
index 0d7b1dcafc8..2127a62269f 100644
--- a/src/vpp-api/client/client.c
+++ b/src/vpp-api/client/client.c
@@ -79,6 +79,9 @@ u16 read_timeout = 0;
bool rx_is_running = false;
bool timeout_thread_cancelled = false;
+/* Only ever allocate one heap */
+bool mem_initialized = false;
+
static void
init (void)
{
@@ -564,8 +567,11 @@ vac_set_error_handler (vac_error_callback_t cb)
void
vac_mem_init (size_t size)
{
+ if (mem_initialized)
+ return;
if (size == 0)
clib_mem_init (0, 1 << 30); // default
else
clib_mem_init (0, size);
+ mem_initialized = true;
}
diff --git a/src/vpp-api/python/vpp_papi/vpp_stats.py b/src/vpp-api/python/vpp_papi/vpp_stats.py
index 1a65c8ebad8..5eb2b9d91af 100644
--- a/src/vpp-api/python/vpp_papi/vpp_stats.py
+++ b/src/vpp-api/python/vpp_papi/vpp_stats.py
@@ -85,6 +85,7 @@ char *stat_segment_index_to_name_r (uint32_t index, stat_client_main_t * sm);
uint64_t stat_segment_version(void);
uint64_t stat_segment_version_r(stat_client_main_t *sm);
void free(void *ptr);
+void vac_mem_init (size_t size);
""") # noqa: E501
@@ -203,6 +204,7 @@ class VPPStats(object):
except Exception:
raise VPPStatsClientLoadError("Could not open: %s" %
VPPStats.sharedlib_name)
+ self.api.vac_mem_init(0)
def connect(self):
self.client = self.api.stat_client_get()
diff --git a/src/vpp-api/python/vpp_papi/vpp_transport_shmem.py b/src/vpp-api/python/vpp_papi/vpp_transport_shmem.py
index fbf19e4846f..fa8943fc119 100644
--- a/src/vpp-api/python/vpp_papi/vpp_transport_shmem.py
+++ b/src/vpp-api/python/vpp_papi/vpp_transport_shmem.py
@@ -68,7 +68,7 @@ class VppTransport(object):
global vpp_object
vpp_object = parent
- vpp_api.vac_mem_init(0);
+ vpp_api.vac_mem_init(0)
# Register error handler
vpp_api.vac_set_error_handler(vac_error_handler)
diff --git a/test/test_stats_client.py b/test/test_stats_client.py
index 7d0c91f24fd..ced58710e35 100644
--- a/test/test_stats_client.py
+++ b/test/test_stats_client.py
@@ -1,7 +1,6 @@
#!/usr/bin/env python3
import unittest
-import time
import psutil
from vpp_papi.vpp_stats import VPPStats