Added config option for valgrind executable

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
This commit is contained in:
Daniel Walton 2017-05-08 13:28:07 +00:00
parent d088b27ebd
commit 84be3a03be
2 changed files with 6 additions and 2 deletions

View File

@ -4,7 +4,6 @@
# Check /etc/pam.d/frr if you intend to use "vtysh"! # Check /etc/pam.d/frr if you intend to use "vtysh"!
# #
vtysh_enable=yes vtysh_enable=yes
valgrind_enable=no
zebra_options=" -s 90000000 --daemon -A 127.0.0.1" zebra_options=" -s 90000000 --daemon -A 127.0.0.1"
bgpd_options=" --daemon -A 127.0.0.1" bgpd_options=" --daemon -A 127.0.0.1"
ospfd_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. # The list of daemons to watch is automatically generated by the init script.
watchfrr_enable=yes 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) 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

View File

@ -154,7 +154,7 @@ start()
${SSD} \ ${SSD} \
--start \ --start \
--pidfile=`pidfile $1` \ --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 \ -- --trace-children=no --leak-check=full --log-file=/var/log/frr/$1-valgrind.log $D_PATH/$1 \
`eval echo "$""$1""_options"` `eval echo "$""$1""_options"`
else else