[PATCH] trace-cmd: Plug startup race between flush_threads and recorders

From: Jan Kiszka
Date: Fri Oct 15 2010 - 07:51:14 EST


As the SIGUSR1 handler is so far registered after forking the recorder
child, there is a small race window where a flush sent by the main
process can actually kill the child. Plug this by registering the signal
handlers before the fork. This also allows to unify SIGINT registration.

Signed-off-by: Jan Kiszka <jan.kiszka@xxxxxxxxxxx>
---
trace-cmd.c | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/trace-cmd.c b/trace-cmd.c
index 9cbe362..f8992a8 100644
--- a/trace-cmd.c
+++ b/trace-cmd.c
@@ -1089,6 +1089,8 @@ static int create_recorder(int cpu)
char *file;
int pid;

+ signal(SIGUSR1, flush);
+
pid = fork();
if (pid < 0)
die("fork");
@@ -1096,9 +1098,6 @@ static int create_recorder(int cpu)
if (pid)
return pid;

- signal(SIGINT, finish);
- signal(SIGUSR1, flush);
-
if (rt_prio)
set_prio(rt_prio);

@@ -1694,9 +1693,9 @@ int main (int argc, char **argv)
set_options();

if (record || extract) {
+ signal(SIGINT, finish);
if (!latency)
start_threads();
- signal(SIGINT, finish);
}

if (extract) {
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/