From 84be3a03be99bd051fbb1d5648b20c2617416e28 Mon Sep 17 00:00:00 2001 From: Daniel Walton Date: Mon, 8 May 2017 13:28:07 +0000 Subject: [PATCH] Added config option for valgrind executable Signed-off-by: Daniel Walton --- cumulus/etc/frr/debian.conf | 6 +++++- tools/frr | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cumulus/etc/frr/debian.conf b/cumulus/etc/frr/debian.conf index 7b9b20bd5b..5ac61d4d5c 100644 --- a/cumulus/etc/frr/debian.conf +++ b/cumulus/etc/frr/debian.conf @@ -4,7 +4,6 @@ # Check /etc/pam.d/frr if you intend to use "vtysh"! # vtysh_enable=yes -valgrind_enable=no zebra_options=" -s 90000000 --daemon -A 127.0.0.1" bgpd_options=" --daemon -A 127.0.0.1" ospfd_options=" --daemon -A 127.0.0.1" @@ -19,3 +18,8 @@ nhrpd_options=" --daemon -A 127.0.0.1" # The list of daemons to watch is automatically generated by the init script. watchfrr_enable=yes watchfrr_options=(-adz -r /usr/sbin/servicebBfrrbBrestartbB%s -s /usr/sbin/servicebBfrrbBstartbB%s -k /usr/sbin/servicebBfrrbBstopbB%s -b bB -t 30) + +# If valgrind_enable is 'yes' the frr daemons will be started via valgrind. +# The use case for doing so is tracking down memory leaks, etc in frr. +valgrind_enable=no +valgrind=/usr/bin/valgrind diff --git a/tools/frr b/tools/frr index 4902b8c9a9..6b5600b16c 100755 --- a/tools/frr +++ b/tools/frr @@ -154,7 +154,7 @@ start() ${SSD} \ --start \ --pidfile=`pidfile $1` \ - --exec "/usr/bin/valgrind" \ + --exec $valgrind \ -- --trace-children=no --leak-check=full --log-file=/var/log/frr/$1-valgrind.log $D_PATH/$1 \ `eval echo "$""$1""_options"` else -- 2.39.5