From: "Slavomir Kaslev (VMware)" <slavomir.kaslev@xxxxxxxxx>
Using Ctrl-C to stop trace-cmd recording from the command line delivers SIGINT
to all its child processes. Switch internal recording stop notification to
SIGUSR1 so that notifying recording child processes can be delayed in order to
do proper flushing when doing remote VM tracing.
Also remove the flush() function, which is only used by trace-cmd listen, and
use finish() instead without changing listener's behavior.
Signed-off-by: Slavomir Kaslev (VMware) <slavomir.kaslev@xxxxxxxxx>
Signed-off-by: Slavomir Kaslev <kaslevs@xxxxxxxxxx>
---
tracecmd/trace-record.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/tracecmd/trace-record.c b/tracecmd/trace-record.c
index 94d01c5..4880f50 100644
--- a/tracecmd/trace-record.c
+++ b/tracecmd/trace-record.c
@@ -676,7 +676,7 @@ static void stop_threads(enum trace_type type)
/* Tell all threads to finish up */
for (i = 0; i < recorder_threads; i++) {
if (pids[i].pid > 0) {
- kill(pids[i].pid, SIGINT);
+ kill(pids[i].pid, SIGUSR1);
}
}
@@ -2656,12 +2656,6 @@ static void finish(int sig)
finished = 1;
}
-static void flush(int sig)
-{
- if (recorder)
- tracecmd_stop_recording(recorder);
-}
-
static int connect_port(const char *host, unsigned int port)
{
struct addrinfo hints;
@@ -3015,7 +3009,6 @@ static int create_recorder(struct buffer_instance *instance, int cpu,
pid_t pid;
if (type != TRACE_TYPE_EXTRACT) {
- signal(SIGUSR1, flush);
pid = fork();
if (pid < 0)
@@ -3024,6 +3017,9 @@ static int create_recorder(struct buffer_instance *instance, int cpu,
if (pid)
return pid;
+ signal(SIGINT, SIG_IGN);
+ signal(SIGUSR1, finish);
+
if (rt_prio)
set_prio(rt_prio);
--
2.20.1
|