projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Enable agent application contexts if filter has such dependencies
[lttng-tools.git]
/
tests
/
utils
/
utils.sh
diff --git
a/tests/utils/utils.sh
b/tests/utils/utils.sh
index d08d6b23cf3164476975e2959172a48cd106f7aa..da23f7abeb1780191b86e41a0a88219fd32eeb56 100644
(file)
--- a/
tests/utils/utils.sh
+++ b/
tests/utils/utils.sh
@@
-86,6
+86,16
@@
function randstring()
echo
}
echo
}
+# Return the number of _configured_ CPUs.
+function conf_proc_count()
+{
+ getconf _NPROCESSORS_CONF
+ if [ $? -ne 0 ]; then
+ diag "Failed to get the number of configured CPUs"
+ fi
+ echo
+}
+
function enable_kernel_lttng_event
{
local expected_to_fail="$1"
function enable_kernel_lttng_event
{
local expected_to_fail="$1"
@@
-269,7
+279,7
@@
function start_lttng_relayd_opt()
DIR=$(readlink -f $TESTDIR)
DIR=$(readlink -f $TESTDIR)
- if [ -z $(p
idof
lt-$RELAYD_BIN) ]; then
+ if [ -z $(p
grep --full
lt-$RELAYD_BIN) ]; then
$DIR/../src/bin/lttng-relayd/$RELAYD_BIN -b $opt 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
#$DIR/../src/bin/lttng-relayd/$RELAYD_BIN $opt -vvv >>/tmp/relayd.log 2>&1 &
if [ $? -eq 1 ]; then
$DIR/../src/bin/lttng-relayd/$RELAYD_BIN -b $opt 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
#$DIR/../src/bin/lttng-relayd/$RELAYD_BIN $opt -vvv >>/tmp/relayd.log 2>&1 &
if [ $? -eq 1 ]; then
@@
-301,7
+311,7
@@
function stop_lttng_relayd_opt()
{
local withtap=$1
{
local withtap=$1
- PID_RELAYD=`p
idof
lt-$RELAYD_BIN`
+ PID_RELAYD=`p
grep --full
lt-$RELAYD_BIN`
if [ $withtap -eq "1" ]; then
diag "Killing lttng-relayd (pid: $PID_RELAYD)"
if [ $withtap -eq "1" ]; then
diag "Killing lttng-relayd (pid: $PID_RELAYD)"
@@
-317,7
+327,7
@@
function stop_lttng_relayd_opt()
else
out=1
while [ -n "$out" ]; do
else
out=1
while [ -n "$out" ]; do
- out=$(p
idof
lt-$RELAYD_BIN)
+ out=$(p
grep --full
lt-$RELAYD_BIN)
sleep 0.5
done
if [ $withtap -eq "1" ]; then
sleep 0.5
done
if [ $withtap -eq "1" ]; then
@@
-359,10
+369,10
@@
function start_lttng_sessiond_opt()
: ${LTTNG_SESSION_CONFIG_XSD_PATH=${DIR}/../src/common/config/}
export LTTNG_SESSION_CONFIG_XSD_PATH
: ${LTTNG_SESSION_CONFIG_XSD_PATH=${DIR}/../src/common/config/}
export LTTNG_SESSION_CONFIG_XSD_PATH
- if [ -z $(p
idof
lt-$SESSIOND_BIN) ]; then
+ if [ -z $(p
grep --full
lt-$SESSIOND_BIN) ]; then
# Have a load path ?
if [ -n "$load_path" ]; then
# Have a load path ?
if [ -n "$load_path" ]; then
- $DIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --load "$
1
" --background --consumerd32-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" --consumerd64-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd"
+ $DIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --load "$
load_path
" --background --consumerd32-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" --consumerd64-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd"
else
$DIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --background --consumerd32-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" --consumerd64-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd"
fi
else
$DIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --background --consumerd32-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" --consumerd64-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd"
fi
@@
-395,7
+405,7
@@
function stop_lttng_sessiond_opt()
return
fi
return
fi
- PID_SESSIOND=`p
idof
lt-$SESSIOND_BIN`
+ PID_SESSIOND=`p
grep --full
lt-$SESSIOND_BIN`
if [ -n "$2" ]; then
kill_opt="$kill_opt -s $signal"
if [ -n "$2" ]; then
kill_opt="$kill_opt -s $signal"
@@
-410,12
+420,12
@@
function stop_lttng_sessiond_opt()
else
out=1
while [ -n "$out" ]; do
else
out=1
while [ -n "$out" ]; do
- out=$(p
idof
lt-$SESSIOND_BIN)
+ out=$(p
grep --full
lt-$SESSIOND_BIN)
sleep 0.5
done
out=1
while [ -n "$out" ]; do
sleep 0.5
done
out=1
while [ -n "$out" ]; do
- out=$(p
idof
$CONSUMERD_BIN)
+ out=$(p
grep --full
$CONSUMERD_BIN)
sleep 0.5
done
if [ $withtap -eq "1" ]; then
sleep 0.5
done
if [ $withtap -eq "1" ]; then
@@
-440,7
+450,7
@@
function stop_lttng_consumerd_opt()
local signal=$2
local kill_opt=""
local signal=$2
local kill_opt=""
- PID_CONSUMERD=`p
idof
$CONSUMERD_BIN`
+ PID_CONSUMERD=`p
grep --full
$CONSUMERD_BIN`
if [ -n "$2" ]; then
kill_opt="$kill_opt -s $signal"
if [ -n "$2" ]; then
kill_opt="$kill_opt -s $signal"
@@
-461,7
+471,7
@@
function stop_lttng_consumerd_opt()
else
out=1
while [ $out -ne 0 ]; do
else
out=1
while [ $out -ne 0 ]; do
- pid=$(p
idof
$CONSUMERD_BIN)
+ pid=$(p
grep --full
$CONSUMERD_BIN)
# If consumerds are still present check their status.
# A zombie status qualifies the consumerd as *killed*
# If consumerds are still present check their status.
# A zombie status qualifies the consumerd as *killed*
This page took
0.027004 seconds
and
4
git commands to generate.