|
|
@@ -26,6 +26,7 @@
|
|
|
#include "evlist.h"
|
|
|
#include "evsel.h"
|
|
|
#include "machine.h"
|
|
|
+#include "config.h"
|
|
|
|
|
|
#define pr_N(n, fmt, ...) \
|
|
|
eprintf(n, debug_data_convert, fmt, ##__VA_ARGS__)
|
|
|
@@ -68,6 +69,9 @@ struct ctf_writer {
|
|
|
};
|
|
|
struct bt_ctf_field_type *array[6];
|
|
|
} data;
|
|
|
+ struct bt_ctf_event_class *comm_class;
|
|
|
+ struct bt_ctf_event_class *exit_class;
|
|
|
+ struct bt_ctf_event_class *fork_class;
|
|
|
};
|
|
|
|
|
|
struct convert {
|
|
|
@@ -76,6 +80,7 @@ struct convert {
|
|
|
|
|
|
u64 events_size;
|
|
|
u64 events_count;
|
|
|
+ u64 non_sample_count;
|
|
|
|
|
|
/* Ordered events configured queue size. */
|
|
|
u64 queue_size;
|
|
|
@@ -140,6 +145,36 @@ FUNC_VALUE_SET(s64)
|
|
|
FUNC_VALUE_SET(u64)
|
|
|
__FUNC_VALUE_SET(u64_hex, u64)
|
|
|
|
|
|
+static int string_set_value(struct bt_ctf_field *field, const char *string);
|
|
|
+static __maybe_unused int
|
|
|
+value_set_string(struct ctf_writer *cw, struct bt_ctf_event *event,
|
|
|
+ const char *name, const char *string)
|
|
|
+{
|
|
|
+ struct bt_ctf_field_type *type = cw->data.string;
|
|
|
+ struct bt_ctf_field *field;
|
|
|
+ int ret = 0;
|
|
|
+
|
|
|
+ field = bt_ctf_field_create(type);
|
|
|
+ if (!field) {
|
|
|
+ pr_err("failed to create a field %s\n", name);
|
|
|
+ return -1;
|
|
|
+ }
|
|
|
+
|
|
|
+ ret = string_set_value(field, string);
|
|
|
+ if (ret) {
|
|
|
+ pr_err("failed to set value %s\n", name);
|
|
|
+ goto err_put_field;
|
|
|
+ }
|
|
|
+
|
|
|
+ ret = bt_ctf_event_set_payload(event, name, field);
|
|
|
+ if (ret)
|
|
|
+ pr_err("failed to set payload %s\n", name);
|
|
|
+
|
|
|
+err_put_field:
|
|
|
+ bt_ctf_field_put(field);
|
|
|
+ return ret;
|
|
|
+}
|
|
|
+
|
|
|
static struct bt_ctf_field_type*
|
|
|
get_tracepoint_field_type(struct ctf_writer *cw, struct format_field *field)
|
|
|
{
|
|
|
@@ -731,6 +766,72 @@ static int process_sample_event(struct perf_tool *tool,
|
|
|
return cs ? 0 : -1;
|
|
|
}
|
|
|
|
|
|
+#define __NON_SAMPLE_SET_FIELD(_name, _type, _field) \
|
|
|
+do { \
|
|
|
+ ret = value_set_##_type(cw, event, #_field, _event->_name._field);\
|
|
|
+ if (ret) \
|
|
|
+ return -1; \
|
|
|
+} while(0)
|
|
|
+
|
|
|
+#define __FUNC_PROCESS_NON_SAMPLE(_name, body) \
|
|
|
+static int process_##_name##_event(struct perf_tool *tool, \
|
|
|
+ union perf_event *_event, \
|
|
|
+ struct perf_sample *sample, \
|
|
|
+ struct machine *machine) \
|
|
|
+{ \
|
|
|
+ struct convert *c = container_of(tool, struct convert, tool);\
|
|
|
+ struct ctf_writer *cw = &c->writer; \
|
|
|
+ struct bt_ctf_event_class *event_class = cw->_name##_class;\
|
|
|
+ struct bt_ctf_event *event; \
|
|
|
+ struct ctf_stream *cs; \
|
|
|
+ int ret; \
|
|
|
+ \
|
|
|
+ c->non_sample_count++; \
|
|
|
+ c->events_size += _event->header.size; \
|
|
|
+ event = bt_ctf_event_create(event_class); \
|
|
|
+ if (!event) { \
|
|
|
+ pr_err("Failed to create an CTF event\n"); \
|
|
|
+ return -1; \
|
|
|
+ } \
|
|
|
+ \
|
|
|
+ bt_ctf_clock_set_time(cw->clock, sample->time); \
|
|
|
+ body \
|
|
|
+ cs = ctf_stream(cw, 0); \
|
|
|
+ if (cs) { \
|
|
|
+ if (is_flush_needed(cs)) \
|
|
|
+ ctf_stream__flush(cs); \
|
|
|
+ \
|
|
|
+ cs->count++; \
|
|
|
+ bt_ctf_stream_append_event(cs->stream, event); \
|
|
|
+ } \
|
|
|
+ bt_ctf_event_put(event); \
|
|
|
+ \
|
|
|
+ return perf_event__process_##_name(tool, _event, sample, machine);\
|
|
|
+}
|
|
|
+
|
|
|
+__FUNC_PROCESS_NON_SAMPLE(comm,
|
|
|
+ __NON_SAMPLE_SET_FIELD(comm, u32, pid);
|
|
|
+ __NON_SAMPLE_SET_FIELD(comm, u32, tid);
|
|
|
+ __NON_SAMPLE_SET_FIELD(comm, string, comm);
|
|
|
+)
|
|
|
+__FUNC_PROCESS_NON_SAMPLE(fork,
|
|
|
+ __NON_SAMPLE_SET_FIELD(fork, u32, pid);
|
|
|
+ __NON_SAMPLE_SET_FIELD(fork, u32, ppid);
|
|
|
+ __NON_SAMPLE_SET_FIELD(fork, u32, tid);
|
|
|
+ __NON_SAMPLE_SET_FIELD(fork, u32, ptid);
|
|
|
+ __NON_SAMPLE_SET_FIELD(fork, u64, time);
|
|
|
+)
|
|
|
+
|
|
|
+__FUNC_PROCESS_NON_SAMPLE(exit,
|
|
|
+ __NON_SAMPLE_SET_FIELD(fork, u32, pid);
|
|
|
+ __NON_SAMPLE_SET_FIELD(fork, u32, ppid);
|
|
|
+ __NON_SAMPLE_SET_FIELD(fork, u32, tid);
|
|
|
+ __NON_SAMPLE_SET_FIELD(fork, u32, ptid);
|
|
|
+ __NON_SAMPLE_SET_FIELD(fork, u64, time);
|
|
|
+)
|
|
|
+#undef __NON_SAMPLE_SET_FIELD
|
|
|
+#undef __FUNC_PROCESS_NON_SAMPLE
|
|
|
+
|
|
|
/* If dup < 0, add a prefix. Else, add _dupl_X suffix. */
|
|
|
static char *change_name(char *name, char *orig_name, int dup)
|
|
|
{
|
|
|
@@ -1005,6 +1106,80 @@ static int setup_events(struct ctf_writer *cw, struct perf_session *session)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
+#define __NON_SAMPLE_ADD_FIELD(t, n) \
|
|
|
+ do { \
|
|
|
+ pr2(" field '%s'\n", #n); \
|
|
|
+ if (bt_ctf_event_class_add_field(event_class, cw->data.t, #n)) {\
|
|
|
+ pr_err("Failed to add field '%s';\n", #n);\
|
|
|
+ return -1; \
|
|
|
+ } \
|
|
|
+ } while(0)
|
|
|
+
|
|
|
+#define __FUNC_ADD_NON_SAMPLE_EVENT_CLASS(_name, body) \
|
|
|
+static int add_##_name##_event(struct ctf_writer *cw) \
|
|
|
+{ \
|
|
|
+ struct bt_ctf_event_class *event_class; \
|
|
|
+ int ret; \
|
|
|
+ \
|
|
|
+ pr("Adding "#_name" event\n"); \
|
|
|
+ event_class = bt_ctf_event_class_create("perf_" #_name);\
|
|
|
+ if (!event_class) \
|
|
|
+ return -1; \
|
|
|
+ body \
|
|
|
+ \
|
|
|
+ ret = bt_ctf_stream_class_add_event_class(cw->stream_class, event_class);\
|
|
|
+ if (ret) { \
|
|
|
+ pr("Failed to add event class '"#_name"' into stream.\n");\
|
|
|
+ return ret; \
|
|
|
+ } \
|
|
|
+ \
|
|
|
+ cw->_name##_class = event_class; \
|
|
|
+ bt_ctf_event_class_put(event_class); \
|
|
|
+ return 0; \
|
|
|
+}
|
|
|
+
|
|
|
+__FUNC_ADD_NON_SAMPLE_EVENT_CLASS(comm,
|
|
|
+ __NON_SAMPLE_ADD_FIELD(u32, pid);
|
|
|
+ __NON_SAMPLE_ADD_FIELD(u32, tid);
|
|
|
+ __NON_SAMPLE_ADD_FIELD(string, comm);
|
|
|
+)
|
|
|
+
|
|
|
+__FUNC_ADD_NON_SAMPLE_EVENT_CLASS(fork,
|
|
|
+ __NON_SAMPLE_ADD_FIELD(u32, pid);
|
|
|
+ __NON_SAMPLE_ADD_FIELD(u32, ppid);
|
|
|
+ __NON_SAMPLE_ADD_FIELD(u32, tid);
|
|
|
+ __NON_SAMPLE_ADD_FIELD(u32, ptid);
|
|
|
+ __NON_SAMPLE_ADD_FIELD(u64, time);
|
|
|
+)
|
|
|
+
|
|
|
+__FUNC_ADD_NON_SAMPLE_EVENT_CLASS(exit,
|
|
|
+ __NON_SAMPLE_ADD_FIELD(u32, pid);
|
|
|
+ __NON_SAMPLE_ADD_FIELD(u32, ppid);
|
|
|
+ __NON_SAMPLE_ADD_FIELD(u32, tid);
|
|
|
+ __NON_SAMPLE_ADD_FIELD(u32, ptid);
|
|
|
+ __NON_SAMPLE_ADD_FIELD(u64, time);
|
|
|
+)
|
|
|
+
|
|
|
+#undef __NON_SAMPLE_ADD_FIELD
|
|
|
+#undef __FUNC_ADD_NON_SAMPLE_EVENT_CLASS
|
|
|
+
|
|
|
+static int setup_non_sample_events(struct ctf_writer *cw,
|
|
|
+ struct perf_session *session __maybe_unused)
|
|
|
+{
|
|
|
+ int ret;
|
|
|
+
|
|
|
+ ret = add_comm_event(cw);
|
|
|
+ if (ret)
|
|
|
+ return ret;
|
|
|
+ ret = add_exit_event(cw);
|
|
|
+ if (ret)
|
|
|
+ return ret;
|
|
|
+ ret = add_fork_event(cw);
|
|
|
+ if (ret)
|
|
|
+ return ret;
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+
|
|
|
static void cleanup_events(struct perf_session *session)
|
|
|
{
|
|
|
struct perf_evlist *evlist = session->evlist;
|
|
|
@@ -1273,13 +1448,14 @@ static int convert__config(const char *var, const char *value, void *cb)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-int bt_convert__perf2ctf(const char *input, const char *path, bool force)
|
|
|
+int bt_convert__perf2ctf(const char *input, const char *path,
|
|
|
+ struct perf_data_convert_opts *opts)
|
|
|
{
|
|
|
struct perf_session *session;
|
|
|
struct perf_data_file file = {
|
|
|
.path = input,
|
|
|
.mode = PERF_DATA_MODE_READ,
|
|
|
- .force = force,
|
|
|
+ .force = opts->force,
|
|
|
};
|
|
|
struct convert c = {
|
|
|
.tool = {
|
|
|
@@ -1299,6 +1475,12 @@ int bt_convert__perf2ctf(const char *input, const char *path, bool force)
|
|
|
struct ctf_writer *cw = &c.writer;
|
|
|
int err = -1;
|
|
|
|
|
|
+ if (opts->all) {
|
|
|
+ c.tool.comm = process_comm_event;
|
|
|
+ c.tool.exit = process_exit_event;
|
|
|
+ c.tool.fork = process_fork_event;
|
|
|
+ }
|
|
|
+
|
|
|
perf_config(convert__config, &c);
|
|
|
|
|
|
/* CTF writer */
|
|
|
@@ -1323,6 +1505,9 @@ int bt_convert__perf2ctf(const char *input, const char *path, bool force)
|
|
|
if (setup_events(cw, session))
|
|
|
goto free_session;
|
|
|
|
|
|
+ if (opts->all && setup_non_sample_events(cw, session))
|
|
|
+ goto free_session;
|
|
|
+
|
|
|
if (setup_streams(cw, session))
|
|
|
goto free_session;
|
|
|
|
|
|
@@ -1337,10 +1522,15 @@ int bt_convert__perf2ctf(const char *input, const char *path, bool force)
|
|
|
file.path, path);
|
|
|
|
|
|
fprintf(stderr,
|
|
|
- "[ perf data convert: Converted and wrote %.3f MB (%" PRIu64 " samples) ]\n",
|
|
|
+ "[ perf data convert: Converted and wrote %.3f MB (%" PRIu64 " samples",
|
|
|
(double) c.events_size / 1024.0 / 1024.0,
|
|
|
c.events_count);
|
|
|
|
|
|
+ if (!c.non_sample_count)
|
|
|
+ fprintf(stderr, ") ]\n");
|
|
|
+ else
|
|
|
+ fprintf(stderr, ", %" PRIu64 " non-samples) ]\n", c.non_sample_count);
|
|
|
+
|
|
|
cleanup_events(session);
|
|
|
perf_session__delete(session);
|
|
|
ctf_writer__cleanup(cw);
|
Ingo Molnar