X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fapp_test%2Frun_exrts_test.sh;h=6740e85c1212982ed077c56ced3da60e925352a4;hb=c8e651e15839411c85e105d16fd2ffc14c1cc1dd;hp=9f0a4369bead4b6a5391e8e0c1041a62060cc74b;hpb=ca366b18fa2887300361abc2539f23c068601598;p=ric-plt%2Flib%2Frmr.git

diff --git a/test/app_test/run_exrts_test.sh b/test/app_test/run_exrts_test.sh
index 9f0a436..6740e85 100644
--- a/test/app_test/run_exrts_test.sh
+++ b/test/app_test/run_exrts_test.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/env ksh
 # vim: ts=4 sw=4 noet :
 #==================================================================================
-#    Copyright (c) 2019-2020 Nokia
-#    Copyright (c) 2018-2020 AT&T Intellectual Property.
+#    Copyright (c) 2019-2021 Nokia
+#    Copyright (c) 2018-2021 AT&T Intellectual Property.
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
@@ -38,11 +38,22 @@
 
 ulimit -c unlimited
 
+# driven with -L sender or -L receiver on the command line
+# run something though valgrind to check for leaks; requires valgind
+function leak_anal {
+	valgrind  -v --leak-resolution=high --leak-check=yes $opt "$@"
+}
+
 # The sender and receivers are run asynch. Their exit statuses are captured in a
 # file in order for the 'main' to pick them up easily.
 #
 function run_sender {
-	./v_sender${si} ${nmsg:-10} ${delay:-100000} ${mtype_start_stop:-0:1} 
+	if (( la_sender ))
+	then
+		leak_anal ./v_sender ${nmsg:-10} ${delay:-100000} ${mtype_start_stop:-0:1}  >/tmp/la.log 2>&1
+	else
+		./v_sender ${nmsg:-10} ${delay:-100000} ${mtype_start_stop:-0:1}
+	fi
 	echo $? >/tmp/PID$$.src		# must communicate state back via file b/c asynch
 }
 
@@ -52,7 +63,12 @@ function run_rcvr {
 
 	port=$(( 4460 + ${1:-0} ))
 	export RMR_RTG_SVC=$(( 9990 + $1 ))
-	./ex_rts_receiver${si} $copyclone -p $port
+	if (( la_receiver ))
+	then
+		leak_anal ./ex_rts_receiver $copyclone -p $port >/tmp/la.log 2>&1
+	else
+		./ex_rts_receiver $copyclone -p $port
+	fi
 	echo $? >/tmp/PID$$.$1.rrc
 }
 
@@ -61,10 +77,10 @@ function run_rcvr {
 #
 function set_rt {
 	typeset port=4460
-	typeset groups="localhost:4460"
+	typeset groups="127.0.0.1:4460"
 	for (( i=1; i < ${1:-3}; i++ ))
 	do
-		groups="$groups,localhost:$((port+i))"
+		groups="$groups,127.0.0.1:$((port+i))"
 	done
 
 	cat <<endKat >ex_rts.rt
@@ -105,7 +121,6 @@ verbose=0
 nrcvrs=1					# this is sane, but -r allows it to be set up
 use_installed=0
 mtype_start_stop=""
-si=""						# -S will enable si library testing
 
 while [[ $1 == -* ]]
 do
@@ -114,18 +129,20 @@ do
 		-B)	rebuild=1;;
 		-d)	delay=${2//,/}; shift;;				# delay in micro seconds allow 1,000 to make it easier on user
 		-i)	use_installed=1;;
+		-L)	leak_anal=$2; shift;;
 		-m)	mtype_start_stop="$2"; shift;;
 		-M)	mt_call_flag="EX_CFLAGS=-DMTC=1";;	# turn on mt-call receiver option
-		-N)	si="";;								# enable nng based testing
+		-N)	;;									# ignored for back compat; nng not supported
 		-n)	nmsg=$2; shift;;
 		-r) nrcvrs=$2; shift;;
-		-S)	si="_si";;							# run SI95 based binaries
+		-S)	;;									# ignored for back compat; si95 is the only supported transport
 		-v)	verbose=1;;
 
 		*)	echo "unrecognised option: $1"
 			echo "usage: $0 [-B] [-c caller-threads] [-d micor-sec-delay] [-i] [-M] [-m mtype] [-n num-msgs] [-r num-receivers] [-S] [-v]"
 			echo "  -B forces a rebuild which will use .build"
 			echo "  -i will use installed libraries (/usr/local) and cause -B to be ignored if supplied)"
+			echo "  -L {sender|receiver} run the sender or recevier code under valgrind for leak analysis (output to /tmp/la.log)"
 			echo "  -m mtype  will set the stopping (max) message type; sender will loop through 0 through mtype-1"
 			echo "  -m start:stop  will set the starting and stopping mtypes; start through stop -1"
 			echo "  -M enables mt-call receive processing to test the RMR asynch receive pthread"
@@ -141,6 +158,11 @@ do
 	shift
 done
 
+# set leak analysis (do not do this from any automated tests)
+case $leak_anal in 
+	s*)	la_sender=1;;
+	r*)	la_receiver=1;;
+esac
 
 if (( verbose ))
 then
@@ -185,7 +207,7 @@ export RMR_SEED_RT=./ex_rts.rt
 
 set_rt $nrcvrs														# set up the rt for n receivers
 
-if ! build_path=$build_path make -B $mt_call_flag v_sender${si} ex_rts_receiver${si} >/tmp/PID$$.log 2>&1			# for sanity, always rebuild test binaries
+if ! build_path=$build_path make -B $mt_call_flag v_sender ex_rts_receiver >/tmp/PID$$.log 2>&1			# for sanity, always rebuild test binaries
 then
 	echo "[FAIL] cannot make binaries"
 	echo "====="