4 files changed, 27 insertions, 15 deletions

diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index ac989e9ba8fe..0ff67d1c4752 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -560,11 +560,12 @@ static int __cmd_record(int argc, const char **argv)
                         return err;
         }
 
-        if (raw_samples) {
+        if (raw_samples && have_tracepoints(attrs, nr_counters)) {
                 perf_header__set_feat(&session->header, HEADER_TRACE_INFO);
         } else {
                 for (i = 0; i < nr_counters; i++) {
-                        if (attrs[i].sample_type & PERF_SAMPLE_RAW) {
+                        if (attrs[i].sample_type & PERF_SAMPLE_RAW &&
+                                attrs[i].type == PERF_TYPE_TRACEPOINT) {
                                 perf_header__set_feat(&session->header, HEADER_TRACE_INFO);
                                 break;
                         }
@@ -662,19 +663,25 @@ static int __cmd_record(int argc, const char **argv)
                         return err;
                 }
 
-                err = event__synthesize_tracing_data(output, attrs,
-                                                     nr_counters,
-                                                     process_synthesized_event,
-                                                     session);
-                /*
-                 * FIXME err <= 0 here actually means that there were no tracepoints
-                 * so its not really an error, just that we don't need to synthesize
-                 * anything.
-                 * We really have to return this more properly and also propagate
-                 * errors that now are calling die()
-                 */
-                if (err > 0)
+                if (have_tracepoints(attrs, nr_counters)) {
+                        /*
+                         * FIXME err <= 0 here actually means that
+                         * there were no tracepoints so its not really
+                         * an error, just that we don't need to
+                         * synthesize anything.  We really have to
+                         * return this more properly and also
+                         * propagate errors that now are calling die()
+                         */
+                        err = event__synthesize_tracing_data(output, attrs,
+                                                             nr_counters,
+                                                             process_synthesized_event,
+                                                             session);
+                        if (err <= 0) {
+                                pr_err("Couldn't record tracing data.\n");
+                                return err;
+                        }
                         advance_output(err);
+                }
         }
 
         machine = perf_session__find_host_machine(session);
diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index 79da0e50ef8f..2b9f898efea6 100644
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -436,7 +436,6 @@ static int perf_header__adds_write(struct perf_header *self, int fd)
                 trace_sec->size = lseek(fd, 0, SEEK_CUR) - trace_sec->offset;
         }
 
-
         if (perf_header__has_feat(self, HEADER_BUILD_ID)) {
                 struct perf_file_section *buildid_sec;
 
diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h
index b8c1f64bc935..fc4ab3fe877a 100644
--- a/tools/perf/util/parse-events.h
+++ b/tools/perf/util/parse-events.h
@@ -13,6 +13,7 @@ struct tracepoint_path {
 };
 
 extern struct tracepoint_path *tracepoint_id_to_path(u64 config);
+extern bool have_tracepoints(struct perf_event_attr *pattrs, int nb_events);
 
 extern int                      nr_counters;
 
diff --git a/tools/perf/util/trace-event-info.c b/tools/perf/util/trace-event-info.c
index 30cd9b575953..0a1fb9d4f3b6 100644
--- a/tools/perf/util/trace-event-info.c
+++ b/tools/perf/util/trace-event-info.c
@@ -487,6 +487,11 @@ get_tracepoints_path(struct perf_event_attr *pattrs, int nb_events)
         return nr_tracepoints > 0 ? path.next : NULL;
 }
 
+bool have_tracepoints(struct perf_event_attr *pattrs, int nb_events)
+{
+        return get_tracepoints_path(pattrs, nb_events) ? true : false;
+}
+
 int read_tracing_data(int fd, struct perf_event_attr *pattrs, int nb_events)
 {
         char buf[BUFSIZ];