[lttng-dev] [PATCH lttng-tools v2] Fix: tests: support systems where PAGE_SIZE is not 4096

[Jérémie Galarneau]

Merged in master and stable-2.7.

Thanks!
Jérémie

On Tue, Sep 22, 2015 at 5:14 PM, Michael Jeanson <mjeanson at efficios.com> wrote:
> Signed-off-by: Michael Jeanson <mjeanson at efficios.com>
> ---
>  tests/regression/tools/snapshots/ust_test          |  5 +-
>  .../tools/tracefile-limits/test_tracefile_size     | 56 +++++++++++++++++++++-
>  2 files changed, 58 insertions(+), 3 deletions(-)
>
> diff --git a/tests/regression/tools/snapshots/ust_test b/tests/regression/tools/snapshots/ust_test
> index f05846f..54e1d88 100755
> --- a/tests/regression/tools/snapshots/ust_test
> +++ b/tests/regression/tools/snapshots/ust_test
> @@ -181,9 +181,12 @@ function test_ust_local_snapshot ()
>
>  function test_ust_local_snapshot_max_size ()
>  {
> -       subbuf_size=8192
> +       page_size=`getconf PAGE_SIZE`
>         num_cpus=`nproc`
>
> +       # The minimum subbuf size is the platform PAGE_SIZE
> +       subbuf_size=$(($page_size*2))
> +
>         # The minimum size limit is min(subbuf_size) * nb_streams
>         max_size=$(($subbuf_size*$num_cpus))
>
> diff --git a/tests/regression/tools/tracefile-limits/test_tracefile_size b/tests/regression/tools/tracefile-limits/test_tracefile_size
> index 9fe4637..809490c 100755
> --- a/tests/regression/tools/tracefile-limits/test_tracefile_size
> +++ b/tests/regression/tools/tracefile-limits/test_tracefile_size
> @@ -22,11 +22,13 @@ TESTDIR=$CURDIR/../../..
>
>  NR_ITER=1000
>
> +PAGE_SIZE=$(getconf PAGE_SIZE)
> +
>  TESTAPP_PATH="$TESTDIR/utils/testapp"
>  TESTAPP_NAME="gen-ust-events"
>  TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
>
> -NUM_TESTS=42
> +NUM_TESTS=58
>
>  source $TESTDIR/utils/utils.sh
>
> @@ -128,17 +130,67 @@ function test_tracefile_size_limit ()
>         rm -rf $trace_path
>  }
>
> +function test_tracefile_size_limit_pagesize ()
> +{
> +       # Set a size limit lower than the page_size
> +       size_limit="$(($PAGE_SIZE-2))"
> +       trace_path=$(mktemp -d)
> +       session_name=$(randstring 16 0)
> +       channel_name="channel"
> +       event_name="tp:tptest"
> +
> +       diag "Test tracefile size limit lower than PAGE_SIZE : $size_limit bytes"
> +
> +       create_lttng_session_ok $session_name $trace_path
> +
> +       enable_lttng_channel_size_limit \
> +           $session_name $channel_name $size_limit
> +
> +       enable_ust_lttng_event_per_channel \
> +           $session_name $event_name $channel_name
> +
> +       start_lttng_tracing_ok $session_name
> +
> +       $TESTAPP_BIN $NR_ITER >/dev/null 2>&1
> +
> +       stop_lttng_tracing_ok $session_name
> +
> +       destroy_lttng_session_ok $session_name
> +
> +       # Validate file size, expect file size to be equal to the page size
> +
> +       check_file_size $trace_path "${channel_name}_*" $PAGE_SIZE
> +
> +       # Validate tracing data, we should at least have some events
> +
> +       validate_trace $event_name $trace_path
> +
> +       rm -rf $trace_path
> +}
> +
>  plan_tests $NUM_TESTS
>
>  print_test_banner "$TEST_DESC"
>
>  start_lttng_sessiond
>
> -LIMITS=("4096" "8192" "16384" "32768" "65536")
> +# Test with multiples of PAGE_SIZE
> +LIMITS=("$(($PAGE_SIZE))"
> +       "$(($PAGE_SIZE*2))"
> +       "$(($PAGE_SIZE*4))"
> +       "$(($PAGE_SIZE*8))"
> +       "$(($PAGE_SIZE*16))"
> +       "$(($PAGE_SIZE*32))")
>
>  for limit in ${LIMITS[@]};
>  do
>         test_tracefile_size_limit $limit
>  done
>
> +# Test with a value that is not a multiple of PAGE_SIZE
> +test_tracefile_size_limit "$(($PAGE_SIZE+1024))"
> +
> +# Test that a value lower than the PAGE_SIZE is rounded to it
> +test_tracefile_size_limit_pagesize
> +
>  stop_lttng_sessiond
> --
> 1.9.1
>



-- 
Jérémie Galarneau
EfficiOS Inc.
http://www.efficios.com