2015-02-24 16:19:35

by Dave Jones

Subject: [PATCH] Remove redhat'ism from ftrace selftests.

usleep(1) is a Red Hat'ism (bizarrely provided by initscripts),
that isn't available on other distributions.
To make this work elsewhere, convert to using fractional
shell sleeps.

Signed-off-by: Dave Jones <[email protected]>

diff --git a/tools/testing/selftests/ftrace/test.d/event/event-enable.tc b/tools/testing/selftests/ftrace/test.d/event/event-enable.tc
index 668616d9bb03..ecc74d801b97 100644
--- a/tools/testing/selftests/ftrace/test.d/event/event-enable.tc
+++ b/tools/testing/selftests/ftrace/test.d/event/event-enable.tc
@@ -21,7 +21,7 @@ reset_tracer
do_reset

echo 'sched:sched_switch' > set_event
-usleep 1
+sleep 0.1

count=`cat trace | grep sched_switch | wc -l`
if [ $count -eq 0 ]; then
@@ -31,7 +31,7 @@ fi
do_reset

echo 1 > events/sched/sched_switch/enable
-usleep 1
+sleep 0.1

count=`cat trace | grep sched_switch | wc -l`
if [ $count -eq 0 ]; then
@@ -41,7 +41,7 @@ fi
do_reset

echo 0 > events/sched/sched_switch/enable
-usleep 1
+sleep 0.1

count=`cat trace | grep sched_switch | wc -l`
if [ $count -ne 0 ]; then
diff --git a/tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc b/tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc
index 655c415b6e7f..019766c59db2 100644
--- a/tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc
+++ b/tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc
@@ -21,7 +21,7 @@ reset_tracer
do_reset

echo 'sched:*' > set_event
-usleep 1
+sleep 0.1

count=`cat trace | grep -v ^# | awk '{ print $5 }' | sort -u | wc -l`
if [ $count -lt 3 ]; then
@@ -31,7 +31,7 @@ fi
do_reset

echo 1 > events/sched/enable
-usleep 1
+sleep 0.1

count=`cat trace | grep -v ^# | awk '{ print $5 }' | sort -u | wc -l`
if [ $count -lt 3 ]; then
@@ -41,7 +41,7 @@ fi
do_reset

echo 0 > events/sched/enable
-usleep 1
+sleep 0.1

count=`cat trace | grep -v ^# | awk '{ print $5 }' | sort -u | wc -l`
if [ $count -ne 0 ]; then

2015-02-24 18:18:14

by Steven Rostedt

Subject: Re: [PATCH] Remove redhat'ism from ftrace selftests.

Shuah,

Can you take this in your tree?

On Tue, 24 Feb 2015 11:19:27 -0500
Dave Jones <[email protected]> wrote:

> usleep(1) is a Red Hat'ism (bizarrely provided by initscripts),
> that isn't available on other distributions.
> To make this work elsewhere, convert to using fractional
> shell sleeps.
>
> Signed-off-by: Dave Jones <[email protected]>
>

Acked-by: Steven Rostedt <[email protected]>

-- Steve

> diff --git a/tools/testing/selftests/ftrace/test.d/event/event-enable.tc b/tools/testing/selftests/ftrace/test.d/event/event-enable.tc
> index 668616d9bb03..ecc74d801b97 100644
> --- a/tools/testing/selftests/ftrace/test.d/event/event-enable.tc
> +++ b/tools/testing/selftests/ftrace/test.d/event/event-enable.tc
> @@ -21,7 +21,7 @@ reset_tracer
> do_reset
>
> echo 'sched:sched_switch' > set_event
> -usleep 1
> +sleep 0.1
>
> count=`cat trace | grep sched_switch | wc -l`
> if [ $count -eq 0 ]; then
> @@ -31,7 +31,7 @@ fi
> do_reset
>
> echo 1 > events/sched/sched_switch/enable
> -usleep 1
> +sleep 0.1
>
> count=`cat trace | grep sched_switch | wc -l`
> if [ $count -eq 0 ]; then
> @@ -41,7 +41,7 @@ fi
> do_reset
>
> echo 0 > events/sched/sched_switch/enable
> -usleep 1
> +sleep 0.1
>
> count=`cat trace | grep sched_switch | wc -l`
> if [ $count -ne 0 ]; then
> diff --git a/tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc b/tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc
> index 655c415b6e7f..019766c59db2 100644
> --- a/tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc
> +++ b/tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc
> @@ -21,7 +21,7 @@ reset_tracer
> do_reset
>
> echo 'sched:*' > set_event
> -usleep 1
> +sleep 0.1
>
> count=`cat trace | grep -v ^# | awk '{ print $5 }' | sort -u | wc -l`
> if [ $count -lt 3 ]; then
> @@ -31,7 +31,7 @@ fi
> do_reset
>
> echo 1 > events/sched/enable
> -usleep 1
> +sleep 0.1
>
> count=`cat trace | grep -v ^# | awk '{ print $5 }' | sort -u | wc -l`
> if [ $count -lt 3 ]; then
> @@ -41,7 +41,7 @@ fi
> do_reset
>
> echo 0 > events/sched/enable
> -usleep 1
> +sleep 0.1
>
> count=`cat trace | grep -v ^# | awk '{ print $5 }' | sort -u | wc -l`
> if [ $count -ne 0 ]; then

2015-02-24 18:23:04

by Shuah Khan

Subject: Re: [PATCH] Remove redhat'ism from ftrace selftests.

On 02/24/2015 11:18 AM, Steven Rostedt wrote:
>
> Shuah,
>
> Can you take this in your tree?

Yes I can do that. This must be the original patch email:
https://lkml.org/lkml/2015/2/24/435

-- Shuah

>
> On Tue, 24 Feb 2015 11:19:27 -0500
> Dave Jones <[email protected]> wrote:
>
>> usleep(1) is a Red Hat'ism (bizarrely provided by initscripts),
>> that isn't available on other distributions.
>> To make this work elsewhere, convert to using fractional
>> shell sleeps.
>>
>> Signed-off-by: Dave Jones <[email protected]>
>>
>
> Acked-by: Steven Rostedt <[email protected]>
>
> -- Steve
>
>> diff --git a/tools/testing/selftests/ftrace/test.d/event/event-enable.tc b/tools/testing/selftests/ftrace/test.d/event/event-enable.tc
>> index 668616d9bb03..ecc74d801b97 100644
>> --- a/tools/testing/selftests/ftrace/test.d/event/event-enable.tc
>> +++ b/tools/testing/selftests/ftrace/test.d/event/event-enable.tc
>> @@ -21,7 +21,7 @@ reset_tracer
>> do_reset
>>
>> echo 'sched:sched_switch' > set_event
>> -usleep 1
>> +sleep 0.1
>>
>> count=`cat trace | grep sched_switch | wc -l`
>> if [ $count -eq 0 ]; then
>> @@ -31,7 +31,7 @@ fi
>> do_reset
>>
>> echo 1 > events/sched/sched_switch/enable
>> -usleep 1
>> +sleep 0.1
>>
>> count=`cat trace | grep sched_switch | wc -l`
>> if [ $count -eq 0 ]; then
>> @@ -41,7 +41,7 @@ fi
>> do_reset
>>
>> echo 0 > events/sched/sched_switch/enable
>> -usleep 1
>> +sleep 0.1
>>
>> count=`cat trace | grep sched_switch | wc -l`
>> if [ $count -ne 0 ]; then
>> diff --git a/tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc b/tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc
>> index 655c415b6e7f..019766c59db2 100644
>> --- a/tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc
>> +++ b/tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc
>> @@ -21,7 +21,7 @@ reset_tracer
>> do_reset
>>
>> echo 'sched:*' > set_event
>> -usleep 1
>> +sleep 0.1
>>
>> count=`cat trace | grep -v ^# | awk '{ print $5 }' | sort -u | wc -l`
>> if [ $count -lt 3 ]; then
>> @@ -31,7 +31,7 @@ fi
>> do_reset
>>
>> echo 1 > events/sched/enable
>> -usleep 1
>> +sleep 0.1
>>
>> count=`cat trace | grep -v ^# | awk '{ print $5 }' | sort -u | wc -l`
>> if [ $count -lt 3 ]; then
>> @@ -41,7 +41,7 @@ fi
>> do_reset
>>
>> echo 0 > events/sched/enable
>> -usleep 1
>> +sleep 0.1
>>
>> count=`cat trace | grep -v ^# | awk '{ print $5 }' | sort -u | wc -l`
>> if [ $count -ne 0 ]; then
>


--
Shuah Khan
Sr. Linux Kernel Developer
Open Source Innovation Group
Samsung Research America (Silicon Valley)
[email protected] | (970) 217-8978

2015-02-24 18:25:10

by Dave Jones

Subject: Re: [PATCH] Remove redhat'ism from ftrace selftests.

On Tue, Feb 24, 2015 at 11:22:58AM -0700, Shuah Khan wrote:
> On 02/24/2015 11:18 AM, Steven Rostedt wrote:
> >
> > Shuah,
> >
> > Can you take this in your tree?
>
> Yes I can do that. This must be the original patch email:
> https://lkml.org/lkml/2015/2/24/435

Correct.

Dave

2015-02-28 03:16:38

by Namhyung Kim

Subject: Re: [PATCH] Remove redhat'ism from ftrace selftests.

Hi,

On Tue, Feb 24, 2015 at 01:24:59PM -0500, Dave Jones wrote:
> On Tue, Feb 24, 2015 at 11:22:58AM -0700, Shuah Khan wrote:
> > On 02/24/2015 11:18 AM, Steven Rostedt wrote:
> > >
> > > Shuah,
> > >
> > > Can you take this in your tree?
> >
> > Yes I can do that. This must be the original patch email:
> > https://lkml.org/lkml/2015/2/24/435

Please see below links:

https://lkml.org/lkml/2014/12/10/52
https://lkml.org/lkml/2014/12/22/556

I think we can get rid of the (u)sleeps entirely since 'cat trace'
itself should trigger scheduler events.

Thanks,
Namhyung