diff options
| author |   Dave Barach <dave@barachs.net> | 2018-08-29 08:50:40 -0400 |
|---|---|---|
| committer |   Florin Coras <florin.coras@gmail.com> | 2018-08-30 18:33:23 +0000 |
| commit | e89be4ec559f4eb83ec37c9a452f73383665f5c0 (patch) | |
| tree | a009c0332f23aa75ec199efd2a8dd1f6f677c42c /src/vpp/app | |
| parent | d1318256bfa69218beb10f9c9c0a5fcf1481eaf2 (diff) | |
Crude stat segment lock recovery
Make sure that vpp_get_stats main heap does not address-collide with
the stats segment, which lands "somewhere" in the vpp address space.
Add mising MAP_ANONYMOUS flag in clib_mem_vm_map
Change-Id: I8a671d174eefd8dd24771ad2ed9f1250e2c7a9f8
Signed-off-by: Dave Barach <dave@barachs.net>
Signed-off-by: Ole Troan <ot@cisco.com>
Diffstat (limited to 'src/vpp/app')
| -rw-r--r-- | src/vpp/app/vpp_get_stats.c | 4 | ||||
| -rw-r--r-- | src/vpp/app/vpp_prometheus_export.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/vpp/app/vpp_get_stats.c b/src/vpp/app/vpp_get_stats.c index 86e511e56f2..c1f43a747ed 100644 --- a/src/vpp/app/vpp_get_stats.c +++ b/src/vpp/app/vpp_get_stats.c @@ -108,8 +108,10 @@ main (int argc, char **argv) u8 *stat_segment_name, *pattern = 0, **patterns = 0; int rv; enum stat_client_cmd_e cmd = STAT_CLIENT_CMD_UNKNOWN; + void *heap_base; - clib_mem_init (0, 128 << 20); + heap_base = clib_mem_vm_map ((void *) 0x10000000ULL, 128 << 20); + clib_mem_init (heap_base, 128 << 20); unformat_init_command_line (a, argv); diff --git a/src/vpp/app/vpp_prometheus_export.c b/src/vpp/app/vpp_prometheus_export.c index 57c65178c73..cc85b817063 100644 --- a/src/vpp/app/vpp_prometheus_export.c +++ b/src/vpp/app/vpp_prometheus_export.c @@ -223,8 +223,10 @@ main (int argc, char **argv) unformat_input_t _argv, *a = &_argv; u8 *stat_segment_name, *pattern = 0, **patterns = 0; int rv; + void *heap_base; - clib_mem_init (0, 128 << 20); + heap_base = clib_mem_vm_map ((void *) 0x10000000ULL, 128 << 20); + clib_mem_init (heap_base, 128 << 20); unformat_init_command_line (a, argv); |