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>
bool rx_is_running = false;
bool timeout_thread_cancelled = false;
+/* Only ever allocate one heap */
+bool mem_initialized = false;
+
static void
init (void)
{
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;
}
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
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()
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)
#!/usr/bin/env python3
import unittest
-import time
import psutil
from vpp_papi.vpp_stats import VPPStats