perf stat: Poll for monitored tasks being alive in fork mode
PATCH 1/1 perf stat: Poll for monitored tasks being alive in fork mode
Following test shows the stat keeps running even if no longer task to monitor (mgen exits at ~5s).
perf stat -e cycles -p pgrep mgen -I1000 -- sleep 10
time counts unit events
1.000148916 1,308,365,864 cycles
2.000379171 1,297,269,875 cycles
3.000556719 1,297,187,078 cycles
4.000914241 761,261,827 cycles
5.001306091 <not counted> cycles
6.001676881 <not counted> cycles
7.002046336 <not counted> cycles
8.002405651 <not counted> cycles
9.002766625 <not counted> cycles
10.001395827 <not counted> cyclesWe'd better finish stat immediately if there's no longer task to monitor.
After:
perf stat -e cycles -p pgrep mgen -I1000 -- sleep 10
time counts unit events
1.000180062 1,236,592,661 cycles
2.000421539 1,223,733,572 cycles
3.000609910 1,297,047,663 cycles
4.000807545 1,297,215,816 cycles
5.001001578 1,297,208,032 cycles
6.001390345 582,343,659 cyclessleep: Terminated
Now the stat exits immediately when the monitored tasks ends.
--- tools/perf/builtin-stat.c | 7 +++++++ 1 file changed, 7 insertions(+)
tools/perf/builtin-stat.c +7 -0
@@ -553,6 +553,13 @@ static int __run_perf_stat(int argc, const char **argv, int run_idx)if (interval || timeout) {while (!waitpid (child_pid, &status,WNOHANG )) { +if (!is_target_alive (&target, + evsel_list->threads) && + (child_pid !=-1 )) { +kill (child_pid,SIGTERM ); +break ; + } +nanosleep (&ts,NULL );if (timeout)break ;
Signature · 1 line
2.7.4
Quoted 43 lines · Jin Yao
Following test shows the stat keeps running even if no longer task to monitor (mgen exits at ~5s).
perf stat -e cycles -p
pgrep mgen-I1000 -- sleep 10time counts unit events 1.000148916 1,308,365,864 cycles 2.000379171 1,297,269,875 cycles 3.000556719 1,297,187,078 cycles 4.000914241 761,261,827 cycles 5.001306091 <not counted> cycles 6.001676881 <not counted> cycles 7.002046336 <not counted> cycles 8.002405651 <not counted> cycles 9.002766625 <not counted> cycles 10.001395827 <not counted> cyclesWe'd better finish stat immediately if there's no longer task to monitor.
After:
perf stat -e cycles -p
pgrep mgen-I1000 -- sleep 10time counts unit events 1.000180062 1,236,592,661 cycles 2.000421539 1,223,733,572 cycles 3.000609910 1,297,047,663 cycles 4.000807545 1,297,215,816 cycles 5.001001578 1,297,208,032 cycles 6.001390345 582,343,659 cyclessleep: Terminated
Now the stat exits immediately when the monitored tasks ends.
Signed-off-by Jin Yao <[email protected]>--- tools/perf/builtin-stat.c | 7 +++++++ 1 file changed, 7 insertions(+)tools/perf/builtin-stat.c +0
-0
tools/perf/builtin-stat.c static int __run_perf_stat(int argc, const char **argv, int run_idx) · line 558
Quoted 6 lines
tools/perf/builtin-stat.c +3
-0@@ -553,6 +553,13 @@ static int __run_perf_stat(int argc, const char **argv, int run_idx)if (interval || timeout) {while (!waitpid (child_pid, &status,WNOHANG )) { +if (!is_target_alive (&target, + evsel_list->threads) && + (child_pid !=-1 )) {
do we need that child_pid check? we just returned from waitpid so we should be ok.. we just make the race window smaller
could we just do:
if (!is_target_alive(&target, evsel_list->threads)) {
kill(child_pid, SIGTERM);
break;
}also I'm not sure we should do this only under new option, as it might break people's scripts.. thoughts?
jirka
Quoted 10 lines
tools/perf/builtin-stat.c +4
-0+kill (child_pid,SIGTERM ); +break ; + } +nanosleep (&ts,NULL );if (timeout)break ;Signature · 1 line
2.7.4
Quoted 54 lines · Jiri Olsa
Quoted 43 lines · Jin Yao
Following test shows the stat keeps running even if no longer task to monitor (mgen exits at ~5s).
perf stat -e cycles -p
pgrep mgen-I1000 -- sleep 10time counts unit events 1.000148916 1,308,365,864 cycles 2.000379171 1,297,269,875 cycles 3.000556719 1,297,187,078 cycles 4.000914241 761,261,827 cycles 5.001306091 <not counted> cycles 6.001676881 <not counted> cycles 7.002046336 <not counted> cycles 8.002405651 <not counted> cycles 9.002766625 <not counted> cycles 10.001395827 <not counted> cyclesWe'd better finish stat immediately if there's no longer task to monitor.
After:
perf stat -e cycles -p
pgrep mgen-I1000 -- sleep 10time counts unit events 1.000180062 1,236,592,661 cycles 2.000421539 1,223,733,572 cycles 3.000609910 1,297,047,663 cycles 4.000807545 1,297,215,816 cycles 5.001001578 1,297,208,032 cycles 6.001390345 582,343,659 cyclessleep: Terminated
Now the stat exits immediately when the monitored tasks ends.
Signed-off-by Jin Yao <[email protected]>--- tools/perf/builtin-stat.c | 7 +++++++ 1 file changed, 7 insertions(+)tools/perf/builtin-stat.c +0
-0tools/perf/builtin-stat.c static int __run_perf_stat(int argc, const char **argv, int run_idx) · line 558
Quoted 6 lines
tools/perf/builtin-stat.c +3
-0@@ -553,6 +553,13 @@ static int __run_perf_stat(int argc, const char **argv, int run_idx)if (interval || timeout) {while (!waitpid (child_pid, &status,WNOHANG )) { +if (!is_target_alive (&target, + evsel_list->threads) && + (child_pid !=-1 )) {do we need that
child_pidcheck? we just returned from waitpid so we should be ok.. we just make the race window smaller
Quoted 7 lines
could we just do:
if (!is_target_alive(&target, evsel_list->threads)) { kill(child_pid, SIGTERM); break; }
I think this code should be OK and I have tested yet. I have a question about the race condition, we really don't need a lock to protect the child_pid?
skip_signal()
{
/*
* render child_pid harmless
* won't send SIGTERM to a random
* process in case of race condition
* and fast PID recycling
*/
child_pid = -1;
}
__run_perf_stat()
{
....
kill(child_pid, SIGTERM);
}If child_pid is set by -1 in a small window between checking of child_pid and kill(), then kill(-1, SIGTERM) may happen. All processes except the kill process itself and init would receive SIGTERM.
Is this case possible?
Quoted 5 lines
also I'm not sure we should do this only under new option, as it might break people's scripts.. thoughts?
jirka
In current behavior, for non fork mode, if we terminate the monitored task, the perf stat would return immediately. So I think this patch should be OK.
Thanks
Jin Yao
Quoted 10 lines
Quoted 10 lines
tools/perf/builtin-stat.c +4
-0+kill (child_pid,SIGTERM ); +break ; + } +nanosleep (&ts,NULL );if (timeout)break ;Signature · 1 line
2.7.4
Quoted 80 lines · Yao
Quoted 53 lines · Jiri Olsa
Quoted 43 lines · Jin Yao
Following test shows the stat keeps running even if no longer task to monitor (mgen exits at ~5s).
perf stat -e cycles -p
pgrep mgen-I1000 -- sleep 10time counts unit events 1.000148916 1,308,365,864 cycles 2.000379171 1,297,269,875 cycles 3.000556719 1,297,187,078 cycles 4.000914241 761,261,827 cycles 5.001306091 <not counted> cycles 6.001676881 <not counted> cycles 7.002046336 <not counted> cycles 8.002405651 <not counted> cycles 9.002766625 <not counted> cycles 10.001395827 <not counted> cyclesWe'd better finish stat immediately if there's no longer task to monitor.
After:
perf stat -e cycles -p
pgrep mgen-I1000 -- sleep 10time counts unit events 1.000180062 1,236,592,661 cycles 2.000421539 1,223,733,572 cycles 3.000609910 1,297,047,663 cycles 4.000807545 1,297,215,816 cycles 5.001001578 1,297,208,032 cycles 6.001390345 582,343,659 cyclessleep: Terminated
Now the stat exits immediately when the monitored tasks ends.
Signed-off-by Jin Yao <[email protected]>--- tools/perf/builtin-stat.c | 7 +++++++ 1 file changed, 7 insertions(+)tools/perf/builtin-stat.c +0
-0tools/perf/builtin-stat.c static int __run_perf_stat(int argc, const char **argv, int run_idx) · line 557
Quoted 5 lines
tools/perf/builtin-stat.c +3
-0@@ -553,6 +553,13 @@ static int __run_perf_stat(int argc, const char **argv, int run_idx)if (interval || timeout) {while (!waitpid (child_pid, &status,WNOHANG )) { +if (!is_target_alive (&target, + evsel_list->threads) && + (child_pid !=-1 )) {do we need that
child_pidcheck? we just returned from waitpid so we should be ok.. we just make the race window smallerQuoted 7 lines
could we just do:
if (!is_target_alive(&target, evsel_list->threads)) { kill(child_pid, SIGTERM); break; }I think this code should be OK and I have tested yet. I have a question about the race condition, we really don't need a lock to protect the
child_pid?
skip_signal()
{
/*
* renderchild_pidharmless
* won't send SIGTERM to a random
* process in case of race condition
* and fast PID recycling
*/
child_pid= -1;
}
__run_perf_stat()
Quoted 8 lines
{ .... kill(child_pid, SIGTERM); }If
child_pidis set by -1 in a small window between checking ofchild_pidandkill(), thenkill(-1, SIGTERM)may happen. All processes except the kill process itself and init would receive SIGTERM.
ah right, -1 is special.. however that can still happen also in the orginal patch.. how about we do something like below
jirka
---
tools/perf/builtin-stat.c +8 -0
@@ -583,6 +583,14 @@ static int __run_perf_stat(int argc, const char **argv, int run_idx)if (interval || timeout) {while (!waitpid (child_pid, &status,WNOHANG )) { +if (!is_target_alive (&target, evsel_list->threads)) { +int pid = child_pid; + +if (pid !=-1 ) +kill (pid,SIGTERM ); +break ; + } +nanosleep (&ts,NULL );if (timeout)break ;
Quoted 107 lines · Jiri Olsa
Quoted 80 lines · Yao
Quoted 53 lines · Jiri Olsa
Quoted 43 lines · Jin Yao
Following test shows the stat keeps running even if no longer task to monitor (mgen exits at ~5s).
perf stat -e cycles -p
pgrep mgen-I1000 -- sleep 10time counts unit events 1.000148916 1,308,365,864 cycles 2.000379171 1,297,269,875 cycles 3.000556719 1,297,187,078 cycles 4.000914241 761,261,827 cycles 5.001306091 <not counted> cycles 6.001676881 <not counted> cycles 7.002046336 <not counted> cycles 8.002405651 <not counted> cycles 9.002766625 <not counted> cycles 10.001395827 <not counted> cyclesWe'd better finish stat immediately if there's no longer task to monitor.
After:
perf stat -e cycles -p
pgrep mgen-I1000 -- sleep 10time counts unit events 1.000180062 1,236,592,661 cycles 2.000421539 1,223,733,572 cycles 3.000609910 1,297,047,663 cycles 4.000807545 1,297,215,816 cycles 5.001001578 1,297,208,032 cycles 6.001390345 582,343,659 cyclessleep: Terminated
Now the stat exits immediately when the monitored tasks ends.
Signed-off-by Jin Yao <[email protected]>--- tools/perf/builtin-stat.c | 7 +++++++ 1 file changed, 7 insertions(+)tools/perf/builtin-stat.c +0
-0tools/perf/builtin-stat.c static int __run_perf_stat(int argc, const char **argv, int run_idx) · line 557
Quoted 5 lines
tools/perf/builtin-stat.c +3
-0@@ -553,6 +553,13 @@ static int __run_perf_stat(int argc, const char **argv, int run_idx)if (interval || timeout) {while (!waitpid (child_pid, &status,WNOHANG )) { +if (!is_target_alive (&target, + evsel_list->threads) && + (child_pid !=-1 )) {do we need that
child_pidcheck? we just returned from waitpid so we should be ok.. we just make the race window smallerQuoted 7 lines
could we just do:
if (!is_target_alive(&target, evsel_list->threads)) { kill(child_pid, SIGTERM); break; }I think this code should be OK and I have tested yet. I have a question about the race condition, we really don't need a lock to protect the
child_pid?
skip_signal()
{
/*
* renderchild_pidharmless
* won't send SIGTERM to a random
* process in case of race condition
* and fast PID recycling
*/
child_pid= -1;
}
__run_perf_stat()Quoted 8 lines
{ .... kill(child_pid, SIGTERM); }If
child_pidis set by -1 in a small window between checking ofchild_pidandkill(), thenkill(-1, SIGTERM)may happen. All processes except the kill process itself and init would receive SIGTERM.ah right, -1 is special.. however that can still happen also in the orginal patch.. how about we do something like below
jirka
---
tools/perf/builtin-stat.c +1
-0@@ -583,6 +583,14 @@ static int __run_perf_stat(int argc, const char **argv, int run_idx)if (interval || timeout) {while (!waitpid (child_pid, &status,WNOHANG )) { +if (!is_target_alive (&target, evsel_list->threads)) {
tools/perf/builtin-stat.c static int __run_perf_stat(int argc, const char **argv, int run_idx) · line 596
Quoted 10 lines
tools/perf/builtin-stat.c +7
-0+int pid = child_pid; + +if (pid !=-1 ) +kill (pid,SIGTERM ); +break ; + } +nanosleep (&ts,NULL );if (timeout)break ;
Hi Jiri,
I think your patch is good. At least, we can avoid the case of kill(-1, SIGTERM).
BTW, you post this patch or I re-post it, both fine for me. :)
Thanks
Jin Yao
On Sun, Jan 06, 2019 at 10:02:18PM +0800, Jin, Yao wrote:
SNIP
Quoted 23 lines
Quoted 10 lines
---
tools/perf/builtin-stat.c +2
-0@@ -583,6 +583,14 @@ static int __run_perf_stat(int argc, const char **argv, int run_idx)if (interval || timeout) {while (!waitpid (child_pid, &status,WNOHANG )) { +if (!is_target_alive (&target, evsel_list->threads)) { +int pid = child_pid;tools/perf/builtin-stat.c static int __run_perf_stat(int argc, const char **argv, int run_idx) · line 596
Quoted 10 lines
tools/perf/builtin-stat.c +6
-0+ +if (pid !=-1 ) +kill (pid,SIGTERM ); +break ; + } +nanosleep (&ts,NULL );if (timeout)break ;Hi Jiri,
Quoted 4 lines
I think your patch is good. At least, we can avoid the case of
kill(-1, SIGTERM).BTW, you post this patch or I re-post it, both fine for me. :)
please post it
thanks,
jirka