vppinfra: fix typo in dlmalloc.c

Fix libffi package name for Ubuntu 20.04

Type: fix

Signed-off-by: Dave Barach <dave@barachs.net>
Change-Id: Idc567717494b4c40c307f20a40d5e10cd26b0a46

diff --git a/Makefile b/Makefile
index fde91c4..3a5c80b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -66,19 +66,23 @@ DEB_DEPENDS += debhelper dkms git libtool libapr1-dev dh-systemd
 DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config
 DEB_DEPENDS += lcov chrpath autoconf indent clang-format libnuma-dev
 DEB_DEPENDS += python-all python3-all python3-setuptools
-DEB_DEPENDS += python-virtualenv python-pip libffi6 check
+DEB_DEPENDS += python-virtualenv python-pip check
 DEB_DEPENDS += libboost-all-dev libffi-dev python3-ply libmbedtls-dev
 DEB_DEPENDS += cmake ninja-build uuid-dev python3-jsonschema python3-yaml
 DEB_DEPENDS += python3-venv  # ensurepip
 DEB_DEPENDS += python3-dev   # needed for python3 -m pip install psutil
 # python3.6 on 16.04 requires python36-dev
 
+LIBFFI=libffi6 # works on all but 20.04
+
 ifeq ($(OS_VERSION_ID),16.04)
        DEB_DEPENDS += python-dev
        DEB_DEPENDS += libssl-dev
 else ifeq ($(OS_VERSION_ID),18.04)
        DEB_DEPENDS += python-dev
        DEB_DEPENDS += libssl-dev
+else ifeq ($(OS_VERSION_ID),20.04)
+       LIBFFI=libffi7
 else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-8)
        DEB_DEPENDS += libssl-dev
        APT_ARGS = -t jessie-backports
@@ -88,6 +92,8 @@ else
        DEB_DEPENDS += libssl-dev
 endif
 
+DEB_DEPENDS += $(LIBFFI)
+
 RPM_DEPENDS  = redhat-lsb glibc-static
 RPM_DEPENDS += apr-devel
 RPM_DEPENDS += numactl-devel

diff --git a/src/vppinfra/dlmalloc.c b/src/vppinfra/dlmalloc.c
index 23b4dfc..099b85e 100644 (file)
--- a/src/vppinfra/dlmalloc.c
+++ b/src/vppinfra/dlmalloc.c
@@ -1249,7 +1249,7 @@ static struct malloc_state _gm_;
 #define disable_expand(M) ((M)->mflags |= USE_NOEXPAND_BIT)
 #define use_trace(M) ((M)->mflags & USE_TRACE_BIT)
 #define enable_trace(M) ((M)->mflags |= USE_TRACE_BIT)
-#define disable_trace(M) ((M)->mflags |= USE_TRACE_BIT)
+#define disable_trace(M) ((M)->mflags &= ~USE_TRACE_BIT)
 
 #define set_lock(M,L)\
  ((M)->mflags = (L)?\