[ltt-dev] [PATCH] Add output directory option to usttrace

[ltt-dev] [PATCH] Add output directory option to usttrace

[David Goulet]

This patch add the -o option to usttrace to control the output directory
given to the UST daemon.

Signed-off-by: David Goulet <david.goulet at polymtl.ca>
---
 usttrace |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/usttrace b/usttrace
index 5fdb52f..94404dd 100755
--- a/usttrace
+++ b/usttrace
@@ -56,9 +56,10 @@ function usage () {
 	echo "    -s    Use system-wide daemon instead of creating one for this session." 2>/dev/stderr
 	echo "    -S    Specify the subbuffer size." 2>/dev/stderr
 	echo "    -N    Specify the number of subbuffers." 2>/dev/stderr
+	echo "    -o    Output directory of the trace." 2>/dev/stderr
 }
 
-while getopts ":hlLmfsWS:N:" options; do
+while getopts ":hlLmfsWS:N:o:" options; do
 	case $options in
 		l) arg_preload_libust=1;;
 		L) arg_ld_std_ust=1;;
@@ -68,6 +69,7 @@ while getopts ":hlLmfsWS:N:" options; do
 		W) where=1;;
 		S) export UST_SUBBUF_SIZE=$OPTARG;;
 		N) export UST_SUBBUF_NUM=$OPTARG;;
+		o) OUTPUT_DIR=$OPTARG;;
 		h) usage;
 		   exit 0;;
 		\?) usage
@@ -100,9 +102,20 @@ then
 fi
 
 # Create directory for trace output
-DATESTRING="$(hostname)-$(date +%Y%m%d%H%M%S%N)"
-OUTDIR="$BASE_TRACE_DIR/$DATESTRING"
-mkdir -p "$OUTDIR"
+if [ -n "$OUTPUT_DIR" ]; then
+	OUTDIR=$OUTPUT_DIR
+else
+	DATESTRING="$(hostname)-$(date +%Y%m%d%H%M%S%N)"
+	OUTDIR="$BASE_TRACE_DIR/$DATESTRING"
+fi
+
+# Check if directory exist
+if [ ! -d "$OUTDIR" ]; then
+	mkdir -p $OUTDIR
+	if [ $? -eq 1 ]; then
+		exit 1
+	fi
+fi
 
 # Choose ustd socket path
 USTDSOCKPATH="/tmp/ustd-sock-$$"
-- 
1.7.3.2

[ltt-dev] [PATCH] Add output directory option to usttrace

[Mathieu Desnoyers]

* David Goulet (david.goulet at polymtl.ca) wrote:
> This patch add the -o option to usttrace to control the output directory
> given to the UST daemon.
> 
> Signed-off-by: David Goulet <david.goulet at polymtl.ca>

This will be useful for the upcoming "lttngtrace". Thanks !

Committed and pushed.

Mathieu

> ---
>  usttrace |   21 +++++++++++++++++----
>  1 files changed, 17 insertions(+), 4 deletions(-)
> 
> diff --git a/usttrace b/usttrace
> index 5fdb52f..94404dd 100755
> --- a/usttrace
> +++ b/usttrace
> @@ -56,9 +56,10 @@ function usage () {
>  	echo "    -s    Use system-wide daemon instead of creating one for this session." 2>/dev/stderr
>  	echo "    -S    Specify the subbuffer size." 2>/dev/stderr
>  	echo "    -N    Specify the number of subbuffers." 2>/dev/stderr
> +	echo "    -o    Output directory of the trace." 2>/dev/stderr
>  }
>  
> -while getopts ":hlLmfsWS:N:" options; do
> +while getopts ":hlLmfsWS:N:o:" options; do
>  	case $options in
>  		l) arg_preload_libust=1;;
>  		L) arg_ld_std_ust=1;;
> @@ -68,6 +69,7 @@ while getopts ":hlLmfsWS:N:" options; do
>  		W) where=1;;
>  		S) export UST_SUBBUF_SIZE=$OPTARG;;
>  		N) export UST_SUBBUF_NUM=$OPTARG;;
> +		o) OUTPUT_DIR=$OPTARG;;
>  		h) usage;
>  		   exit 0;;
>  		\?) usage
> @@ -100,9 +102,20 @@ then
>  fi
>  
>  # Create directory for trace output
> -DATESTRING="$(hostname)-$(date +%Y%m%d%H%M%S%N)"
> -OUTDIR="$BASE_TRACE_DIR/$DATESTRING"
> -mkdir -p "$OUTDIR"
> +if [ -n "$OUTPUT_DIR" ]; then
> +	OUTDIR=$OUTPUT_DIR
> +else
> +	DATESTRING="$(hostname)-$(date +%Y%m%d%H%M%S%N)"
> +	OUTDIR="$BASE_TRACE_DIR/$DATESTRING"
> +fi
> +
> +# Check if directory exist
> +if [ ! -d "$OUTDIR" ]; then
> +	mkdir -p $OUTDIR
> +	if [ $? -eq 1 ]; then
> +		exit 1
> +	fi
> +fi
>  
>  # Choose ustd socket path
>  USTDSOCKPATH="/tmp/ustd-sock-$$"
> -- 
> 1.7.3.2
> 
> 
> _______________________________________________
> ltt-dev mailing list
> ltt-dev at lists.casi.polymtl.ca
> http://lists.casi.polymtl.ca/cgi-bin/mailman/listinfo/ltt-dev
> 

-- 
Mathieu Desnoyers
Operating System Efficiency R&D Consultant
EfficiOS Inc.
http://www.efficios.com