1 files changed, 60 insertions, 67 deletions

diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index 8ce62ef7f6c3..2e0d484068d2 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -147,29 +147,19 @@ static void sig_handler(int sig)
 {
         if (sig == SIGCHLD)
                 child_finished = 1;
+        else
+                signr = sig;
 
         done = 1;
-        signr = sig;
 }
 
-static void record__sig_exit(int exit_status __maybe_unused, void *arg)
+static void record__sig_exit(void)
 {
-        struct record *rec = arg;
-        int status;
-
-        if (rec->evlist->workload.pid > 0) {
-                if (!child_finished)
-                        kill(rec->evlist->workload.pid, SIGTERM);
-
-                wait(&status);
-                if (WIFSIGNALED(status))
-                        psignal(WTERMSIG(status), rec->progname);
-        }
-
-        if (signr == -1 || signr == SIGUSR1)
+        if (signr == -1)
                 return;
 
         signal(signr, SIG_DFL);
+        raise(signr);
 }
 
 static int record__open(struct record *rec)
@@ -243,27 +233,6 @@ static int process_buildids(struct record *rec)
                                               size, &build_id__mark_dso_hit_ops);
 }
 
-static void record__exit(int status, void *arg)
-{
-        struct record *rec = arg;
-        struct perf_data_file *file = &rec->file;
-
-        if (status != 0)
-                return;
-
-        if (!file->is_pipe) {
-                rec->session->header.data_size += rec->bytes_written;
-
-                if (!rec->no_buildid)
-                        process_buildids(rec);
-                perf_session__write_header(rec->session, rec->evlist,
-                                           file->fd, true);
-                perf_session__delete(rec->session);
-                perf_evlist__delete(rec->evlist);
-                symbol__exit();
-        }
-}
-
 static void perf_event__synthesize_guest_os(struct machine *machine, void *data)
 {
         int err;
@@ -344,18 +313,19 @@ static volatile int workload_exec_errno;
  * if the fork fails, since we asked by setting its
  * want_signal to true.
  */
-static void workload_exec_failed_signal(int signo, siginfo_t *info,
+static void workload_exec_failed_signal(int signo __maybe_unused,
+                                        siginfo_t *info,
                                         void *ucontext __maybe_unused)
 {
         workload_exec_errno = info->si_value.sival_int;
         done = 1;
-        signr = signo;
         child_finished = 1;
 }
 
 static int __cmd_record(struct record *rec, int argc, const char **argv)
 {
         int err;
+        int status = 0;
         unsigned long waking = 0;
         const bool forks = argc > 0;
         struct machine *machine;
@@ -367,7 +337,7 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)
 
         rec->progname = argv[0];
 
-        on_exit(record__sig_exit, rec);
+        atexit(record__sig_exit);
         signal(SIGCHLD, sig_handler);
         signal(SIGINT, sig_handler);
         signal(SIGTERM, sig_handler);
@@ -388,32 +358,28 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)
                                                     workload_exec_failed_signal);
                 if (err < 0) {
                         pr_err("Couldn't run the workload!\n");
+                        status = err;
                         goto out_delete_session;
                 }
         }
 
         if (record__open(rec) != 0) {
                 err = -1;
-                goto out_delete_session;
+                goto out_child;
         }
 
         if (!rec->evlist->nr_groups)
                 perf_header__clear_feat(&session->header, HEADER_GROUP_DESC);
 
-        /*
-         * perf_session__delete(session) will be called at record__exit()
-         */
-        on_exit(record__exit, rec);
-
         if (file->is_pipe) {
                 err = perf_header__write_pipe(file->fd);
                 if (err < 0)
-                        goto out_delete_session;
+                        goto out_child;
         } else {
                 err = perf_session__write_header(session, rec->evlist,
                                                  file->fd, false);
                 if (err < 0)
-                        goto out_delete_session;
+                        goto out_child;
         }
 
         if (!rec->no_buildid
@@ -421,7 +387,7 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)
                 pr_err("Couldn't generate buildids. "
                        "Use --no-buildid to profile anyway.\n");
                 err = -1;
-                goto out_delete_session;
+                goto out_child;
         }
 
         machine = &session->machines.host;
@@ -431,7 +397,7 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)
                                                    process_synthesized_event);
                 if (err < 0) {
                         pr_err("Couldn't synthesize attrs.\n");
-                        goto out_delete_session;
+                        goto out_child;
                 }
 
                 if (have_tracepoints(&rec->evlist->entries)) {
@@ -447,7 +413,7 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)
                                                                   process_synthesized_event);
                         if (err <= 0) {
                                 pr_err("Couldn't record tracing data.\n");
-                                goto out_delete_session;
+                                goto out_child;
                         }
                         rec->bytes_written += err;
                 }
@@ -475,7 +441,7 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)