QMP Query interfaces for tracing
v3 cover QMP Query interfaces for tracing
This patch set introduces two QMP interfaces for tracing :
* query-trace : to list current contents of trace-buffer
* query-trace-events : to list all available trace-events with their state.
Changelog :
-----------
Changes v2 -> v3 :
- Change declarations of st_print_trace_to_qlist() and st_print_trace_events_to_qlist() to return QList*
Changes v1 -> v2 :
- Add 'timestamp' field for query-trace output.
- Misc cleanups.
Signature · 5 lines
Prerna Saxena Linux Technology Centre, IBM Systems and Technology Lab, Bangalore, India
RFC PATCH v3 1/2 Introduce QMP interfaces : query-trace & query-trace-events
[PATCH 1/2] Introduce QMP interfaces : query-trace & query-trace-events.
--- monitor.c | 40 +++++++++++++++++++++++++++++++++++--- simpletrace.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ simpletrace.h | 4 +++ 3 files changed, 98 insertions(+), 4 deletions(-)
monitor.c +36 -4
@@ -941,15 +941,27 @@ static void do_info_cpu_stats(Monitor *mon)#endif #if defined(CONFIG_SIMPLE_TRACE ) -static void do_info_trace (Monitor *mon) +static void do_info_trace_print (Monitor *mon) {st_print_trace ((FILE *)mon, &monitor_fprintf); } -static void do_info_trace_events (Monitor *mon) +static void do_info_trace (Monitor *mon,QObject **ret_data) +{ +QList *trace_event_list =st_print_trace_to_qlist (); + *ret_data =QOBJECT (trace_event_list); +} + +static void do_info_trace_events_print (Monitor *mon,const QObject *data) {st_print_trace_events ((FILE *)mon, &monitor_fprintf); } + +static void do_info_trace_events (Monitor *mon,QObject **ret_data) +{ +QList *trace_event_list =st_print_trace_events_to_qlist (); + *ret_data =QOBJECT (trace_event_list); +}#endif /**
@@ -2606,14 +2618,16 @@ static const mon_cmd_t info_cmds[] = { .args_type = "", .params = "", .help = "show current contents of trace buffer", - .mhandler.info = do_info_trace, + .user_print = do_info_trace_print, + .mhandler.info_new = do_info_trace, }, { .name = "trace-events", .args_type = "", .params = "", .help = "show available trace-events & their state", - .mhandler.info = do_info_trace_events, + .user_print = do_info_trace_events_print, + .mhandler.info_new = do_info_trace_events, },#endif {
@@ -2748,6 +2762,24 @@ static const mon_cmd_t qmp_query_cmds[] = { .mhandler.info_async = do_info_balloon, .flags = MONITOR_CMD_ASYNC, }, +#if defined(CONFIG_SIMPLE_TRACE) + { + .name = "trace", + .args_type = "", + .params = "", + .help = "show current contents of trace buffer", + .user_print = do_info_trace_print, + .mhandler.info_new = do_info_trace, + }, + { + .name = "trace-events", + .args_type = "", + .params = "", + .help = "show available trace-events & their state", + .user_print = do_info_trace_events_print, + .mhandler.info_new = do_info_trace_events, + }, +#endif { /* NULL */ }, };
simpletrace.c +58 -0
70 lines not on this page · raw message
simpletrace.h +4 -0
@@ -14,6 +14,8 @@#include <stdint.h> #include <stdbool.h> #include <stdio.h> +#include "qdict.h" +#include "qjson.h" typedef uint64_t TraceEventID ;
@@ -36,5 +38,7 @@ void st_print_trace_file_status(FILE *stream, int (*stream_printf)(FILE *stream,void st_set_trace_file_enabled (bool enable);bool st_set_trace_file (const char *file);void st_flush_trace_buffer (void ); +QList *st_print_trace_to_qlist (); +QList *st_print_trace_events_to_qlist ();#endif /* SIMPLETRACE_H */
Signature · 10 lines
1.7.2.2 -- Prerna Saxena Linux Technology Centre, IBM Systems and Technology Lab, Bangalore, India
RFC PATCH v3 2/2 Add documentation for QMP commands: query-trace & query-trace-events.
In reply to Prerna Saxena[PATCH 2/2] Add documentation for QMP commands: query-trace & query-trace-events.
--- qmp-commands.hx | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 71 insertions(+), 0 deletions(-)
qmp-commands.hx +71 -0
@@ -1539,3 +1539,74 @@ Example: EQMP +SQMP +query-trace +------------- + +Show contents of trace buffer. + +Returns a set of json-objects containing the following data: + +- "event": Event ID for the trace-event(json-int) +- "timestamp": trace timestamp (json-int) +- "arg1 .. arg6": Arguments logged by the trace-event (json-int) + +Example: + +-> { "execute": "query-trace" } +<- { + "return":{ + "event": 22, + "timestamp": 129456235912365, + "arg1": 886 + "arg2": 80, + "arg3": 0, + "arg4": 0, + "arg5": 0, + "arg6": 0, + }, + { + "event": 22, + "timestamp": 129456235973407, + "arg1": 886, + "arg2": 80, + "arg3": 0, + "arg4": 0, + "arg5": 0, + "arg6": 0 + }, + ... + } + +EQMP + +SQMP +query-trace-events +------------------ + +Show all available trace-events & their state. + +Returns a set of json-objects containing the following data: + +- "name": Name of Trace-event (json-string) +- "event-id": Event ID of Trace-event (json-int) +- "state": State of trace-event [ '0': inactive; '1':active ] (json-int) + +Example: + +-> { "execute": "query-trace-events" } +<- { + "return":{ + "name": "qemu_malloc", + "event-id": 0 + "state": 0, + }, + { + "name": "qemu_realloc", + "event-id": 1, + "state": 0 + }, + ... + } + +EQMP
Signature · 10 lines
1.7.2.2 -- Prerna Saxena Linux Technology Centre, IBM Systems and Technology Lab, Bangalore, India
Quoted 4 lines · On Mon, 18 Oct 2010 11:36:55 +0530 Prerna Saxena <[email protected]>…
This patch set introduces two QMP interfaces for tracing :
* query-trace : to list current contents of trace-buffer
* query-trace-events : to list all available trace-events with their state.
This is in my to-review queue, but it's going to take a few days, because I have to take a deeper look at the tracing feature to be able to review it.
Two initial questions:
o This is labeled as an RFC, but you're versioning it. Should this be considered for inclusion?
o Is this really useful w/o being able to set new traces?
Quoted 11 lines
Changelog :
-----------
Changes v2 -> v3 :
- Change declarations ofst_print_trace_to_qlist()andst_print_trace_events_to_qlist()to return QList*Changes v1 -> v2 :
- Add 'timestamp' field for query-trace output.
- Misc cleanups.
Quoted 11 lines · Luiz Capitulino
Quoted 4 lines · On Mon, 18 Oct 2010 11:36:55 +0530 Prerna Saxena<[email protected]>…
This patch set introduces two QMP interfaces for tracing :
* query-trace : to list current contents of trace-buffer
* query-trace-events : to list all available trace-events with their state.This is in my to-review queue, but it's going to take a few days, because I have to take a deeper look at the tracing feature to be able to review it.
Thanks for looking..I'd look forward to your comments :-)
Quoted 4 lines
Two initial questions:
o This is labeled as an RFC, but you're versioning it. Should this be considered for inclusion?
I'm sending out a new version with some enhancements shortly -- for inclusion.
Quoted 3 lines
o Is this really useful w/o being able to set new traces?
I'm working on that as well. The query commands are the earliest interfaces to be implemented. I will be adding interfaces to toggle the state of trace-events, set a new trace-file, etc.
Quoted 7 lines
Quoted 7 lines
Changelog :
-----------
Changes v2 -> v3 :
- Change declarations ofst_print_trace_to_qlist()andst_print_trace_events_to_qlist()to return QList*
Quoted 5 lines
Quoted 4 lines
Changes v1 -> v2 :
- Add 'timestamp' field for query-trace output.
- Misc cleanups.
Thanks,
Signature · 5 lines
Prerna Saxena Linux Technology Centre, IBM Systems and Technology Lab, Bangalore, India