aboutsummaryrefslogtreecommitdiffstats
path: root/src/svm
diff options
context:
space:
mode:
authorJan Srnicek <jsrnicek@cisco.com>2017-03-24 10:18:11 +0100
committerJan Srnicek <jsrnicek@cisco.com>2017-08-14 12:19:31 +0000
commit5beec81360146536086f1996869b4ee32ca37ddc (patch)
treed82ccff22185b5c23c3eb624bbaa53f68abcd84b /src/svm
parent0117d24a1f6d018933c8f3e4ecca269f57f431ab (diff)
jvpp: make shm_prefix configurable (VPP-591)
svm.c - set default map region root path only if root path is not already present memory_shared.c - added option for tests to send memory region name and root path in one variable, if so name and root path are separated here and set to map region structure so find function can find it properly jvpp-registry.c - added parameters shmPrefix to be able pass + removed sudo restriction specific shared memory prefix that is used while starting python tests(see framework.py) JVppRegistyImpl - added option to specify shmPrefix VppJNIConnection - added option to specify shmPrefix Change-Id: I3f89f867fb9b20eef00fbd497cb0e41b25d6eab7 Signed-off-by: Jan Srnicek <jsrnicek@cisco.com> Signed-off-by: Matej Perina <mperina@cisco.com>
Diffstat (limited to 'src/svm')
-rw-r--r--src/svm/svm.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/svm/svm.c b/src/svm/svm.c
index 600fa7448ac..0442ecb2950 100644
--- a/src/svm/svm.c
+++ b/src/svm/svm.c
@@ -862,7 +862,8 @@ svm_region_find_or_create (svm_map_region_args_t * a)
ASSERT (mp);
/* Map the named region from the correct chroot environment */
- a->root_path = (char *) mp->root_path;
+ if (a->root_path == NULL)
+ a->root_path = (char *) mp->root_path;
/*
* See if this region is already known. If it is, we're