trace-cmd: Some minor updates and a timestamp checker
cover trace-cmd: Some minor updates and a timestamp checker
Steven Rostedt (VMware) (3):
trace-cmd: Fix whitespace in usage message of trace-cmd report --ts-diff
trace-cmd: Add reference to trace-cmd.org in README
trace-cmd: Add --ts-check option to report
----
Documentation/trace-cmd-report.1.txt | 4 ++++ README | 3 +++ tracecmd/trace-read.c | 27 ++++++++++++++++++++++++++- tracecmd/trace-usage.c | 3 ++- 4 files changed, 35 insertions(+), 2 deletions(-)
PATCH 1/3 trace-cmd: Fix whitespace in usage message of trace-cmd report --ts-diff
From: "Steven Rostedt (VMware)" <[email protected]>
The "--ts-diff" description in "trace-cmd report -h" is not lined up with the other long options. Fix the whitespace so that it is.
--- tracecmd/trace-usage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tracecmd/trace-usage.c +1 -1
@@ -228,7 +228,7 @@ static struct usage_help usage_help[] = {" to convert the displayed timestamps to seconds\n" " Affects the previous data file, unless there was no\n" " previous data file, in which case it becomes default\n" -" --ts-diff Show the delta timestamp between events.\n" +" --ts-diff Show the delta timestamp between events.\n" }, { "stream",
Signature · 1 line
2.28.0
PATCH 2/3 trace-cmd: Add reference to trace-cmd.org in README
In reply to Steven RostedtFrom: "Steven Rostedt (VMware)" <[email protected]>
This repo is mirrored in my personal github account, but that account is not mirrored, and there's been people submitting issues there. Add to the README, a reference to trace-cmd.org so that people will hopefully know the correct way to contribute.
--- README | 3 +++ 1 file changed, 3 insertions(+)
README +3 -0
@@ -1,4 +1,7 @@ + + For more information on contributing please see: https://www.trace-cmd.org + Note: The official repositiory for trace-cmd and KernelShark is here: git://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git
Signature · 1 line
2.28.0
PATCH 3/3 trace-cmd: Add --ts-check option to report
In reply to Steven RostedtFrom: "Steven Rostedt (VMware)" <[email protected]>
Add a --ts-check option to trace-cmd report that will make sure that the timestamps do not go backwards, and will print out an error message if they do.
--- Documentation/trace-cmd-report.1.txt | 4 ++++ tracecmd/trace-read.c | 27 ++++++++++++++++++++++++++- tracecmd/trace-usage.c | 1 + 3 files changed, 31 insertions(+), 1 deletion(-)
Documentation/trace-cmd-report.1.txt +4 -0
@@ -305,6 +305,10 @@ OPTIONS Show the time differences between events. The difference will appear in parenthesis just after the timestamp. +*--ts-check*:: + Make sure no timestamp goes backwards, and if it does, print out a warning + message of the fact. + EXAMPLES --------
tracecmd/trace-read.c +26 -1
@@ -99,6 +99,7 @@ static int no_irqs;static int no_softirqs;static int tsdiff; +static int tscheck;static int latency_format;static bool raw_format;
@@ -1192,6 +1193,7 @@ enum output_type {static void read_data_info (struct list_head *handle_list,enum output_type otype,int global) { +unsigned long long *last_timestamp;struct handle_list *handles;struct handle_list *last_handle;struct tep_record *record;
@@ -1216,6 +1218,10 @@ static void read_data_info(struct list_head *handle_list, enum output_type otypeprint_handle_file (handles);printf ("cpus=%d\n" , cpus); + last_timestamp =calloc (cpus,sizeof (*last_timestamp)); +if (!last_timestamp) +die ("allocating timestamps" ); +/* Latency trace is just all ASCII */ if (ret >0 ) {if (multi_inputs)
@@ -1286,6 +1292,8 @@ static void read_data_info(struct list_head *handle_list, enum output_type otypelist_for_each_entry (handles, handle_list, list) { record =get_next_record (handles); +if (!record) +continue ;if (!last_record || (record && record->ts < last_record->ts)) { last_record = record;
@@ -1293,12 +1301,24 @@ static void read_data_info(struct list_head *handle_list, enum output_type otype } }if (last_record) { +int cpu = last_record->cpu; +if (cpu >= cpus) +die ("cpu %d creater than %d\n" , cpu, cpus); +if (tscheck && last_timestamp[cpu] > last_record->ts) + errno =0 ; +warning ("WARNING: Record on cpu %d went backwards: %lld to %lld delta: -%lld\n" , + cpu, last_timestamp[cpu], + last_record->ts, + last_timestamp[cpu] - last_record->ts); + last_timestamp[cpu] = last_record->ts;print_handle_file (last_handle);trace_show_data (last_handle->handle, last_record);free_handle_record (last_handle); } }while (last_record); +free (last_timestamp); +if (profile)do_trace_profile ();
@@ -1463,7 +1483,8 @@ static void add_hook(const char *arg) }enum { - OPT_version =238 , + OPT_version =237 , + OPT_tscheck =238 , OPT_tsdiff =239 , OPT_ts2secs =240 , OPT_tsoffset =241 ,
@@ -1550,6 +1571,7 @@ void trace_report (int argc, char **argv) {"ts-offset", required_argument, NULL, OPT_tsoffset}, {"ts2secs", required_argument, NULL, OPT_ts2secs}, {"ts-diff", no_argument, NULL, OPT_tsdiff}, + {"ts-check", no_argument, NULL, OPT_tscheck}, {"help", no_argument, NULL, '?'}, {NULL, 0, NULL, 0} };
@@ -1719,6 +1741,9 @@ void trace_report (int argc, char **argv)case OPT_tsdiff: tsdiff =1 ;break ; +case OPT_tscheck: + tscheck =1 ; +break ;default :usage (argv); }
tracecmd/trace-usage.c +1 -0
@@ -229,6 +229,7 @@ static struct usage_help usage_help[] = {" Affects the previous data file, unless there was no\n" " previous data file, in which case it becomes default\n" " --ts-diff Show the delta timestamp between events.\n" +" --ts-check Check to make sure no time stamp on any CPU goes backwards.\n" }, { "stream",
Signature · 1 line
2.28.0