aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTzvetomir Stoyanov <tstoyanov@vmware.com>2019-04-09 10:50:20 +0300
committerSteven Rostedt (VMware) <rostedt@goodmis.org>2019-04-09 09:54:49 -0400
commit1cfbc3fba85d7947493dad201ec966c254b53c72 (patch)
treed5e300e0926491ed69315382ee20f1d0c10ca342
parentff13b789a7478a2ea7bce67f6ddcc6bc8ad8359a (diff)
downloadtrace-cmd-1cfbc3fba85d7947493dad201ec966c254b53c72.tar.gz
tools tools, tools lib traceevent: Make traceevent APIs more consistent
Rename some traceevent APIs for consistency: tep_pid_is_registered() to tep_is_pid_registered() tep_file_bigendian() to tep_is_file_bigendian() to make the names and return values consistent with other tep_is_... APIs tep_data_lat_fmt() to tep_data_latency_format() to make the name more descriptive tep_host_bigendian() to tep_is_bigendian() tep_set_host_bigendian() to tep_set_local_bigendian() tep_is_host_bigendian() to tep_is_local_bigendian() "host" can be confused with VMs, and "local" is about the local machine. All tep_is_..._bigendian(struct tep_handle *tep) APIs return the saved data in the tep handle, while tep_is_bigendian() returns the running machine's endianness. All tep_is_... functions are modified to return bool value, instead of int. Link: http://lore.kernel.org/linux-trace-devel/20190409075024.30512-2-tstoyanov@vmware.com Signed-off-by: Tzvetomir Stoyanov <tstoyanov@vmware.com> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Namhyung Kim <namhyung@kernel.org> Link: http://lkml.kernel.org/r/20190327141946.4353-2-tstoyanov@vmware.com Link: http://lkml.kernel.org/r/20190401164344.288624897@goodmis.org [ Removed some extra parenthesis around return statements ] Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-rw-r--r--include/traceevent/event-parse.h16
-rw-r--r--kernel-shark/src/libkshark.c2
-rw-r--r--kernel-shark/src/plugins/sched_events.c2
-rw-r--r--lib/trace-cmd/trace-input.c10
-rw-r--r--lib/traceevent/event-parse-api.c32
-rw-r--r--lib/traceevent/event-parse.c28
-rw-r--r--plugins/plugin_kvm.c4
-rw-r--r--python/tracecmd.py2
-rw-r--r--tracecmd/trace-output.c2
-rw-r--r--tracecmd/trace-read.c4
-rw-r--r--tracecmd/trace-split.c2
11 files changed, 52 insertions, 52 deletions
diff --git a/include/traceevent/event-parse.h b/include/traceevent/event-parse.h
index 12cbed0d..f8a5461e 100644
--- a/include/traceevent/event-parse.h
+++ b/include/traceevent/event-parse.h
@@ -398,7 +398,7 @@ void tep_set_flag(struct tep_handle *tep, int flag);
void tep_clear_flag(struct tep_handle *tep, enum tep_flag flag);
bool tep_test_flag(struct tep_handle *tep, enum tep_flag flags);
-static inline int tep_host_bigendian(void)
+static inline int tep_is_bigendian(void)
{
unsigned char str[] = { 0x1, 0x2, 0x3, 0x4 };
unsigned int val;
@@ -426,7 +426,7 @@ int tep_register_function(struct tep_handle *pevent, char *name,
unsigned long long addr, char *mod);
int tep_register_print_string(struct tep_handle *pevent, const char *fmt,
unsigned long long addr);
-int tep_pid_is_registered(struct tep_handle *pevent, int pid);
+bool tep_is_pid_registered(struct tep_handle *pevent, int pid);
void tep_print_event_task(struct tep_handle *pevent, struct trace_seq *s,
struct tep_event *event,
@@ -512,8 +512,8 @@ tep_find_event_by_name(struct tep_handle *pevent, const char *sys, const char *n
struct tep_event *
tep_find_event_by_record(struct tep_handle *pevent, struct tep_record *record);
-void tep_data_lat_fmt(struct tep_handle *pevent,
- struct trace_seq *s, struct tep_record *record);
+void tep_data_latency_format(struct tep_handle *pevent,
+ struct trace_seq *s, struct tep_record *record);
int tep_data_type(struct tep_handle *pevent, struct tep_record *rec);
int tep_data_pid(struct tep_handle *pevent, struct tep_record *rec);
int tep_data_preempt_count(struct tep_handle *pevent, struct tep_record *rec);
@@ -550,11 +550,11 @@ int tep_get_long_size(struct tep_handle *pevent);
void tep_set_long_size(struct tep_handle *pevent, int long_size);
int tep_get_page_size(struct tep_handle *pevent);
void tep_set_page_size(struct tep_handle *pevent, int _page_size);
-int tep_file_bigendian(struct tep_handle *pevent);
+bool tep_is_file_bigendian(struct tep_handle *pevent);
void tep_set_file_bigendian(struct tep_handle *pevent, enum tep_endian endian);
-int tep_is_host_bigendian(struct tep_handle *pevent);
-void tep_set_host_bigendian(struct tep_handle *pevent, enum tep_endian endian);
-int tep_is_latency_format(struct tep_handle *pevent);
+bool tep_is_local_bigendian(struct tep_handle *pevent);
+void tep_set_local_bigendian(struct tep_handle *pevent, enum tep_endian endian);
+bool tep_is_latency_format(struct tep_handle *pevent);
void tep_set_latency_format(struct tep_handle *pevent, int lat);
int tep_get_header_page_size(struct tep_handle *pevent);
void tep_set_parsing_failures(struct tep_handle *tep, int parsing_failures);
diff --git a/kernel-shark/src/libkshark.c b/kernel-shark/src/libkshark.c
index a886f801..654aaa93 100644
--- a/kernel-shark/src/libkshark.c
+++ b/kernel-shark/src/libkshark.c
@@ -966,7 +966,7 @@ static const char *kshark_get_latency(struct tep_handle *pe,
return NULL;
trace_seq_reset(&seq);
- tep_data_lat_fmt(pe, &seq, record);
+ tep_data_latency_format(pe, &seq, record);
return seq.buffer;
}
diff --git a/kernel-shark/src/plugins/sched_events.c b/kernel-shark/src/plugins/sched_events.c
index 724aa196..d0fd15e0 100644
--- a/kernel-shark/src/plugins/sched_events.c
+++ b/kernel-shark/src/plugins/sched_events.c
@@ -144,7 +144,7 @@ static void plugin_register_command(struct kshark_context *kshark_ctx,
* implemented as a wrapper function in libtracevent.
*/
- if (!tep_pid_is_registered(kshark_ctx->pevent, pid))
+ if (!tep_is_pid_registered(kshark_ctx->pevent, pid))
tep_register_comm(kshark_ctx->pevent, comm, pid);
}
diff --git a/lib/trace-cmd/trace-input.c b/lib/trace-cmd/trace-input.c
index 643d8ac0..d5ee3717 100644
--- a/lib/trace-cmd/trace-input.c
+++ b/lib/trace-cmd/trace-input.c
@@ -1610,7 +1610,7 @@ tracecmd_translate_data(struct tracecmd_input *handle,
memset(record, 0, sizeof(*record));
record->ref_count = 1;
- if (tep_is_host_bigendian(pevent) == tep_file_bigendian(pevent))
+ if (tep_is_local_bigendian(pevent) == tep_is_file_bigendian(pevent))
swap = 0;
record->data = kbuffer_translate_data(swap, ptr, &length);
record->size = length;
@@ -1652,7 +1652,7 @@ tracecmd_read_page_record(struct tep_handle *pevent, void *page, int size,
enum kbuffer_endian endian;
void *ptr;
- if (tep_file_bigendian(pevent))
+ if (tep_is_file_bigendian(pevent))
endian = KBUFFER_ENDIAN_BIG;
else
endian = KBUFFER_ENDIAN_LITTLE;
@@ -2257,7 +2257,7 @@ static int read_cpu_data(struct tracecmd_input *handle)
else
long_size = KBUFFER_LSIZE_4;
- if (tep_file_bigendian(handle->pevent))
+ if (tep_is_file_bigendian(handle->pevent))
endian = KBUFFER_ENDIAN_BIG;
else
endian = KBUFFER_ENDIAN_LITTLE;
@@ -2466,7 +2466,7 @@ int tracecmd_make_pipe(struct tracecmd_input *handle, int cpu, int fd, int cpus)
else
long_size = KBUFFER_LSIZE_4;
- if (tep_file_bigendian(handle->pevent))
+ if (tep_is_file_bigendian(handle->pevent))
endian = KBUFFER_ENDIAN_BIG;
else
endian = KBUFFER_ENDIAN_LITTLE;
@@ -2636,7 +2636,7 @@ struct tracecmd_input *tracecmd_alloc_fd(int fd)
handle->plugin_list = tracecmd_load_plugins(handle->pevent);
tep_set_file_bigendian(handle->pevent, buf[0]);
- tep_set_host_bigendian(handle->pevent, tracecmd_host_bigendian());
+ tep_set_local_bigendian(handle->pevent, tracecmd_host_bigendian());
do_read_check(handle, buf, 1);
handle->long_size = buf[0];
diff --git a/lib/traceevent/event-parse-api.c b/lib/traceevent/event-parse-api.c
index fb49d1b0..13d65a80 100644
--- a/lib/traceevent/event-parse-api.c
+++ b/lib/traceevent/event-parse-api.c
@@ -249,16 +249,16 @@ void tep_set_page_size(struct tep_handle *pevent, int _page_size)
}
/**
- * tep_file_bigendian - get if the file is in big endian order
+ * tep_is_file_bigendian - return the endian of the file
* @pevent: a handle to the tep_handle
*
- * This returns if the file is in big endian order
- * If @pevent is NULL, 0 is returned.
+ * This returns true if the file is in big endian order
+ * If @pevent is NULL, false is returned.
*/
-int tep_file_bigendian(struct tep_handle *pevent)
+bool tep_is_file_bigendian(struct tep_handle *pevent)
{
if (pevent)
- return pevent->file_bigendian;
+ return (pevent->file_bigendian == TEP_BIG_ENDIAN);
return 0;
}
@@ -276,13 +276,13 @@ void tep_set_file_bigendian(struct tep_handle *pevent, enum tep_endian endian)
}
/**
- * tep_is_host_bigendian - get if the order of the current host is big endian
+ * tep_is_local_bigendian - return the endian of the saved local machine
* @pevent: a handle to the tep_handle
*
- * This gets if the order of the current host is big endian
- * If @pevent is NULL, 0 is returned.
+ * This returns true if the saved local machine in @pevent is big endian.
+ * If @pevent is NULL, false is returned.
*/
-int tep_is_host_bigendian(struct tep_handle *pevent)
+bool tep_is_local_bigendian(struct tep_handle *pevent)
{
if (pevent)
return pevent->host_bigendian;
@@ -290,13 +290,13 @@ int tep_is_host_bigendian(struct tep_handle *pevent)
}
/**
- * tep_set_host_bigendian - set the order of the local host
+ * tep_set_local_bigendian - set the stored local machine endian order
* @pevent: a handle to the tep_handle
* @endian: non zero, if the local host has big endian order
*
- * This sets the order of the local host
+ * This sets the endian order for the local machine.
*/
-void tep_set_host_bigendian(struct tep_handle *pevent, enum tep_endian endian)
+void tep_set_local_bigendian(struct tep_handle *pevent, enum tep_endian endian)
{
if (pevent)
pevent->host_bigendian = endian;
@@ -306,14 +306,14 @@ void tep_set_host_bigendian(struct tep_handle *pevent, enum tep_endian endian)
* tep_is_latency_format - get if the latency output format is configured
* @pevent: a handle to the tep_handle
*
- * This gets if the latency output format is configured
- * If @pevent is NULL, 0 is returned.
+ * This returns true if the latency output format is configured
+ * If @pevent is NULL, false is returned.
*/
-int tep_is_latency_format(struct tep_handle *pevent)
+bool tep_is_latency_format(struct tep_handle *pevent)
{
if (pevent)
return pevent->latency_format;
- return 0;
+ return false;
}
/**
diff --git a/lib/traceevent/event-parse.c b/lib/traceevent/event-parse.c
index 17b97a88..65780efd 100644
--- a/lib/traceevent/event-parse.c
+++ b/lib/traceevent/event-parse.c
@@ -199,23 +199,23 @@ static const char *find_cmdline(struct tep_handle *pevent, int pid)
}
/**
- * tep_pid_is_registered - return if a pid has a cmdline registered
- * @pevent: handle for the pevent
+ * tep_is_pid_registered - return if a pid has a cmdline registered
+ * @pevent: a handle to the trace event parser context
* @pid: The pid to check if it has a cmdline registered with.
*
- * Returns 1 if the pid has a cmdline mapped to it
- * 0 otherwise.
+ * Returns true if the pid has a cmdline mapped to it
+ * false otherwise.
*/
-int tep_pid_is_registered(struct tep_handle *pevent, int pid)
+bool tep_is_pid_registered(struct tep_handle *pevent, int pid)
{
const struct tep_cmdline *comm;
struct tep_cmdline key;
if (!pid)
- return 1;
+ return true;
if (!pevent->cmdlines && cmdline_init(pevent))
- return 0;
+ return false;
key.pid = pid;
@@ -223,8 +223,8 @@ int tep_pid_is_registered(struct tep_handle *pevent, int pid)
sizeof(*pevent->cmdlines), cmdline_cmp);
if (comm)
- return 1;
- return 0;
+ return true;
+ return false;
}
/*
@@ -5172,7 +5172,7 @@ out_failed:
}
/**
- * tep_data_lat_fmt - parse the data for the latency format
+ * tep_data_latency_format - parse the data for the latency format
* @pevent: a handle to the pevent
* @s: the trace_seq to write to
* @record: the record to read from
@@ -5181,8 +5181,8 @@ out_failed:
* need rescheduling, in hard/soft interrupt, preempt count
* and lock depth) and places it into the trace_seq.
*/
-void tep_data_lat_fmt(struct tep_handle *pevent,
- struct trace_seq *s, struct tep_record *record)
+void tep_data_latency_format(struct tep_handle *pevent,
+ struct trace_seq *s, struct tep_record *record)
{
static int check_lock_depth = 1;
static int check_migrate_disable = 1;
@@ -5532,7 +5532,7 @@ void tep_print_event_time(struct tep_handle *pevent, struct trace_seq *s,
}
if (pevent->latency_format) {
- tep_data_lat_fmt(pevent, s, record);
+ tep_data_latency_format(pevent, s, record);
}
if (use_usec_format) {
@@ -6827,7 +6827,7 @@ struct tep_handle *tep_alloc(void)
if (pevent) {
pevent->ref_count = 1;
- pevent->host_bigendian = tep_host_bigendian();
+ pevent->host_bigendian = tep_is_bigendian();
}
return pevent;
diff --git a/plugins/plugin_kvm.c b/plugins/plugin_kvm.c
index ddac21aa..e23b513b 100644
--- a/plugins/plugin_kvm.c
+++ b/plugins/plugin_kvm.c
@@ -386,8 +386,8 @@ static int kvm_mmu_print_role(struct trace_seq *s, struct tep_record *record,
* We can only use the structure if file is of the same
* endianness.
*/
- if (tep_file_bigendian(event->pevent) ==
- tep_is_host_bigendian(event->pevent)) {
+ if (tep_is_file_bigendian(event->pevent) ==
+ tep_is_local_bigendian(event->pevent)) {
trace_seq_printf(s, "%u/%u q%u%s %s%s %spge %snxe",
role.level,
diff --git a/python/tracecmd.py b/python/tracecmd.py
index a6671f68..677c0f2f 100644
--- a/python/tracecmd.py
+++ b/python/tracecmd.py
@@ -166,7 +166,7 @@ class PEvent(object):
@cached_property
def file_endian(self):
- if tep_file_bigendian(self._pevent):
+ if tep_is_file_bigendian(self._pevent):
return '>'
return '<'
diff --git a/tracecmd/trace-output.c b/tracecmd/trace-output.c
index 1c2e92c0..33d6ce3e 100644
--- a/tracecmd/trace-output.c
+++ b/tracecmd/trace-output.c
@@ -808,7 +808,7 @@ create_file_fd(int fd, struct tracecmd_input *ihandle,
/* Use the pevent of the ihandle for later writes */
handle->pevent = tracecmd_get_pevent(ihandle);
tep_ref(pevent);
- if (tep_file_bigendian(pevent))
+ if (tep_is_file_bigendian(pevent))
buf[0] = 1;
else
buf[0] = 0;
diff --git a/tracecmd/trace-read.c b/tracecmd/trace-read.c
index 0d16b157..52fa1bda 100644
--- a/tracecmd/trace-read.c
+++ b/tracecmd/trace-read.c
@@ -1700,8 +1700,8 @@ void trace_report (int argc, char **argv)
if (show_endian) {
printf("file is %s endian and host is %s endian\n",
- tep_file_bigendian(pevent) ? "big" : "little",
- tep_is_host_bigendian(pevent) ? "big" : "little");
+ tep_is_file_bigendian(pevent) ? "big" : "little",
+ tep_is_local_bigendian(pevent) ? "big" : "little");
return;
}
diff --git a/tracecmd/trace-split.c b/tracecmd/trace-split.c
index 6043e97f..d27b3c65 100644
--- a/tracecmd/trace-split.c
+++ b/tracecmd/trace-split.c
@@ -64,7 +64,7 @@ static int create_type_len(struct tep_handle *pevent, int time, int len)
bigendian = 1;
}
- if (tep_file_bigendian(pevent))
+ if (tep_is_file_bigendian(pevent))
time |= (len << 27);
else
time = (time << 5) | len;