Timestamp synchronization of host - guest
v14 cover Timestamp synchronization of host - guest
Basic infrastructure for host - guest timestamp synchronization and a POC implementation of PTP-like algorithm.
Tzvetomir Stoyanov (7):
trace-cmd: Implement new lib API: tracecmd_local_events_system()
trace-cmd: Add support for negative time offsets in trace.dat file
trace-cmd: Add implementations of htonll() and ntohll()
trace-cmd: Add new library APIs for ftrace instances.
trace-cmd: Find and store pids of tasks, which run virtual CPUs of
given VM
trace-cmd: Implement new API tracecmd_add_option_v()
trace-cmd: Implement new option in trace.dat file:
TRACECMD_OPTION_TIME_SHIFT
Tzvetomir Stoyanov (VMware) (12):
trace-cmd: Add new library API for local CPU count
trace-cmd: Add new library API for reading ftrace buffers
trace-cmd: --del the tracee address map into the guest's trace.dat
file
trace-cmd: Add new API to generate a unique ID of the tracing session
trace-cmd: Store the session tracing ID in the trace.dat file
trace-cmd: Exchange tracing IDs between host and guest
trace-cmd: Add guest information in host's trace.dat file
trace-cmd: Add host trace clock as guest trace argument
trace-cmd: Refactor few trace-cmd internal functions.
trace-cmd: Basic infrastructure for host - guest timestamp
synchronization
trace-cmd: [POC] PTP-like algorithm for host - guest timestamp
synchronization
trace-cmd: Debug scripts for PTP-like algorithm for host - guest
timestamp synchronization
Documentation/trace-cmd-record.1.txt | 6 + include/trace-cmd/trace-cmd.h | 116 +++- include/trace-cmd/trace-msg.h | 10 + include/traceevent/event-parse.h | 1 + lib/trace-cmd/Makefile | 3 + lib/trace-cmd/include/trace-cmd-local.h | 33 +- lib/trace-cmd/include/trace-tsync-local.h | 36 ++ lib/trace-cmd/trace-input.c | 314 +++++++++- lib/trace-cmd/trace-msg.c | 164 +++++- lib/trace-cmd/trace-output.c | 116 +++- lib/trace-cmd/trace-timesync-ptp.c | 668 ++++++++++++++++++++++ lib/trace-cmd/trace-timesync.c | 469 +++++++++++++++ lib/trace-cmd/trace-util.c | 358 ++++++++++-- scripts/debug/tsync_hist.py | 57 ++ scripts/debug/tsync_readme | 13 + scripts/debug/tsync_res.py | 46 ++ tracecmd/Makefile | 3 +- tracecmd/include/trace-local.h | 33 +- tracecmd/trace-agent.c | 48 +- tracecmd/trace-list.c | 2 +- tracecmd/trace-profile.c | 2 +- tracecmd/trace-read.c | 4 +- tracecmd/trace-record.c | 603 ++++++++++--------- tracecmd/trace-show.c | 2 + tracecmd/trace-stat.c | 24 +- tracecmd/trace-tsync.c | 265 +++++++++ tracecmd/trace-usage.c | 4 + 27 files changed, 2955 insertions(+), 445 deletions(-) create mode 100644 lib/trace-cmd/include/trace-tsync-local.h create mode 100644 lib/trace-cmd/trace-timesync-ptp.c create mode 100644 lib/trace-cmd/trace-timesync.c create mode 100644 scripts/debug/tsync_hist.py create mode 100644 scripts/debug/tsync_readme create mode 100644 scripts/debug/tsync_res.py create mode 100644 tracecmd/trace-tsync.c
Signature · 1 line
2.23.0
PATCH v14 1/19 trace-cmd: Implement new lib API: tracecmd_local_events_system()
From: Tzvetomir Stoyanov <[email protected]>
The new tracecmd lib API tracecmd_local_events_system() creates a tep handler and initializes it with the events of the specified subsystems.
--- include/trace-cmd/trace-cmd.h | 4 +- lib/trace-cmd/trace-util.c | 102 +++++++++++++++++++++++----------- 2 files changed, 72 insertions(+), 34 deletions(-)
include/trace-cmd/trace-cmd.h +3 -1
@@ -27,8 +27,10 @@ extern int tracecmd_disable_plugins;char **tracecmd_event_systems (const char *tracing_dir);char **tracecmd_system_events (const char *tracing_dir,const char *system);struct tep_handle *tracecmd_local_events (const char *tracing_dir); +struct tep_handle *tracecmd_local_events_system (const char *tracing_dir, +const char *const *sys_names);int tracecmd_fill_local_events (const char *tracing_dir, -struct tep_handle *pevent,int *parsing_failures); +struct tep_handle *tep,int *parsing_failures);char **tracecmd_local_plugins (const char *tracing_dir);char **tracecmd_add_list (char **list,const char *name,int len);
lib/trace-cmd/trace-util.c +69 -33
135 lines not on this page · raw message
Signature · 1 line
2.23.0
Re: [PATCH v14 01/19] trace-cmd: Implement new lib API: tracecmd_local_events_system()
Quoted 6 lines · On Wed, 27 Nov 2019 16:02:29 +0200 "Tzvetomir Stoyanov (VMware)"…
From: Tzvetomir Stoyanov <[email protected]>
The new tracecmd lib API
tracecmd_local_events_system()creates a tep handler and initializes it with the events of the specified subsystems.
This says what the patch does, not why. Why do we want this new lib routine?
Quoted 106 lines
Signed-off-by Tzvetomir Stoyanov <[email protected]>--- include/trace-cmd/trace-cmd.h | 4 +- lib/trace-cmd/trace-util.c | 102 +++++++++++++++++++++++----------- 2 files changed, 72 insertions(+), 34 deletions(-)include/trace-cmd/trace-cmd.h +3
-1@@ -27,8 +27,10 @@ extern int tracecmd_disable_plugins;char **tracecmd_event_systems (const char *tracing_dir);char **tracecmd_system_events (const char *tracing_dir,const char *system);struct tep_handle *tracecmd_local_events (const char *tracing_dir); +struct tep_handle *tracecmd_local_events_system (const char *tracing_dir, +const char *const *sys_names);int tracecmd_fill_local_events (const char *tracing_dir, -struct tep_handle *pevent,int *parsing_failures); +struct tep_handle *tep,int *parsing_failures);char **tracecmd_local_plugins (const char *tracing_dir);char **tracecmd_add_list (char **list,const char *name,int len);lib/trace-cmd/trace-util.c +15
-33@@ -613,39 +613,20 @@ static int read_header(struct tep_handle *pevent, const char *events_dir)return ret; } -/** -* tracecmd_local_events - create a pevent from the events on system -* @tracing_dir: The directory that contains the events. -* -* Returns a pevent structure that contains the pevents local to -* the system. -*/ -struct tep_handle *tracecmd_local_events (const char *tracing_dir) +static bool contains (const char *name,const char *const *names) { -struct tep_handle *pevent =NULL ; - - pevent =tep_alloc (); -if (!pevent) -return NULL ; - -if (tracecmd_fill_local_events (tracing_dir, pevent,NULL )) { -tep_free (pevent); - pevent =NULL ; - } - -return pevent; +if (!names) +return false; +for (; *names; names++) +if (strcmp (name, *names) ==0 ) +return true; +return false; } -/** -* tracecmd_fill_local_events - Fill a pevent with the events on system -* @tracing_dir: The directory that contains the events. -* @pevent: Allocated pevent which will be filled -* @parsing_failures: return number of failures while parsing the event files -* -* Returns whether the operation succeeded -*/ -int tracecmd_fill_local_events (const char *tracing_dir, -struct tep_handle *pevent,int *parsing_failures) +static int tracecmd_fill_local_events_system (const char *tracing_dir, +struct tep_handle *tep, +const char *const *sys_names, +int *parsing_failures) {struct dirent *dent;char *events_dir;@@ -674,7 +655,7 @@ int tracecmd_fill_local_events(const char *tracing_dir, goto out_free; } - ret =read_header (pevent, events_dir); + ret =read_header (tep, events_dir);if (ret <0 ) { ret =-1 ; goto out_free;@@ -687,7 +668,8 @@ int tracecmd_fill_local_events(const char *tracing_dir,if (strcmp (name,"." ) ==0 ||strcmp (name,".." ) ==0 )continue ; - +if (sys_names && !contains (name, sys_names)) +continue ; sys =append_file (events_dir, name); ret =stat (sys, &st);if (ret <0 || !S_ISDIR (st.st_mode)) {@@ -695,7 +677,7 @@ int tracecmd_fill_local_events(const char *tracing_dir,continue ; } - ret =load_events (pevent, name, sys); + ret =load_events (tep, name, sys);free (sys);
lib/trace-cmd/trace-util.c int tracecmd_fill_local_events(const char *tracing_dir, · line 699
Quoted 5 lines
lib/trace-cmd/trace-util.c +2
-0@@ -713,6 +695,60 @@ int tracecmd_fill_local_events(const char *tracing_dir,return ret; } +/** +* tracecmd_local_events_system - create a tep from the events of the specified subsystem.
There should be no period at the end.
-- Steve
Quoted 55 lines
lib/trace-cmd/trace-util.c +52
-0+* +* @tracing_dir: The directory that contains the events. +* @sys_name: Array of system names, to load the events from. +* The last element from the array must be NULL +* +* Returns a tep structure that contains the tep local to +* the system. +*/ +struct tep_handle *tracecmd_local_events_system (const char *tracing_dir, +const char *const *sys_names) +{ +struct tep_handle *tep =NULL ; + + tep =tep_alloc (); +if (!tep) +return NULL ; + +if (tracecmd_fill_local_events_system (tracing_dir, tep, sys_names,NULL )) { +tep_free (tep); + tep =NULL ; + } + +return tep; +} + +/** +* tracecmd_local_events - create a pevent from the events on system +* @tracing_dir: The directory that contains the events. +* +* Returns a pevent structure that contains the pevents local to +* the system. +*/ +struct tep_handle *tracecmd_local_events (const char *tracing_dir) +{ +return tracecmd_local_events_system (tracing_dir,NULL ); +} + +/** +* tracecmd_fill_local_events - Fill a pevent with the events on system +* @tracing_dir: The directory that contains the events. +* @tep: Allocated tep handler which will be filled +* @parsing_failures: return number of failures while parsing the event files +* +* Returns whether the operation succeeded +*/ +int tracecmd_fill_local_events (const char *tracing_dir, +struct tep_handle *tep,int *parsing_failures) +{ +return tracecmd_fill_local_events_system (tracing_dir, tep, +NULL , parsing_failures); +} +/** * tracecmd_local_plugins - returns an array of available tracer plugins * @tracing_dir: The directory that contains the tracing directory
PATCH v14 2/19 trace-cmd: Add support for negative time offsets in trace.dat file
In reply to Tzvetomir Stoyanov (VMware)From: Tzvetomir Stoyanov <[email protected]>
When synchronizing timestamps between different machines, there are cases when the time offset is negative. This patch changes the way time offset is written and read from trace.dat file - as signed decimal, instead of hex.
--- include/trace-cmd/trace-cmd.h | 2 +- lib/trace-cmd/trace-input.c | 6 +++--- tracecmd/trace-read.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-)
include/trace-cmd/trace-cmd.h +1 -1
@@ -138,7 +138,7 @@ const char *tracecmd_buffer_instance_name(struct tracecmd_input *handle, int indstruct tracecmd_input *tracecmd_buffer_instance_handle (struct tracecmd_input *handle,int indx);int tracecmd_is_buffer_instance (struct tracecmd_input *handle); -void tracecmd_set_ts_offset (struct tracecmd_input *handle,unsigned long long offset); +void tracecmd_set_ts_offset (struct tracecmd_input *handle,long long offset);void tracecmd_set_ts2secs (struct tracecmd_input *handle,unsigned long long hz);void tracecmd_print_events (struct tracecmd_input *handle,const char *regex);
lib/trace-cmd/trace-input.c +3 -3
@@ -90,7 +90,7 @@ struct tracecmd_input {bool read_page;bool use_pipe;struct cpu_data *cpu_data; -unsigned long long ts_offset; +long long ts_offset;double ts2secs;char * cpustats;char * uname;
@@ -2127,7 +2127,7 @@ static int init_cpu(struct tracecmd_input *handle, int cpu) }void tracecmd_set_ts_offset (struct tracecmd_input *handle, -unsigned long long offset) +long long offset) { handle->ts_offset = offset; }
@@ -2305,7 +2305,7 @@ tracecmd_search_task_map(struct tracecmd_input *handle,static int handle_options (struct tracecmd_input *handle) { -unsigned long long offset; +long long offset;unsigned short option;unsigned int size;char *cpustats =NULL ;
tracecmd/trace-read.c +2 -2
@@ -58,7 +58,7 @@ static struct list_head handle_list;struct input_files {struct list_head list;const char *file; -unsigned long long tsoffset; +long long tsoffset;unsigned long long ts2secs; };static struct list_head input_files;
@@ -1453,7 +1453,7 @@ void trace_report (int argc, char **argv)struct input_files *inputs;struct handle_list *handles;enum output_type otype; -unsigned long long tsoffset =0 ; +long long tsoffset =0 ;unsigned long long ts2secs =0 ;unsigned long long ts2sc;int show_stat =0 ;
Signature · 1 line
2.23.0
PATCH v14 3/19 trace-cmd: Add implementations of htonll() and ntohll()
In reply to Tzvetomir Stoyanov (VMware)From: Tzvetomir Stoyanov <[email protected]>
Implementations of htonll() and ntohll() are added as macros, if they are not already defined.
--- include/trace-cmd/trace-msg.h | 10 ++++++++++ 1 file changed, 10 insertions(+)
include/trace-cmd/trace-msg.h +10 -0
@@ -12,4 +12,14 @@extern unsigned int page_size; +#ifndef htonll +# if __BYTE_ORDER == __LITTLE_ENDIAN +#define htonll (x) __bswap_64(x) +#define ntohll (x) __bswap_64(x) +#else +#define htonll (x) (x) +#define ntohll (x) (x) +#endif +#endif +#endif /* _TRACE_MSG_H_ */
Signature · 1 line
2.23.0
PATCH v14 4/19 trace-cmd: Add new library APIs for ftrace instances.
In reply to Tzvetomir Stoyanov (VMware)From: Tzvetomir Stoyanov <[email protected]>
In order to reuse the code, the functionality related to ftrace instances is moved from trace-cmd application to libtracecmd. The following new library APIs are introduced:
library structure, representing a ftrace instance:
struct tracecmd_instance {
char *name;
char *clock;
};APIs for creating and deleting ftrace instances:
struct tracecmd_instance *tracecmd_create_instance(const char *name); void tracecmd_free_instance(struct tracecmd_instance *instance); int tracecmd_make_instance(struct tracecmd_instance *instance); void tracecmd_remove_instance(struct tracecmd_instance *instance);
APIs for reading and writing ftrace files, instance aware:
char *tracecmd_get_instance_file(struct tracecmd_instance *instance, const char *file);
char *tracecmd_get_instance_dir(struct tracecmd_instance *instance);
int tracecmd_write_instance_file(struct tracecmd_instance *instance,
const char *file, const char *str,
const char *type);
int tracecmd_write_file(const char *file, const char *str, const char *type);
char *tracecmd_read_instance_file(struct tracecmd_instance *instance,
char *file, int *psize);API for setting ftrace clock, instance aware:
void tracecmd_set_clock(struct tracecmd_instance *instance, char **old_clock);
--- include/trace-cmd/trace-cmd.h | 24 ++ lib/trace-cmd/Makefile | 1 + lib/trace-cmd/include/trace-cmd-local.h | 33 +-- lib/trace-cmd/trace-util.c | 71 ++++- tracecmd/include/trace-local.h | 6 +- tracecmd/trace-list.c | 2 +- tracecmd/trace-record.c | 341 +++++++----------------- tracecmd/trace-show.c | 2 + tracecmd/trace-stat.c | 20 +- 9 files changed, 207 insertions(+), 293 deletions(-)
include/trace-cmd/trace-cmd.h +24 -0
@@ -356,6 +356,30 @@ int tracecmd_msg_send_trace_resp(struct tracecmd_msg_handle *msg_handle,int tracecmd_msg_recv_trace_resp (struct tracecmd_msg_handle *msg_handle,int *nr_cpus,int *page_size,unsigned int **ports,bool *use_fifos); +/* --- ftrace instances --- */ + +struct tracecmd_instance { +char *name; +char *clock; +}; + +struct tracecmd_instance *tracecmd_create_instance (const char *name); +void tracecmd_free_instance (struct tracecmd_instance *instance); +int tracecmd_make_instance (struct tracecmd_instance *instance); +void tracecmd_remove_instance (struct tracecmd_instance *instance); +char * +tracecmd_get_instance_file (struct tracecmd_instance *instance,const char *file); +char *tracecmd_get_instance_dir (struct tracecmd_instance *instance); +int tracecmd_write_instance_file (struct tracecmd_instance *instance, +const char *file,const char *str, +const char *type); + +int tracecmd_write_file (const char *file,const char *str,const char *type); +char *tracecmd_read_instance_file (struct tracecmd_instance *instance, +char *file,int *psize); + +void tracecmd_set_clock (struct tracecmd_instance *instance,char **old_clock); +/* --- Plugin handling --- */ extern struct tep_plugin_option trace_ftrace_options[];
lib/trace-cmd/Makefile +1 -0
@@ -13,6 +13,7 @@ OBJS += trace-input.o OBJS += trace-output.o OBJS += trace-recorder.o OBJS += trace-util.o +OBJS += trace-instance.o OBJS += trace-filter-hash.o OBJS += trace-msg.o
lib/trace-cmd/include/trace-cmd-local.h +2 -31
@@ -18,36 +18,7 @@#define STR (x) _STR(x)#define FILE_VERSION_STRING STR(FILE_VERSION) -static ssize_t __do_write (int fd,const void *data,size_t size) -{ -ssize_t tot =0 ; -ssize_t w; - -do { - w =write (fd, data + tot, size - tot); - tot += w; - -if (!w) -break ; -if (w <0 ) -return w; - }while (tot != size); - -return tot; -} - -static ssize_t -__do_write_check (int fd,const void *data,size_t size) -{ -ssize_t ret; - - ret =__do_write (fd, data, size); -if (ret <0 ) -return ret; -if (ret != size) -return -1 ; - -return 0 ; -} +ssize_t __do_write_check (int fd,const void *data,size_t size); +void __noreturn die (const char *fmt, ...);/* Can be overriden */ #endif /* _TRACE_CMD_LOCAL_H */
lib/trace-cmd/trace-util.c +66 -5
86 lines not on this page · raw message
tracecmd/include/trace-local.h +3 -3
@@ -181,7 +181,7 @@ struct pid_addr_maps {struct buffer_instance {struct buffer_instance *next; -const char *name; +struct tracecmd_instance *ftrace;char *cpumask;struct event_list *events;struct event_list **event_next;
@@ -195,7 +195,6 @@ struct buffer_instance {struct func_list *filter_funcs;struct func_list *notrace_funcs; -const char *clock;unsigned int *client_ports;struct trace_seq *s_save;
@@ -225,6 +224,8 @@ struct buffer_instance {bool use_fifos; }; +void init_top_instance (void ); +extern struct buffer_instance top_instance;extern struct buffer_instance *buffer_instances;extern struct buffer_instance *first_instance;
@@ -238,7 +239,6 @@ extern struct buffer_instance *first_instance;struct buffer_instance *create_instance (const char *name);void add_instance (struct buffer_instance *instance,int cpu_count); -char *get_instance_file (struct buffer_instance *instance,const char *file);void update_first_instance (struct buffer_instance *instance,int topt);void show_instance_file (struct buffer_instance *instance,const char *name);
tracecmd/trace-list.c +1 -1
@@ -33,7 +33,7 @@ void show_instance_file(struct buffer_instance *instance, const char *name) {char *path; - path =get_instance_file (instance, name); + path =tracecmd_get_instance_file (instance->ftrace, name);dump_file_content (path);tracecmd_put_tracing_file (path); }
tracecmd/trace-record.c +97 -244
732 lines not on this page · raw message
tracecmd/trace-show.c +2 -0
@@ -51,6 +51,8 @@ void trace_show(int argc, char **argv) {NULL, 0, NULL, 0} }; +init_top_instance (); +while ((c =getopt_long (argc-1 , argv+1 ,"B:c:fsp" , long_options, &option_index)) >=0 ) {switch (c) {
tracecmd/trace-stat.c +11 -9
@@ -30,7 +30,7 @@ static int get_instance_file_fd(struct buffer_instance *instance,char *path;int fd; - path =get_instance_file (instance, file); + path =tracecmd_get_instance_file (instance->ftrace, file); fd =open (path,O_RDONLY );tracecmd_put_tracing_file (path);
@@ -347,7 +347,7 @@ static void report_events(struct buffer_instance *instance)free (str); - path =get_instance_file (instance,"events" ); + path =tracecmd_get_instance_file (instance->ftrace,"events" );if (!path)die ("malloc" );
@@ -436,7 +436,7 @@ static void report_event_filters(struct buffer_instance *instance)enum event_iter_type type;enum event_process processed =PROCESSED_NONE ; - path =get_instance_file (instance,"events" ); + path =tracecmd_get_instance_file (instance->ftrace,"events" );if (!path)die ("malloc" );
@@ -509,7 +509,7 @@ static void report_event_triggers(struct buffer_instance *instance)enum event_iter_type type;enum event_process processed =PROCESSED_NONE ; - path =get_instance_file (instance,"events" ); + path =tracecmd_get_instance_file (instance->ftrace,"events" );if (!path)die ("malloc" );
@@ -598,7 +598,7 @@ static void report_graph_funcs(struct buffer_instance *instance) {char *path; - path =get_instance_file (instance,"set_graph_function" ); + path =tracecmd_get_instance_file (instance->ftrace,"set_graph_function" );if (!path)die ("malloc" );
@@ -606,7 +606,7 @@ static void report_graph_funcs(struct buffer_instance *instance)tracecmd_put_tracing_file (path); - path =get_instance_file (instance,"set_graph_notrace" ); + path =tracecmd_get_instance_file (instance->ftrace,"set_graph_notrace" );if (!path)die ("malloc" );
@@ -619,7 +619,7 @@ static void report_ftrace_filters(struct buffer_instance *instance) {char *path; - path =get_instance_file (instance,"set_ftrace_filter" ); + path =tracecmd_get_instance_file (instance->ftrace,"set_ftrace_filter" );if (!path)die ("malloc" );
@@ -627,7 +627,7 @@ static void report_ftrace_filters(struct buffer_instance *instance)tracecmd_put_tracing_file (path); - path =get_instance_file (instance,"set_ftrace_notrace" ); + path =tracecmd_get_instance_file (instance->ftrace,"set_ftrace_notrace" );if (!path)die ("malloc" );
@@ -857,7 +857,7 @@ static void stat_instance(struct buffer_instance *instance)if (instance != &top_instance) {if (instance != first_instance)printf ("---------------\n" ); -printf ("Instance: %s\n" , instance->name); +printf ("Instance: %s\n" , instance->ftrace->name); }report_plugin (instance);
@@ -882,6 +882,8 @@ void trace_stat (int argc, char **argv)int status;int c; +init_top_instance (); +for (;;) { c =getopt (argc-1 , argv+1 ,"tB:" );if (c ==-1 )
Signature · 1 line
2.23.0
PATCH v14 5/19 trace-cmd: Add new library API for local CPU count
In reply to Tzvetomir Stoyanov (VMware)In order to reuse the code, the function detecting the number of local CPU is moved from trace-cmd application to libtracecmd. The following new library API is introduced:
int tracecmd_count_cpus(void);
--- include/trace-cmd/trace-cmd.h | 3 +++ lib/trace-cmd/trace-util.c | 40 +++++++++++++++++++++++++++++ tracecmd/include/trace-local.h | 2 -- tracecmd/trace-agent.c | 2 +- tracecmd/trace-profile.c | 2 +- tracecmd/trace-record.c | 46 +++------------------------------- tracecmd/trace-stat.c | 4 +-- 7 files changed, 50 insertions(+), 49 deletions(-)
include/trace-cmd/trace-cmd.h +3 -0
@@ -427,6 +427,9 @@ void tracecmd_plog(const char *fmt, ...);void tracecmd_plog_error (const char *fmt, ...);int tracecmd_set_logfile (char *logfile); +/* --- System --- */ +int tracecmd_count_cpus (void ); +/* --- Hack! --- */ int tracecmd_blk_hack (struct tracecmd_input *handle);
lib/trace-cmd/trace-util.c +40 -0
@@ -1109,6 +1109,46 @@ int tracecmd_stack_tracer_status(int *status)return 1 ;/* full success */ } +int tracecmd_count_cpus (void ) +{ +FILE *fp; +char buf[1024 ]; +int cpus =0 ; +char *pbuf; +size_t *pn; +size_t n; +int r; + + cpus =sysconf (_SC_NPROCESSORS_CONF); +if (cpus >0 ) +return cpus; + +warning ("sysconf could not determine number of CPUS" ); + +/* Do the hack to figure out # of CPUS */ + n =1024 ; + pn = &n; + pbuf = buf; + + fp =fopen ("/proc/cpuinfo" ,"r" ); +if (!fp) +die ("Can not read cpuinfo" ); + +while ((r =getline (&pbuf, pn, fp)) >=0 ) { +char *p; + +if (strncmp (buf,"processor" ,9 ) !=0 ) +continue ; +for (p = buf+9 ;isspace (*p); p++) + ; +if (*p ==':' ) + cpus++; + } +fclose (fp); + +return cpus; +} +/* * tracecmd_write_file - Write in trace file * @file: Full name of the trace file.
tracecmd/include/trace-local.h +0 -2
@@ -243,8 +243,6 @@ void update_first_instance(struct buffer_instance *instance, int topt);void show_instance_file (struct buffer_instance *instance,const char *name); -int count_cpus (void ); -/* moved from trace-cmd.h */ void tracecmd_create_top_instance (char *name);void tracecmd_remove_instances (void );
tracecmd/trace-agent.c +1 -1
@@ -203,7 +203,7 @@ static void agent_serve(unsigned int port)signal (SIGCHLD , handle_sigchld); - nr_cpus =count_cpus (); + nr_cpus =tracecmd_count_cpus (); page_size =getpagesize (); sd =make_vsock (port);
tracecmd/trace-profile.c +1 -1
@@ -1314,7 +1314,7 @@ void trace_init_profile(struct tracecmd_input *handle, struct hook_list *hook,* system. */ if (!h->cpus) - h->cpus =count_cpus (); + h->cpus =tracecmd_count_cpus ();list_head_init (&h->migrate_starts); h->cpu_starts =malloc (sizeof (*h->cpu_starts) * h->cpus);
tracecmd/trace-record.c +3 -43
70 lines not on this page · raw message
tracecmd/trace-stat.c +2 -2
@@ -737,7 +737,7 @@ static void report_cpumask(struct buffer_instance *instance) cont =strstrip (str);/* check to make sure all CPUs on this machine are set */ - cpus =count_cpus (); + cpus =tracecmd_count_cpus ();for (i =strlen (cont) -1 ; i >=0 && cpus >0 ; i--) {if (cont[i] ==',' )
@@ -896,7 +896,7 @@ void trace_stat (int argc, char **argv) instance =create_instance (optarg);if (!instance)die ("Failed to create instance" ); -add_instance (instance,count_cpus ()); +add_instance (instance,tracecmd_count_cpus ());/* top instance requires direct access */ if (!topt &&is_top_instance (first_instance)) first_instance = instance;
Signature · 1 line
2.23.0
PATCH v14 6/19 trace-cmd: Add new library API for reading ftrace buffers
In reply to Tzvetomir Stoyanov (VMware)A new libtracecmd API is introduced:
int tracecmd_iterate_raw_events(struct tep_handle *tep,
struct tracecmd_instance *instance, int (*callback)(struct tep_event *,
struct tep_record *, int, void *context),
void *callback_context);
It reads events from trace_pipe_raw, per cpu ftrace buffer, and calls a user callback for each of them. The API is instance aware.
--- include/trace-cmd/trace-cmd.h | 8 +++ lib/trace-cmd/trace-util.c | 114 ++++++++++++++++++++++++++++++++++ 2 files changed, 122 insertions(+)
include/trace-cmd/trace-cmd.h +8 -0
@@ -380,6 +380,14 @@ char *tracecmd_read_instance_file(struct tracecmd_instance *instance,void tracecmd_set_clock (struct tracecmd_instance *instance,char **old_clock); +int tracecmd_iterate_raw_events (struct tep_handle *tep, +struct tracecmd_instance *instance, +int (*callback)(struct tep_event *, +struct tep_record *, +int ,void *context), +void *callback_context); + +/* --- Plugin handling --- */ extern struct tep_plugin_option trace_ftrace_options[];
lib/trace-cmd/trace-util.c +114 -0
117 lines not on this page · raw message
Signature · 1 line
2.23.0
PATCH v14 7/19 trace-cmd: Find and store pids of tasks, which run virtual CPUs of given VM
In reply to Tzvetomir Stoyanov (VMware)From: Tzvetomir Stoyanov <[email protected]>
In order to match host and guest events, a mapping between guest VCPU and the host task, running this VCPU is needed. Extended existing struct guest to hold such mapping and added logic in read_qemu_guests() function to initialize it. Implemented a new internal API, get_guest_vcpu_pid(), to retrieve VCPU-task mapping for given VM.
--- tracecmd/include/trace-local.h | 2 ++ tracecmd/trace-record.c | 57 ++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+)
tracecmd/include/trace-local.h +2 -0
@@ -243,6 +243,8 @@ void update_first_instance(struct buffer_instance *instance, int topt);void show_instance_file (struct buffer_instance *instance,const char *name); +int get_guest_vcpu_pid (unsigned int guest_cid,unsigned int guest_vcpu); +/* moved from trace-cmd.h */ void tracecmd_create_top_instance (char *name);void tracecmd_remove_instances (void );
tracecmd/trace-record.c +57 -0
85 lines not on this page · raw message
Signature · 1 line
2.23.0
PATCH v14 8/19 trace-cmd: --del the tracee address map into the guest's trace.dat file
In reply to Tzvetomir Stoyanov (VMware)The trace-cmd option "--proc-map" saves the address map of the traced applications in the trace.dat file. It does not work if that option is specified as guest command line parameter.
--- tracecmd/trace-record.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
tracecmd/trace-record.c +4 -4
@@ -3802,6 +3802,7 @@ enum {static void add_options (struct tracecmd_output *handle,struct common_record_context *ctx) { +struct buffer_instance *instance;int type =0 ;if (ctx->date2ts) {
@@ -3818,6 +3819,9 @@ static void add_options(struct tracecmd_output *handle, struct common_record_conadd_option_hooks (handle);add_uname (handle);add_version (handle); +for_all_instances (instance) { +add_pid_maps (handle, instance); + } }static void write_guest_file (struct buffer_instance *instance)
@@ -3953,10 +3957,6 @@ static void record_data(struct common_record_context *ctx)if (!no_top_instance () && !top_instance.msg_handle)print_stat (&top_instance); -for_all_instances (instance) { -add_pid_maps (handle, instance); - } -tracecmd_append_cpu_data (handle, local_cpu_count, temp_files);for (i =0 ; i < max_cpu_count; i++)
Signature · 1 line
2.23.0
PATCH v14 9/19 trace-cmd: Implement new API tracecmd_add_option_v()
In reply to Tzvetomir Stoyanov (VMware)From: Tzvetomir Stoyanov <[email protected]>
A new tracecmd API tracecmd_add_option_v() is introduced. It adds new option in trace.dat, similar to tracecmd_add_option(), but the option's data is passed as list of buffers. The standard struct iovec is used as input parameter, containing the option's data buffers.
--- include/trace-cmd/trace-cmd.h | 5 ++ include/traceevent/event-parse.h | 1 + lib/trace-cmd/trace-output.c | 116 +++++++++++++++++++++++++++---- 3 files changed, 108 insertions(+), 14 deletions(-)
include/trace-cmd/trace-cmd.h +5 -0
@@ -261,11 +261,16 @@ struct tracecmd_output *tracecmd_create_init_file_override(const char *output_fistruct tracecmd_option *tracecmd_add_option (struct tracecmd_output *handle,unsigned short id,int size,const void *data); +struct tracecmd_option * +tracecmd_add_option_v (struct tracecmd_output *handle, +unsigned short id,const struct iovec *vector,int count); +struct tracecmd_option *tracecmd_add_buffer_option (struct tracecmd_output *handle,const char *name,int cpus);int tracecmd_write_cpus (struct tracecmd_output *handle,int cpus);int tracecmd_write_options (struct tracecmd_output *handle); +int tracecmd_append_options (struct tracecmd_output *handle);int tracecmd_update_option (struct tracecmd_output *handle,struct tracecmd_option *option,int size,const void *data);
include/traceevent/event-parse.h +1 -0
@@ -11,6 +11,7 @@#include <stdio.h> #include <regex.h> #include <string.h> +#include <sys/uio.h> #include "traceevent/trace-seq.h"
lib/trace-cmd/trace-output.c +102 -14
161 lines not on this page · raw message
Signature · 1 line
2.23.0
PATCH v14 10/19 trace-cmd: Add new API to generate a unique ID of the tracing session
In reply to Tzvetomir Stoyanov (VMware)A new libtracecmd API is implemented:
unsigned long long tracecmd_generate_traceid(void);
At trace-cmd init phase a unique ID, used for the current tracing session.
--- include/trace-cmd/trace-cmd.h | 1 + lib/trace-cmd/trace-util.c | 31 +++++++++++++++++++++++++++++++ tracecmd/include/trace-local.h | 1 + tracecmd/trace-record.c | 1 + 4 files changed, 34 insertions(+)
include/trace-cmd/trace-cmd.h +1 -0
@@ -441,6 +441,7 @@ void tracecmd_plog_error(const char *fmt, ...);int tracecmd_set_logfile (char *logfile);/* --- System --- */ +unsigned long long tracecmd_generate_traceid (void );int tracecmd_count_cpus (void );/* --- Hack! --- */
lib/trace-cmd/trace-util.c +31 -0
@@ -18,6 +18,8 @@#include <sys/mount.h> #include <sys/types.h> #include <sys/stat.h> +#include <sys/sysinfo.h> +#include <time.h> #include "trace-cmd.h" #include "event-utils.h"
@@ -1296,3 +1298,32 @@ error:tracecmd_put_tracing_file (path);return ret; } + +#define FNV_64_PRIME 0x100000001b3ULL +unsigned long long tracecmd_generate_traceid (void ) +{ +unsigned long long hash =0 ; +unsigned char *ustr; +struct sysinfo sinfo; +struct timespec ts; +char *str =NULL ; + +clock_gettime (CLOCK_MONOTONIC_RAW , &ts); +sysinfo (&sinfo); +asprintf (&str,"%ld %ld %ld %ld %ld %ld %ld %ld %d" , + ts.tv_sec, ts.tv_nsec, + sinfo.loads[0 ], sinfo.loads[1 ], sinfo.loads[2 ], + sinfo.freeram, sinfo.sharedram, sinfo.freeswap, + sinfo.procs); +if (!str) +return 0 ; + ustr = (unsigned char *)str; + hash =0 ; +while (*ustr) { + hash ^= (unsigned long long )*ustr++; + hash *=FNV_64_PRIME ; + } + +free (str); +return hash; +}
tracecmd/include/trace-local.h +1 -0
@@ -182,6 +182,7 @@ struct pid_addr_maps {struct buffer_instance {struct buffer_instance *next;struct tracecmd_instance *ftrace; +unsigned long long trace_id;char *cpumask;struct event_list *events;struct event_list **event_next;
tracecmd/trace-record.c +1 -0
@@ -5062,6 +5062,7 @@ void init_top_instance(void) top_instance.ftrace =tracecmd_create_instance (NULL ); top_instance.cpu_count =tracecmd_count_cpus (); top_instance.flags =BUFFER_FL_KEEP ; + top_instance.trace_id =tracecmd_generate_traceid ();tracecmd_init_instance (&top_instance); }
Signature · 1 line
2.23.0
PATCH v14 11/19 trace-cmd: Store the session tracing ID in the trace.dat file
In reply to Tzvetomir Stoyanov (VMware)The ID of the current tracing session is stored in the trace.dat file. A new file option is introduced:
TRACECMD_OPTION_TRACEID
The data is stored in the file as NULL terminated string:
"\nTraceID: %llu\n" A new libtracecmd API is introduced, to get the ID when the trace.dat file is read: unsigned long long tracecmd_get_traceid(struct tracecmd_input *handle);
--- include/trace-cmd/trace-cmd.h | 2 ++ lib/trace-cmd/trace-input.c | 25 +++++++++++++++++++++++++ tracecmd/trace-record.c | 16 ++++++++++++++++ 3 files changed, 43 insertions(+)
include/trace-cmd/trace-cmd.h +2 -0
@@ -86,6 +86,7 @@ enum {TRACECMD_OPTION_CPUCOUNT ,TRACECMD_OPTION_VERSION ,TRACECMD_OPTION_PROCMAPS , + TRACECMD_OPTION_TRACEID, }; enum {
@@ -128,6 +129,7 @@ int tracecmd_copy_headers(struct tracecmd_input *handle, int fd);void tracecmd_set_flag (struct tracecmd_input *handle,int flag);void tracecmd_clear_flag (struct tracecmd_input *handle,int flag);unsigned long tracecmd_get_flags (struct tracecmd_input *handle); +unsigned long long tracecmd_get_traceid (struct tracecmd_input *handle);void tracecmd_parse_trace_clock (struct tracecmd_input *handle,char *file,int size);
lib/trace-cmd/trace-input.c +25 -0
@@ -79,6 +79,7 @@ struct tracecmd_input {struct tep_plugin_list *plugin_list;struct tracecmd_input *parent;unsigned long flags; +unsigned long long trace_id;int fd;int long_size;int page_size;
@@ -2169,6 +2170,15 @@ static void procmap_free(struct pid_addr_maps *maps)free (maps); } +static int trace_traceid_load (struct tracecmd_input *handle,char *buf) +{ + +if (sscanf (buf,"%*s %llu" , &handle->trace_id) ==1 ) +return 0 ; + +return -1 ; +} +#define STR_PROCMAP_LINE_MAX (PATH_MAX+22)static int trace_pid_map_load (struct tracecmd_input *handle,char *buf) {
@@ -2406,6 +2416,10 @@ static int handle_options(struct tracecmd_input *handle)if (buf[size-1 ] =='\0' )trace_pid_map_load (handle, buf);break ; +case TRACECMD_OPTION_TRACEID : +if (buf[size-1 ] =='\0' ) +trace_traceid_load (handle, buf); +break ;default :warning ("unknown option %d" , option);break ;
@@ -3507,3 +3521,14 @@ void tracecmd_set_show_data_func(struct tracecmd_input *handle, { handle->show_data_func = func; } + +/** +* tracecmd_get_traceid - get the trace id of the session +* @handle: input handle for the trace.dat file +* +* Returns the trace id, written in the trace file +*/ +unsigned long long tracecmd_get_traceid (struct tracecmd_input *handle) +{ +return handle->trace_id; +}
tracecmd/trace-record.c +16 -0
@@ -3715,6 +3715,19 @@ add_pid_maps(struct tracecmd_output *handle, struct buffer_instance *instance)trace_seq_destroy (&s); } +static void +add_trace_id (struct tracecmd_output *handle,struct buffer_instance *instance) +{ +char *str =NULL ; +int len; + + len =asprintf (&str,"\nTraceID: %llu\n" , instance->trace_id); +if (len <1 ) +return ; +tracecmd_add_option (handle,TRACECMD_OPTION_TRACEID , len +1 , str); +free (str); +} +static void add_buffer_stat (struct tracecmd_output *handle,struct buffer_instance *instance) {
@@ -3819,6 +3832,9 @@ static void add_options(struct tracecmd_output *handle, struct common_record_conadd_option_hooks (handle);add_uname (handle);add_version (handle); +if (!no_top_instance ()) +add_trace_id (handle, &top_instance); +for_all_instances (instance) {add_pid_maps (handle, instance); }
Signature · 1 line
2.23.0
PATCH v14 12/19 trace-cmd: Exchange tracing IDs between host and guest
In reply to Tzvetomir Stoyanov (VMware)Extend the trace request and trace reply messages, to include also the IDs of host and guest tracing sessions. Those IDs are used to unambiguously match the tracing sessions, when reading trace.dat files.
--- include/trace-cmd/trace-cmd.h | 12 ++++++++---- lib/trace-cmd/trace-msg.c | 31 +++++++++++++++++++++++-------- tracecmd/include/trace-local.h | 5 +++-- tracecmd/trace-agent.c | 12 +++++++----- tracecmd/trace-record.c | 12 +++++++++--- 5 files changed, 50 insertions(+), 22 deletions(-)
include/trace-cmd/trace-cmd.h +8 -4
@@ -353,16 +353,20 @@ bool tracecmd_msg_done(struct tracecmd_msg_handle *msg_handle);void tracecmd_msg_set_done (struct tracecmd_msg_handle *msg_handle);int tracecmd_msg_send_trace_req (struct tracecmd_msg_handle *msg_handle, -int argc,char **argv,bool use_fifos); +int argc,char **argv,bool use_fifos, +unsigned long long trace_id);int tracecmd_msg_recv_trace_req (struct tracecmd_msg_handle *msg_handle, -int *argc,char ***argv,bool *use_fifos); +int *argc,char ***argv,bool *use_fifos, +unsigned long long *trace_id);int tracecmd_msg_send_trace_resp (struct tracecmd_msg_handle *msg_handle,int nr_cpus,int page_size, -unsigned int *ports,bool use_fifos); +unsigned int *ports,bool use_fifos, +unsigned long long trace_id);int tracecmd_msg_recv_trace_resp (struct tracecmd_msg_handle *msg_handle,int *nr_cpus,int *page_size, -unsigned int **ports,bool *use_fifos); +unsigned int **ports,bool *use_fifos, +unsigned long long *trace_id);/* --- ftrace instances --- */ struct tracecmd_instance {
lib/trace-cmd/trace-msg.c +23 -8
@@ -63,12 +63,14 @@ struct tracecmd_msg_rinit {struct tracecmd_msg_trace_req {be32 flags;be32 argc; +u64 trace_id; } __attribute__((packed));struct tracecmd_msg_trace_resp {be32 flags;be32 cpus;be32 page_size; +u64 trace_id; } __attribute__((packed));struct tracecmd_msg_header {
@@ -811,7 +813,8 @@ int tracecmd_msg_wait_close_resp(struct tracecmd_msg_handle *msg_handle)return tracecmd_msg_wait_for_cmd (msg_handle,MSG_CLOSE_RESP ); } -static int make_trace_req (struct tracecmd_msg *msg,int argc,char **argv,bool use_fifos) +static int make_trace_req (struct tracecmd_msg *msg,int argc,char **argv, +bool use_fifos,unsigned long long trace_id) {size_t args_size =0 ;char *p;
@@ -823,6 +826,7 @@ static int make_trace_req(struct tracecmd_msg *msg, int argc, char **argv, bool msg->hdr.size =htonl (ntohl (msg->hdr.size) + args_size); msg->trace_req.flags = use_fifos ?htonl (MSG_TRACE_USE_FIFOS ) :htonl (0 ); msg->trace_req.argc =htonl (argc); + msg->trace_req.trace_id =htonll (trace_id); msg->buf =calloc (args_size,1 );if (!msg->buf)return -ENOMEM ;
@@ -835,13 +839,15 @@ static int make_trace_req(struct tracecmd_msg *msg, int argc, char **argv, bool }int tracecmd_msg_send_trace_req (struct tracecmd_msg_handle *msg_handle, -int argc,char **argv,bool use_fifos) +int argc,char **argv,bool use_fifos, +unsigned long long trace_id) {struct tracecmd_msg msg;int ret;tracecmd_msg_init (MSG_TRACE_REQ , &msg); - ret =make_trace_req (&msg, argc, argv, use_fifos); + ret =make_trace_req (&msg, argc, argv, + use_fifos, trace_id);if (ret <0 )return ret;
@@ -854,7 +860,8 @@ int tracecmd_msg_send_trace_req(struct tracecmd_msg_handle *msg_handle,* free(argv); */ int tracecmd_msg_recv_trace_req (struct tracecmd_msg_handle *msg_handle, -int *argc,char ***argv,bool *use_fifos) +int *argc,char ***argv,bool *use_fifos, +unsigned long long *trace_id) {struct tracecmd_msg msg;char *p, *buf_end, **args;
@@ -901,6 +908,7 @@ int tracecmd_msg_recv_trace_req(struct tracecmd_msg_handle *msg_handle, *argc = nr_args; *argv = args; *use_fifos =ntohl (msg.trace_req.flags) &MSG_TRACE_USE_FIFOS ; + *trace_id =ntohll (msg.trace_req.trace_id);/* * On success we're passing msg.buf to the caller through argv[0] so we
@@ -921,7 +929,8 @@ out: }static int make_trace_resp (struct tracecmd_msg *msg,int page_size,int nr_cpus, -unsigned int *ports,bool use_fifos) +unsigned int *ports,bool use_fifos, +unsigned long long trace_id) {int data_size;
@@ -935,19 +944,22 @@ static int make_trace_resp(struct tracecmd_msg *msg, int page_size, int nr_cpus, msg->trace_resp.flags = use_fifos ?htonl (MSG_TRACE_USE_FIFOS ) :htonl (0 ); msg->trace_resp.cpus =htonl (nr_cpus); msg->trace_resp.page_size =htonl (page_size); + msg->trace_resp.trace_id =htonll (trace_id);return 0 ; }int tracecmd_msg_send_trace_resp (struct tracecmd_msg_handle *msg_handle,int nr_cpus,int page_size, -unsigned int *ports,bool use_fifos) +unsigned int *ports,bool use_fifos, +unsigned long long trace_id) {struct tracecmd_msg msg;int ret;tracecmd_msg_init (MSG_TRACE_RESP , &msg); - ret =make_trace_resp (&msg, page_size, nr_cpus, ports, use_fifos); + ret =make_trace_resp (&msg, page_size, nr_cpus, ports, + use_fifos, trace_id);if (ret <0 )return ret;
@@ -956,13 +968,15 @@ int tracecmd_msg_send_trace_resp(struct tracecmd_msg_handle *msg_handle,int tracecmd_msg_recv_trace_resp (struct tracecmd_msg_handle *msg_handle,int *nr_cpus,int *page_size, -unsigned int **ports,bool *use_fifos) +unsigned int **ports,bool *use_fifos, +unsigned long long *trace_id) {struct tracecmd_msg msg;char *p, *buf_end;ssize_t buf_len;int i, ret; +memset (&msg,0 ,sizeof (msg)); ret =tracecmd_msg_recv (msg_handle->fd, &msg);if (ret <0 )return ret;
@@ -981,6 +995,7 @@ int tracecmd_msg_recv_trace_resp(struct tracecmd_msg_handle *msg_handle, *use_fifos =ntohl (msg.trace_resp.flags) &MSG_TRACE_USE_FIFOS ; *nr_cpus =ntohl (msg.trace_resp.cpus); *page_size =ntohl (msg.trace_resp.page_size); + *trace_id =ntohll (msg.trace_resp.trace_id); *ports =calloc (*nr_cpus,sizeof (**ports));if (!*ports) { ret = -ENOMEM ;
tracecmd/include/trace-local.h +3 -2
@@ -98,8 +98,9 @@ void trace_usage(int argc, char **argv);int trace_record_agent (struct tracecmd_msg_handle *msg_handle,int cpus,int *fds, -int argc,char **argv,bool use_fifos); - +int argc,char **argv, +bool use_fifos, +unsigned long long trace_id);struct hook_list ; void trace_init_profile(struct tracecmd_input *handle, struct hook_list *hooks,
tracecmd/trace-agent.c +7 -5
@@ -128,6 +128,7 @@ cleanup:static void agent_handle (int sd,int nr_cpus,int page_size) {struct tracecmd_msg_handle *msg_handle; +unsigned long long trace_id;unsigned int *ports;char **argv =NULL ;int argc =0 ;
@@ -144,7 +145,8 @@ static void agent_handle(int sd, int nr_cpus, int page_size)if (!msg_handle)die ("Failed to allocate message handle" ); - ret =tracecmd_msg_recv_trace_req (msg_handle, &argc, &argv, &use_fifos); + ret =tracecmd_msg_recv_trace_req (msg_handle, &argc, &argv, + &use_fifos, &trace_id);if (ret <0 )die ("Failed to receive trace request" );
@@ -153,13 +155,13 @@ static void agent_handle(int sd, int nr_cpus, int page_size)if (!use_fifos)make_vsocks (nr_cpus, fds, ports); - + trace_id =tracecmd_generate_traceid (); ret =tracecmd_msg_send_trace_resp (msg_handle, nr_cpus, page_size, - ports, use_fifos); + ports, use_fifos, trace_id);if (ret <0 )die ("Failed to send trace response" ); - -trace_record_agent (msg_handle, nr_cpus, fds, argc, argv, use_fifos); +trace_record_agent (msg_handle, nr_cpus, fds, argc, argv, + use_fifos, trace_id);free (argv[0 ]);free (argv);
tracecmd/trace-record.c +9 -3
@@ -3507,12 +3507,16 @@ static void connect_to_agent(struct buffer_instance *instance)die ("Failed to allocate message handle" ); ret =tracecmd_msg_send_trace_req (msg_handle, instance->argc, - instance->argv, use_fifos); + instance->argv, use_fifos, + top_instance.trace_id); +if (ret <0 )die ("Failed to send trace request" ); ret =tracecmd_msg_recv_trace_resp (msg_handle, &nr_cpus, &page_size, - &ports, &use_fifos); + &ports, &use_fifos, + &instance->trace_id); +if (ret <0 )die ("Failed to receive trace response" );
@@ -6118,7 +6122,8 @@ void trace_record(int argc, char **argv)int trace_record_agent (struct tracecmd_msg_handle *msg_handle,int cpus,int *fds,int argc,char **argv, -bool use_fifos) +bool use_fifos, +unsigned long long trace_id) {struct common_record_context ctx;char **argv_plus;
@@ -6148,6 +6153,7 @@ int trace_record_agent(struct tracecmd_msg_handle *msg_handle, ctx.instance->flags |=BUFFER_FL_AGENT ; ctx.instance->msg_handle = msg_handle; msg_handle->version =V3_PROTOCOL ; + top_instance.trace_id = trace_id;record_trace (argc, argv, &ctx);free (argv_plus);
Signature · 1 line
2.23.0
PATCH v14 13/19 trace-cmd: Implement new option in trace.dat file: TRACECMD_OPTION_TIME_SHIFT
In reply to Tzvetomir Stoyanov (VMware)From: Tzvetomir Stoyanov <[email protected]>
The TRACECMD_OPTION_TIME_SHIFT is used when synchronizing trace time stamps between two trace.dat files. It contains multiple long long (time, offset) pairs, describing time stamps _offset_, measured in the given local _time_. The content of the option buffer is:
8 bytes - long long integer, ID of the tracing session
4 bytes - integer, count of timestamp offsets
long long array of size _count_, local time in which the offset is measured long long array of size _count_, offset of the time stamps
--- include/trace-cmd/trace-cmd.h | 6 ++ lib/trace-cmd/trace-input.c | 170 +++++++++++++++++++++++++++++++++- 2 files changed, 174 insertions(+), 2 deletions(-)
include/trace-cmd/trace-cmd.h +6 -0
@@ -87,6 +87,7 @@ enum {TRACECMD_OPTION_VERSION ,TRACECMD_OPTION_PROCMAPS ,TRACECMD_OPTION_TRACEID , + TRACECMD_OPTION_TIME_SHIFT, }; enum {
@@ -130,6 +131,11 @@ void tracecmd_set_flag(struct tracecmd_input *handle, int flag);void tracecmd_clear_flag (struct tracecmd_input *handle,int flag);unsigned long tracecmd_get_flags (struct tracecmd_input *handle);unsigned long long tracecmd_get_traceid (struct tracecmd_input *handle); +int tracecmd_get_guest_cpumap (struct tracecmd_input *handle, +unsigned long long trace_id, +char *name, +int *vcpu_count,int *cpu_pid); +unsigned long long tracecmd_get_tsync_peer (struct tracecmd_input *handle);void tracecmd_parse_trace_clock (struct tracecmd_input *handle,char *file,int size);
lib/trace-cmd/trace-input.c +168 -2
227 lines not on this page · raw message
Signature · 1 line
2.23.0
PATCH v14 14/19 trace-cmd: Add guest information in host's trace.dat file
In reply to Tzvetomir Stoyanov (VMware)New trace.dat option is introduced: TRACECMD_OPTION_GUEST. Written in the host's trace.dat file, it contains information about guests, traced at the same time: guest trace ID, number of VCPUs and PIDs of the host tasks, running those VCPU. The data is stored in the file as NULL terminated string:
"Guest %s %llu %d\n" -> guest name, number of VCPUs "%d %d\n" -> VCPU, PID of host task ..... "%d %d\n" -> VCPU, PID of host task
--- include/trace-cmd/trace-cmd.h | 1 + lib/trace-cmd/trace-input.c | 113 ++++++++++++++++++++++++++++++++++ tracecmd/trace-record.c | 45 ++++++++++++++ 3 files changed, 159 insertions(+)
include/trace-cmd/trace-cmd.h +1 -0
@@ -88,6 +88,7 @@ enum {TRACECMD_OPTION_PROCMAPS ,TRACECMD_OPTION_TRACEID ,TRACECMD_OPTION_TIME_SHIFT , + TRACECMD_OPTION_GUEST, }; enum {
lib/trace-cmd/trace-input.c +113 -0
149 lines not on this page · raw message
tracecmd/trace-record.c +45 -0
63 lines not on this page · raw message
Signature · 1 line
2.23.0
PATCH v14 15/19 trace-cmd: Add host trace clock as guest trace argument
In reply to Tzvetomir Stoyanov (VMware)When tracing host and guest machines, both should use the same tracing clock for event timestamps. If a clock is specified as host tracing argument, with option "-C clock_name", the same is injected as guest tracing argument. If the user wants to use different tracing clocks, it can specify it using "-C clock_name" as guest tracing argument. In that case, the one specified by the user has higher priority.
--- tracecmd/trace-record.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-)
tracecmd/trace-record.c +17 -2
@@ -5406,6 +5406,8 @@ static void parse_record_options(int argc,char *sav;int name_counter =0 ;int neg_event =0 ; +struct buffer_instance *instance; +bool guest_config = false;init_common_record_context (ctx, curr_cmd);
@@ -5563,6 +5565,7 @@ static void parse_record_options(int argc,break ;case 'C' : ctx->instance->ftrace->clock = optarg; + guest_config = true;break ;case 'v' : neg_event =1 ;
@@ -5780,14 +5783,26 @@ static void parse_record_options(int argc,/* If --date is specified, prepend it to all guest VM flags */ if (ctx->date) { -struct buffer_instance *instance; -for_all_instances (instance) {if (is_guest (instance))add_argv (instance,"--date" , true); } } +if (guest_config) { +/* If -C is specified, prepend clock to all guest VM flags */ +for_all_instances (instance) { +if (top_instance.ftrace->clock) { +if (is_guest (instance)) { +add_argv (instance, + (char *)top_instance.ftrace->clock, + true); +add_argv (instance,"-C" , true); + } + } + } + } +if (!ctx->filtered && ctx->instance->filter_mod)add_func (&ctx->instance->filter_funcs, ctx->instance->filter_mod,"*" );
Signature · 1 line
2.23.0
PATCH v14 16/19 trace-cmd: Refactor few trace-cmd internal functions.
In reply to Tzvetomir Stoyanov (VMware)In order to reuse code inside trace-cmd application context, few functions are made non static:
int make_vsock(unsigned int port); int get_vsock_port(int sd, unsigned int *port); int open_vsock(unsigned int cid, unsigned int port); char *get_guest_file(const char *file, const char *guest);
--- tracecmd/include/trace-local.h | 8 ++++++++ tracecmd/trace-agent.c | 4 ++-- tracecmd/trace-record.c | 8 ++++---- 3 files changed, 14 insertions(+), 6 deletions(-)
tracecmd/include/trace-local.h +8 -0
@@ -19,6 +19,8 @@#define GUEST_FIFO_FMT GUEST_DIR_FMT "/" GUEST_PIPE_NAME "%d"#define VIRTIO_FIFO_FMT "/dev/virtio-ports/" GUEST_PIPE_NAME "%d" +#define TRACE_FILENAME "trace.dat" +/* fix stupid glib guint64 typecasts and printf formats */ typedef unsigned long long u64 ;
@@ -258,6 +260,12 @@ void tracecmd_disable_tracing(void);void tracecmd_enable_tracing (void );void tracecmd_stat_cpu (struct trace_seq *s,int cpu); +int make_vsock (unsigned int port); +int get_vsock_port (int sd,unsigned int *port); +int open_vsock (unsigned int cid,unsigned int port); + +char *get_guest_file (const char *file,const char *guest); +/* No longer in event-utils.h */ void __noreturn die (const char *fmt, ...);/* Can be overriden */ void *malloc_or_die (unsigned int size);/* Can be overridden */
tracecmd/trace-agent.c +2 -2
@@ -40,7 +40,7 @@ static int get_local_cid(unsigned int *cid)return ret; } -static int make_vsock (unsigned int port) +int make_vsock (unsigned int port) {struct sockaddr_vm addr = { .svm_family =AF_VSOCK ,
@@ -64,7 +64,7 @@ static int make_vsock(unsigned int port)return sd; } -static int get_vsock_port (int sd,unsigned int *port) +int get_vsock_port (int sd,unsigned int *port) {struct sockaddr_vm addr;socklen_t addr_len =sizeof (addr);
tracecmd/trace-record.c +4 -4
@@ -68,7 +68,7 @@ static int rt_prio;static int keep; -static const char *output_file ="trace.dat" ; +static const char *output_file =TRACE_FILENAME ;static int latency;static int sleep_time =1000 ;
@@ -536,7 +536,7 @@ static char *get_temp_file(struct buffer_instance *instance, int cpu)return file; } -static char *get_guest_file (const char *file,const char *guest) +char *get_guest_file (const char *file,const char *guest) {const char *p;char *out =NULL ;
@@ -2772,7 +2772,7 @@ static int connect_port(const char *host, unsigned int port) } #ifdef VSOCK -static int open_vsock(unsigned int cid, unsigned int port) +int open_vsock(unsigned int cid, unsigned int port) { struct sockaddr_vm addr = { .svm_family = AF_VSOCK,
@@ -2835,7 +2835,7 @@ static bool can_splice_read_vsock(void) }#else -static inline int open_vsock (unsigned int cid,unsigned int port) +int open_vsock (unsigned int cid,unsigned int port) {die ("vsock is not supported" );return -1 ;
Signature · 1 line
2.23.0
PATCH v14 17/19 trace-cmd: Basic infrastructure for host - guest timestamp synchronization
In reply to Tzvetomir Stoyanov (VMware)The infrastructure for host - guest timestamp synchronization is divided in two parts:
- logic in libtracecmd
- logic in trace-cmd application
The libtracecmd is extended with new trace message, MSG_TIME_SYNC, used to exchange time synch information between host and guest. The trace request and response messages are extended to handle the time synch negotiation. The logic is implemented in trace-timesync.c file:
- Register / unregister time sync protocols.
- Choosing what protocol will be used for a tracing session.
- Init common context, used by all protocols - a ftrace instance, vsockets.
- Invoke protocol routines to perform time synchronization.
- Store calculated offsets in an array.
The trace-cmd application is extended to perform timestamp synchronization.
The main logic is in trace-tsync.c file
- Negotiate what time synch algorithm will be used for the tracing session.
- Run pthreads, to do continuous timestamp synchronization, during the trace.
- Store calculated offsets in guest's trace.dat file, using TRACECMD_OPTION_TIME_SHIFT option
- A new trace-cmd option is added, to control the timestamp synchronization:
--tsync-interval: set the time sync loop interval, in ms. The default
value is 0 - timestamp synchronization is performed twice, before and after the trace. If a negative number is specified, the timestamp synchronization is disabled.
--- Documentation/trace-cmd-record.1.txt | 6 + include/trace-cmd/trace-cmd.h | 54 ++- lib/trace-cmd/Makefile | 1 + lib/trace-cmd/include/trace-tsync-local.h | 36 ++ lib/trace-cmd/trace-msg.c | 149 ++++++- lib/trace-cmd/trace-timesync.c | 461 ++++++++++++++++++++++ tracecmd/Makefile | 3 +- tracecmd/include/trace-local.h | 11 + tracecmd/trace-agent.c | 34 +- tracecmd/trace-record.c | 37 +- tracecmd/trace-tsync.c | 265 +++++++++++++ tracecmd/trace-usage.c | 4 + 12 files changed, 1034 insertions(+), 27 deletions(-) create mode 100644 lib/trace-cmd/include/trace-tsync-local.h create mode 100644 lib/trace-cmd/trace-timesync.c create mode 100644 tracecmd/trace-tsync.c
Documentation/trace-cmd-record.1.txt +6 -0
@@ -338,6 +338,12 @@ OPTIONS the offset will also be in nanoseconds even if the displayed units are in microseconds. +*--tsync-interval*:: + Set the loop interval, in ms, for timestamps synchronization with guests: + If a negative number is specified, timestamps synchronization is disabled + If 0 is specified, no loop is performed - timestamps offset is calculated only twice," + at the beginnig and at the end of the trace\n" + *--stderr*:: Have output go to stderr instead of stdout, but the output of the command executed will not be changed. This is useful if you want to monitor the
include/trace-cmd/trace-cmd.h +50 -4
81 lines not on this page · raw message
lib/trace-cmd/Makefile +1 -0
@@ -16,6 +16,7 @@ OBJS += trace-util.o OBJS += trace-instance.o OBJS += trace-filter-hash.o OBJS += trace-msg.o +OBJS += trace-timesync.o # Additional util objects OBJS += trace-blk-hack.o
lib/trace-cmd/include/trace-tsync-local.h new file +36 -0
@@ -0,0 +1,36 @@ +/* SPDX-License-Identifier: LGPL-2.1 */ +/* +* Copyright (C) 2019, VMware, Tzvetomir Stoyanov <[email protected]> +* +*/ +#ifndef _TRACE_TSYNC_LOCAL_H +#define _TRACE_TSYNC_LOCAL_H + +#include <stdbool.h> + +struct clock_sync_context { +void *proto_data; +bool server; +struct tracecmd_instance *vinst; + +int sync_size; +int sync_count; +long long *sync_ts; +long long *sync_offsets; + +unsigned int local_cid; +unsigned int local_port; +unsigned int remote_cid; +unsigned int remote_port; +}; + +int tracecmd_tsync_proto_register (unsigned int proto_id,int weight, +int (*init)(struct tracecmd_time_sync *), +int (*free)(struct tracecmd_time_sync *), +int (*calc)(struct tracecmd_time_sync *, +long long *,long long *)); +int tracecmd_tsync_proto_unregister (unsigned int proto_id); + +int ptp_clock_sync_register (void ); + +#endif /* _TRACE_TSYNC_LOCAL_H */
lib/trace-cmd/trace-msg.c +133 -16
263 lines not on this page · raw message
lib/trace-cmd/trace-timesync.c new file +461 -0
461 lines not on this page · raw message
tracecmd/Makefile +2 -1
@@ -30,6 +30,7 @@ TRACE_CMD_OBJS += trace-check-events.o TRACE_CMD_OBJS += trace-show.o TRACE_CMD_OBJS += trace-list.o TRACE_CMD_OBJS += trace-usage.o +TRACE_CMD_OBJS += trace-tsync.o ifeq ($(VSOCK_DEFINED), 1) TRACE_CMD_OBJS += trace-agent.o
@@ -42,7 +43,7 @@ all_objs := $(sort $(ALL_OBJS)) all_deps := $(all_objs:$(bdir)/%.o=$(bdir)/.%.d) CONFIG_INCLUDES = -CONFIG_LIBS = -lrt +CONFIG_LIBS = -lrt -lpthread CONFIG_FLAGS = all: $(TARGETS)
tracecmd/include/trace-local.h +11 -0
@@ -226,6 +226,10 @@ struct buffer_instance {unsigned int port;int *fds;bool use_fifos; + +pthread_t tsync_thread; +bool tsync_thread_running; +struct tracecmd_time_sync tsync; };void init_top_instance (void );
@@ -260,6 +264,13 @@ void tracecmd_disable_tracing(void);void tracecmd_enable_tracing (void );void tracecmd_stat_cpu (struct trace_seq *s,int cpu); +int tracecmd_host_tsync (struct buffer_instance *instance, +unsigned int tsync_port); +void tracecmd_host_tsync_complete (struct buffer_instance *instance); +unsigned int tracecmd_guest_tsync (unsigned int tsync_protos,char *clock, +unsigned int *tsync_port, +pthread_t *thr_id); +int make_vsock (unsigned int port);int get_vsock_port (int sd,unsigned int *port);int open_vsock (unsigned int cid,unsigned int port);
tracecmd/trace-agent.c +32 -2
@@ -19,6 +19,7 @@#include <sys/wait.h> #include <unistd.h> #include <linux/vm_sockets.h> +#include <pthread.h> #include "trace-local.h" #include "trace-msg.h"
@@ -125,11 +126,28 @@ cleanup:return ret; } +static char *get_clock (int argc,char **argv) +{ +int i; + +if (!argc || !argv) +return NULL ; + +for (i =0 ; i < argc -1 ; i++) { +if (!strcmp ("-C" , argv[i])) +return argv[i+1 ]; + } +return NULL ; +} +static void agent_handle (int sd,int nr_cpus,int page_size) {struct tracecmd_msg_handle *msg_handle;unsigned long long trace_id; +unsigned int tsync_protos =0 ; +unsigned int tsync_port =0 ;unsigned int *ports; +pthread_t sync_thr;char **argv =NULL ;int argc =0 ;bool use_fifos;
@@ -146,7 +164,8 @@ static void agent_handle(int sd, int nr_cpus, int page_size)die ("Failed to allocate message handle" ); ret =tracecmd_msg_recv_trace_req (msg_handle, &argc, &argv, - &use_fifos, &trace_id); + &use_fifos, &trace_id, + &tsync_protos);if (ret <0 )die ("Failed to receive trace request" );
@@ -155,14 +174,25 @@ static void agent_handle(int sd, int nr_cpus, int page_size)if (!use_fifos)make_vsocks (nr_cpus, fds, ports); +if (tsync_protos) { + tsync_protos =tracecmd_guest_tsync (tsync_protos, +get_clock (argc, argv), + &tsync_port, &sync_thr); +if (!tsync_protos) +warning ("Failed to negotiate timestamps synchronization with the host" ); + } trace_id =tracecmd_generate_traceid (); ret =tracecmd_msg_send_trace_resp (msg_handle, nr_cpus, page_size, - ports, use_fifos, trace_id); + ports, use_fifos, trace_id, + tsync_protos, tsync_port);if (ret <0 )die ("Failed to send trace response" );trace_record_agent (msg_handle, nr_cpus, fds, argc, argv, use_fifos, trace_id); +if (tsync_protos) +pthread_join (sync_thr,NULL ); +free (argv[0 ]);free (argv);free (ports);
tracecmd/trace-record.c +33 -4
@@ -670,6 +670,11 @@ static void tell_guests_to_stop(void)tracecmd_msg_send_close_msg (instance->msg_handle); } +for_all_instances (instance) { +if (is_guest (instance)) +tracecmd_host_tsync_complete (instance); + } +/* Wait for guests to acknowledge */ for_all_instances (instance) {if (is_guest (instance)) {
@@ -3501,6 +3506,8 @@ static void connect_to_agent(struct buffer_instance *instance) {struct tracecmd_msg_handle *msg_handle;int sd, ret, nr_fifos, nr_cpus, page_size; +unsigned int tsync_protos_reply =0 ; +unsigned int tsync_port =0 ;unsigned int *ports;int i, *fds =NULL ;bool use_fifos = false;
@@ -3519,19 +3526,32 @@ static void connect_to_agent(struct buffer_instance *instance)if (!msg_handle)die ("Failed to allocate message handle" ); +if (instance->tsync.loop_interval >=0 ) + instance->tsync.sync_proto =tracecmd_tsync_proto_getall (); + ret =tracecmd_msg_send_trace_req (msg_handle, instance->argc, instance->argv, use_fifos, - top_instance.trace_id); + top_instance.trace_id, + instance->tsync.sync_proto);if (ret <0 )die ("Failed to send trace request" ); ret =tracecmd_msg_recv_trace_resp (msg_handle, &nr_cpus, &page_size, &ports, &use_fifos, - &instance->trace_id); + &instance->trace_id, + &tsync_protos_reply, &tsync_port);if (ret <0 ) -die ("Failed to receive trace response" ); +die ("Failed to receive trace response %d" , ret); + +if (instance->tsync.sync_proto) { +if (instance->tsync.sync_proto & tsync_protos_reply) { + instance->tsync.sync_proto = tsync_protos_reply; +tracecmd_host_tsync (instance, tsync_port); + }else +warning ("Failed to negotiate timestamps synchronization with the guest" ); + }if (use_fifos) {if (nr_cpus != nr_fifos) {
@@ -3578,7 +3598,9 @@ static void setup_guest(struct buffer_instance *instance)close (fd); } -static void setup_agent (struct buffer_instance *instance,struct common_record_context *ctx) +static void setup_agent (struct buffer_instance *instance, +struct common_record_context *ctx) + {struct tracecmd_output *network_handle;
@@ -5132,6 +5154,7 @@ void init_top_instance(void) }enum { + OPT_tsyncinterval =242 , OPT_user =243 , OPT_procmap =244 , OPT_quiet =245 ,
@@ -5434,6 +5457,7 @@ static void parse_record_options(int argc, {"proc-map", no_argument, NULL, OPT_procmap}, {"user", required_argument, NULL, OPT_user}, {"module", required_argument, NULL, OPT_module}, + {"tsync-interval", required_argument, NULL, OPT_tsyncinterval}, {NULL, 0, NULL, 0} };
@@ -5772,6 +5796,10 @@ static void parse_record_options(int argc, ctx->instance->filter_mod = optarg; ctx->filtered =0 ;break ; +case OPT_tsyncinterval: + top_instance.tsync.loop_interval =atoi (optarg); + guest_config = true; +break ;case OPT_quiet:case 'q' : quiet = true;
@@ -5800,6 +5828,7 @@ static void parse_record_options(int argc,add_argv (instance,"-C" , true); } } + instance->tsync.loop_interval = top_instance.tsync.loop_interval; } }
tracecmd/trace-tsync.c new file +265 -0
265 lines not on this page · raw message
tracecmd/trace-usage.c +4 -0
@@ -60,6 +60,10 @@ static struct usage_help usage_help[] = {" --no-filter include trace-cmd threads in the trace\n" " --proc-map save the traced processes address map into the trace.dat file\n" " --user execute the specified [command ...] as given user\n" +" --tsync-interval set the loop interval, in ms, for timestamps synchronization with guests:" +" If a negative number is specified, timestamps synchronization is disabled" +" If 0 is specified, no loop is performed - timestamps offset is calculated only twice," +" at the beginnig and at the end of the trace\n" }, { "start",
Signature · 1 line
2.23.0
PATCH v14 18/19 trace-cmd: [POC] PTP-like algorithm for host - guest timestamp synchronization
In reply to Tzvetomir Stoyanov (VMware)PTP protocol is designed for synchronizing clocks of machines in a local network. The same approach can be used for host - guest timestamp synchronization. This implementation uses ftrace raw markers to track trace timestamps of PTP events. The patch is a POC, two different algorithms for PTP calculations are proposed:
- Choosing the sample with the fastest response time for calculating the clocks offset.
- Calculating the clocks offset using the average of all PTP samples.
The implementation can be tuned using those parameters:
- #define FASTEST_RESPONSE - is defined, the sample with the fastest response time is used for calculating the clocks offset. Otherwise the average of all samples is used.
- #define PTP_SYNC_LOOP 340 - defines the number of samples, used for one calculation.
- --tsync-interval - a trace-cmd argument, choose the intervals between offset calculations, performed continuously during the trace.
- #define TSYNC_DEBUG - if defined, a debug information is collected and stored in files, in the guest machine:
s-cid*.txt - For each offset calculation: host and guest clocks and calculated offset. res-cid*.txt - For each tracing session: all calculated clock offsets.
--- include/trace-cmd/trace-cmd.h | 2 + lib/trace-cmd/Makefile | 1 + lib/trace-cmd/trace-timesync-ptp.c | 668 +++++++++++++++++++++++++++++ lib/trace-cmd/trace-timesync.c | 8 + tracecmd/trace-agent.c | 2 + tracecmd/trace-record.c | 25 +- 6 files changed, 698 insertions(+), 8 deletions(-) create mode 100644 lib/trace-cmd/trace-timesync-ptp.c
include/trace-cmd/trace-cmd.h +2 -0
@@ -427,6 +427,7 @@ int tracecmd_iterate_raw_events(struct tep_handle *tep,enum {TRACECMD_TIME_SYNC_PROTO_NONE =0 , +TRACECMD_TIME_SYNC_PROTO_PTP =1 <<0 , };enum {TRACECMD_TIME_SYNC_CMD_PROBE =1 ,
@@ -444,6 +445,7 @@ struct tracecmd_time_sync {void *context; }; +void tracecmd_tsync_init (void );unsigned int tracecmd_tsync_proto_getall (void );unsigned int tracecmd_tsync_proto_select (unsigned int protos);void tracecmd_tsync_with_host (struct tracecmd_time_sync *tsync);
lib/trace-cmd/Makefile +1 -0
@@ -17,6 +17,7 @@ OBJS += trace-instance.o OBJS += trace-filter-hash.o OBJS += trace-msg.o OBJS += trace-timesync.o +OBJS += trace-timesync-ptp.o # Additional util objects OBJS += trace-blk-hack.o
lib/trace-cmd/trace-timesync-ptp.c new file +668 -0
668 lines not on this page · raw message
lib/trace-cmd/trace-timesync.c +8 -0
@@ -42,6 +42,14 @@ static struct tsync_proto *tsync_proto_get(unsigned int proto_id)return NULL ; } +/** +* tracecmd_tsync_init - Initialize the global, per task, time sync data. +*/ +void tracecmd_tsync_init (void ) +{ +ptp_clock_sync_register (); +} + int tracecmd_tsync_proto_register(unsigned int proto_id, int weight, int (*init)(struct tracecmd_time_sync *), int (*free)(struct tracecmd_time_sync *),
tracecmd/trace-agent.c +2 -0
@@ -242,6 +242,8 @@ static void agent_serve(unsigned int port)if (sd <0 )die ("Failed to open vsocket" ); +tracecmd_tsync_init (); +if (!get_local_cid (&cid))printf ("listening on @%u:%u\n" , cid, port);
tracecmd/trace-record.c +17 -8
@@ -5945,10 +5945,7 @@ static void set_clock(struct buffer_instance *instance)tracecmd_put_tracing_file (path); } } -/* -* This function contains common code for the following commands: -* record, start, stream, profile. -*/ +static void record_trace (int argc,char **argv,struct common_record_context *ctx) {
@@ -6081,12 +6078,24 @@ static void record_trace(int argc, char **argv,finalize_record_trace (ctx); } +/* +* This function contains common code for the following commands: +* record, start, stream, profile. +*/ +static void record_trace_command (int argc,char **argv, +struct common_record_context *ctx) +{ +tracecmd_tsync_init (); +record_trace (argc, argv, ctx); +} + +void trace_start (int argc,char **argv) {struct common_record_context ctx;parse_record_options (argc, argv, CMD_start, &ctx); -record_trace (argc, argv, &ctx); +record_trace_command (argc, argv, &ctx);exit (0 ); }
@@ -6166,7 +6175,7 @@ void trace_stream(int argc, char **argv)struct common_record_context ctx;parse_record_options (argc, argv, CMD_stream, &ctx); -record_trace (argc, argv, &ctx); +record_trace_command (argc, argv, &ctx);exit (0 ); }
@@ -6185,7 +6194,7 @@ void trace_profile(int argc, char **argv)if (!buffer_instances) top_instance.flags |=BUFFER_FL_PROFILE ; -record_trace (argc, argv, &ctx); +record_trace_command (argc, argv, &ctx);do_trace_profile ();exit (0 ); }
@@ -6204,7 +6213,7 @@ void trace_record(int argc, char **argv)struct common_record_context ctx;parse_record_options (argc, argv, CMD_record, &ctx); -record_trace (argc, argv, &ctx); +record_trace_command (argc, argv, &ctx);exit (0 ); }
Signature · 1 line
2.23.0
PATCH v14 19/19 trace-cmd: Debug scripts for PTP-like algorithm for host - guest timestamp synchronization
In reply to Tzvetomir Stoyanov (VMware)These scripts can be used to visualise debug files, written when the PTP-like algorithm is compiled with TSYNC_DEBUG defined. The files are located in the guest machine:
s-cid*.txt - For each offset calculation: host and guest clocks and calculated offset. res-cid*.txt - For each tracing session: all calculated clock offsets.
tsync_hist.py plots a histogram, using data from a s-cid*.txt file:
"python tsync_hist.py s-cid2_1.txt"
tsync_res.py plots a line, using data from res-cid*.txt file:
"python tsync_res.py res-cid2.txt"
--- scripts/debug/tsync_hist.py | 57 +++++++++++++++++++++++++++++++++++++ scripts/debug/tsync_readme | 13 +++++++++ scripts/debug/tsync_res.py | 46 ++++++++++++++++++++++++++++++ 3 files changed, 116 insertions(+) create mode 100644 scripts/debug/tsync_hist.py create mode 100644 scripts/debug/tsync_readme create mode 100644 scripts/debug/tsync_res.py
scripts/debug/tsync_hist.py new file +57 -0
@@ -0,0 +1,57 @@ +# SPDX-License-Identifier: GPL-2.0 +# +# Copyright (C) 2019, VMware Inc, Tzvetomir Stoyanov <[email protected]> +# Copyright (C) 2019, VMware Inc, Yordan Karadzhov <[email protected]> + + +import matplotlib.pyplot as plt +import matplotlib.lines as mlines +import numpy as np +import sys + +def newline(p1, p2): + ax = plt.gca() + xmin, xmax = ax.get_xbound() + + if(p2[0] == p1[0]): + xmin = xmax = p1[0] + ymin, ymax = ax.get_ybound() + else: + ymax = p1[1]+(p2[1]-p1[1])/(p2[0]-p1[0])*(xmax-p1[0]) + ymin = p1[1]+(p2[1]-p1[1])/(p2[0]-p1[0])*(xmin-p1[0]) + + l = mlines.Line2D([xmin,xmax], [ymin,ymax], color='red') + ax.add_line(l) + return l + + +data = np.loadtxt(fname = sys.argv[1]) +selected_ts = data[-1, 1] +selected_ofs = data[-1, 0] +data = data[:-1,:] + +x = data[:, 1] - data[:, 0] + +mean = x.mean() +std = x.std() + +num_bins = 500 +min = x.min() #+ .4 * (x.max() - x.min()) +max = x.max() #- .4 * (x.max() - x.min()) +bins = np.linspace(min, max, num_bins, endpoint = False, dtype=int) + +fig, ax = plt.subplots() + +# the histogram of the data +n, bins, patches = ax.hist(x, bins, histtype=u'step'); + +ax.set_xlabel('clock offset [$\mu$s]') +ax.set_ylabel('entries') +ax.set_title("$\sigma$=%i" % std) + +x1, y1 = [selected_ofs, min], [selected_ofs, max] +newline(x1, y1) + +# Tweak spacing to prevent clipping of ylabel +fig.tight_layout() +plt.show()
scripts/debug/tsync_readme new file +13 -0
@@ -0,0 +1,13 @@ +PTP-like algorithm debug +======================== + +tsync_*.py scripts can be used to visualise debug files, written when the PTP-like algorithm +is compiled with TSYNC_DEBUG defined. The files are located in the guest machine: + s-cid*.txt - For each offset calculation: host and guest clocks and calculated offset. + res-cid*.txt - For each tracing session: all calculated clock offsets. + +tsync_hist.py plots a histogram, using data from a s-cid*.txt file: + "python tsync_hist.py s-cid2_1.txt" +tsync_res.py plots a line, using data from res-cid*.txt file: + "python tsync_res.py res-cid2.txt" +
scripts/debug/tsync_res.py new file +46 -0
46 lines not on this page · raw message
Signature · 1 line
2.23.0