Refactor ust_baddr_statedump functions to reduce duplicated code
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 2/2 Refactor ust_baddr_statedump functions to reduce duplicated code
This refactoring allows the reuse of code that handles the iteration over the sessions, used for all ust_baddr_statedump events.
--- liblttng-ust/lttng-ust-baddr.c | 133 ++++++++++++++++++++++------------------- 1 file changed, 71 insertions(+), 62 deletions(-)
liblttng-ust/lttng-ust-baddr.c +71 -62
@@ -44,24 +44,27 @@ struct extract_data {void *exec_baddr;/* executable base address */ }; +struct soinfo_data { +void *base_addr_ptr; +const char *resolved_path; +int vdso; +off_t size; +time_t mtime; +}; + +typedef void (*tracepoint_cb )(struct lttng_session *session, +void *extra_tp_args); +/* -* Trace baddr into all sessions for which statedump is pending owned by -* the caller thread. +* Trace statedump event into all sessions for which statedump is +* pending owned by the caller thread. */ static -int trace_baddr (void *base_addr_ptr, -const char *resolved_path, -int vdso, -void *owner) +int trace_statedump_event (tracepoint_cb tp_cb,void *owner,void *extra_tp_args) {struct cds_list_head *sessionsp;struct lttng_session *session; -struct stat sostat; -if (vdso ||stat (resolved_path, &sostat)) { - sostat.st_size =0 ; - sostat.st_mtime =-1 ; - }/* * UST lock nests within dynamic loader lock. */
@@ -79,61 +82,63 @@ int trace_baddr(void *base_addr_ptr,continue ;if (!session->statedump_pending)continue ; -tracepoint (ust_baddr_statedump, soinfo, - session, base_addr_ptr, - resolved_path, sostat.st_size, - sostat.st_mtime); +tp_cb (session, extra_tp_args); }ust_unlock ();return 0 ; }static -int trace_statedump_start (void *owner) +void trace_soinfo_cb (struct lttng_session *session,void *extra_tp_args) { -struct cds_list_head *sessionsp; -struct lttng_session *session; +struct soinfo_data *so_data = (struct soinfo_data *)extra_tp_args; -if (ust_lock ()) { -ust_unlock (); -return 1 ; - } +tracepoint (ust_baddr_statedump, soinfo, + session, so_data->base_addr_ptr, + so_data->resolved_path, so_data->size, + so_data->mtime); +} - sessionsp =_lttng_get_sessions (); -cds_list_for_each_entry (session, sessionsp, node) { -if (session->owner != owner) -continue ; -if (!session->statedump_pending) -continue ; -tracepoint (ust_baddr_statedump, start, - session); - } -ust_unlock (); -return 0 ; +static +void trace_start_cb (struct lttng_session *session,void *extra_tp_args) +{ +tracepoint (ust_baddr_statedump, start, + session); }static -int trace_statedump_end (void *owner) +void trace_end_cb (struct lttng_session *session,void *extra_tp_args) { -struct cds_list_head *sessionsp; -struct lttng_session *session; +tracepoint (ust_baddr_statedump, end, + session); +} -if (ust_lock ()) { -ust_unlock (); -return 1 ; - } +static +int trace_baddr (void *owner,struct soinfo_data *so_data) +{ +struct stat sostat; - sessionsp =_lttng_get_sessions (); -cds_list_for_each_entry (session, sessionsp, node) { -if (session->owner != owner) -continue ; -if (!session->statedump_pending) -continue ; -tracepoint (ust_baddr_statedump, end, - session); +if (so_data->vdso ||stat (so_data->resolved_path, &sostat)) { + sostat.st_size =0 ; + sostat.st_mtime =-1 ; } -ust_unlock (); -return 0 ; + + so_data->size = sostat.st_size; + so_data->mtime = sostat.st_mtime; + +return trace_statedump_event (trace_soinfo_cb, owner, so_data); +} + +static +int trace_statedump_start (void *owner) +{ +return trace_statedump_event (trace_start_cb, owner,NULL ); +} + +static +int trace_statedump_end (void *owner) +{ +return trace_statedump_event (trace_end_cb, owner,NULL ); } static
@@ -141,18 +146,18 @@ int extract_soinfo_events(struct dl_phdr_info *info, size_t size, void *_data) {int j;struct extract_data *data = _data; +struct soinfo_data so_data;void *owner = data->owner;for (j =0 ; j < info->dlpi_phnum; j++) {char resolved_path[PATH_MAX ]; -void *base_addr_ptr; -int vdso =0 ; + so_data.vdso =0 ;if (info->dlpi_phdr[j].p_type !=PT_LOAD )continue ;/* Calculate virtual memory address of the loadable segment */ - base_addr_ptr = (void *) info->dlpi_addr + so_data.base_addr_ptr = (void *) info->dlpi_addr + info->dlpi_phdr[j].p_vaddr; if ((info->dlpi_name == NULL || info->dlpi_name[0] == 0)
@@ -163,7 +168,7 @@ int extract_soinfo_events(struct dl_phdr_info *info, size_t size, void *_data)* could be e.g. vdso. Don't mistakenly dump * them as being the program executable. */ - data->exec_baddr = base_addr_ptr; + data->exec_baddr = so_data.base_addr_ptr;/* * Deal with program executable outside of phdr * iteration.
@@ -173,7 +178,7 @@ int extract_soinfo_events(struct dl_phdr_info *info, size_t size, void *_data)if (info->dlpi_name ==NULL || info->dlpi_name[0 ] ==0 ) {/* Found vDSO. */ snprintf (resolved_path,PATH_MAX -1 ,"[vdso]" ); - vdso =1 ; + so_data.vdso =1 ; }else {/* * For regular dl_phdr_info entries we have to check if
@@ -183,10 +188,13 @@ int extract_soinfo_events(struct dl_phdr_info *info, size_t size, void *_data)/* Path unknown, put the 'path' into brackets */ snprintf (resolved_path,PATH_MAX -1 ,"[%s]" , info->dlpi_name); - vdso =1 ; + so_data.vdso =1 ; } } -if (trace_baddr (base_addr_ptr, resolved_path, vdso, owner)) { + + so_data.resolved_path = resolved_path; + +if (trace_baddr (owner, &so_data)) {return 1 ; }/*
@@ -201,13 +209,13 @@ int extract_soinfo_events(struct dl_phdr_info *info, size_t size, void *_data)static void dump_exec_baddr (struct extract_data *data) { -void *owner = data->owner; -void *base_addr_ptr; +struct soinfo_data so_data;char exe_path[PATH_MAX ];ssize_t exe_len; - base_addr_ptr = data->exec_baddr; -if (!base_addr_ptr) + so_data.vdso =0 ; + so_data.base_addr_ptr = data->exec_baddr; +if (!so_data.base_addr_ptr)return ;/* * We have to use /proc/self/exe to determine the executable full
@@ -217,7 +225,8 @@ void dump_exec_baddr(struct extract_data *data)if (exe_len <=0 )return ; exe_path[exe_len] ='\0' ; -trace_baddr (base_addr_ptr, exe_path,0 , owner); + so_data.resolved_path = exe_path; +trace_baddr (data->owner, &so_data); }int lttng_ust_baddr_statedump (void *owner)
Signature · 1 line
2.4.1
Re: [PATCH lttng-ust 1/2] Add ust_baddr_statedump start and end events
In reply to a message not in the archive----- Original Message -----
Quoted 2 lines
These events mark the beginning and end of base addresses state dump, which happens once per traced application.
.. once per traced application per session.
Quoted 3 lines
Note that there is no
guarantee concerning the relative order of multiple start/end events in the case of overlapping statedumps. That is to say. if there are
That is to say, if ...
Quoted 3 lines
two start events, and two end events, the first end event does not necessarily correspond to the first start event, and similarly with the second events.
For a given (process, session), the pairs of statedump begin/end should match. The fact that only a single thread is issuing them ensures that we serialize them over a single (process, session) tuple.
It's the statedump begin/end across different processes (vpid) that may be interleaved.
Thanks,
Mathieu
Quoted 123 lines
Signed-off-by Antoine Busque <[email protected]>--- liblttng-ust/lttng-ust-baddr.c | 50 ++++++++++++++++++++++++++++++++++++++ liblttng-ust/ust_baddr_statedump.h | 10 ++++++++ 2 files changed, 60 insertions(+)liblttng-ust/lttng-ust-baddr.c +48
-0@@ -89,6 +89,54 @@ int trace_baddr(void *base_addr_ptr, }static +int trace_statedump_start (void *owner) +{ +struct cds_list_head *sessionsp; +struct lttng_session *session; + +if (ust_lock ()) { +ust_unlock (); +return 1 ; + } + + sessionsp =_lttng_get_sessions (); +cds_list_for_each_entry (session, sessionsp, node) { +if (session->owner != owner) +continue ; +if (!session->statedump_pending) +continue ; +tracepoint (ust_baddr_statedump, start, + session); + } +ust_unlock (); +return 0 ; +} + +static +int trace_statedump_end (void *owner) +{ +struct cds_list_head *sessionsp; +struct lttng_session *session; + +if (ust_lock ()) { +ust_unlock (); +return 1 ; + } + + sessionsp =_lttng_get_sessions (); +cds_list_for_each_entry (session, sessionsp, node) { +if (session->owner != owner) +continue ; +if (!session->statedump_pending) +continue ; +tracepoint (ust_baddr_statedump, end, + session); + } +ust_unlock (); +return 0 ; +} + +static int extract_soinfo_events (struct dl_phdr_info *info,size_t size,void *_data) {liblttng-ust/lttng-ust-baddr.c +2
-0int j;@@ -179,6 +227,7 @@ int lttng_ust_baddr_statedump(void *owner)if (getenv ("LTTNG_UST_WITHOUT_BADDR_STATEDUMP" ))return 0 ; +trace_statedump_start (owner); data.owner = owner; data.exec_baddr =NULL ;/* @@ -194,6 +243,7 @@ int lttng_ust_baddr_statedump(void *owner)* iteration. */ dump_exec_baddr (&data); +trace_statedump_end (owner);return 0 ; }liblttng-ust/ust_baddr_statedump.h +5
-0@@ -37,6 +37,11 @@ extern "C" {#define LTTNG_UST_BADDR_STATEDUMP_PROVIDER #include <lttng/tracepoint.h> +TRACEPOINT_EVENT (ust_baddr_statedump, start, + TP_ARGS(struct lttng_session *, session), +TP_FIELDS () +) + TRACEPOINT_EVENT(ust_baddr_statedump, soinfo, TP_ARGS(struct lttng_session *, session, void *, baddr, const char*, sopath, int64_t, size, int64_t, mtime),liblttng-ust/ust_baddr_statedump.h +5
-1TP_FIELDS(@@ -47,6 +52,11 @@ TRACEPOINT_EVENT(ust_baddr_statedump, soinfo, ) ) +TRACEPOINT_EVENT(ust_baddr_statedump, end, + TP_ARGS(struct lttng_session *, session), + TP_FIELDS() +) +#endif /* _TRACEPOINT_UST_BADDR_STATEDUMP_H */ #undef TRACEPOINT_INCLUDE --2.4.1
_______________________________________________
lttng-dev mailing list
[email protected]
http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
Signature · 3 lines
Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com
A message that is not in the archive (sent off-list or not yet received): [email protected]
----- Original Message -----
Quoted 17 lines
This refactoring allows the reuse of code that handles the iteration over the sessions, used for all
ust_baddr_statedumpevents.Signed-off-by Antoine Busque <[email protected]>--- liblttng-ust/lttng-ust-baddr.c | 133 ++++++++++++++++++++++------------------- 1 file changed, 71 insertions(+), 62 deletions(-)liblttng-ust/lttng-ust-baddr.c +0
-0@@ -44,24 +44,27 @@ struct extract_data {void *exec_baddr;/* executable base address */ };
liblttng-ust/lttng-ust-baddr.c struct extract_data { · line 56
Quoted 10 lines
liblttng-ust/lttng-ust-baddr.c +10
-0+struct soinfo_data { +void *base_addr_ptr; +const char *resolved_path; +int vdso; +off_t size; +time_t mtime; +}; + +typedef void (*tracepoint_cb )(struct lttng_session *session, +void *extra_tp_args);
Can we rename "extra_tp_args" to "priv" across this file ?
liblttng-ust/lttng-ust-baddr.c struct extract_data { · line 60
Quoted 6 lines
liblttng-ust/lttng-ust-baddr.c +3
-2+/* -* Trace baddr into all sessions for which statedump is pending owned by -* the caller thread. +* Trace statedump event into all sessions for which statedump is +* pending owned by the caller thread.
...pending and owned...
Quoted 31 lines
liblttng-ust/lttng-ust-baddr.c +1
-9*/ static -int trace_baddr (void *base_addr_ptr, -const char *resolved_path, -int vdso, -void *owner) +int trace_statedump_event (tracepoint_cb tp_cb,void *owner,void *extra_tp_args) {struct cds_list_head *sessionsp;struct lttng_session *session; -struct stat sostat; -if (vdso ||stat (resolved_path, &sostat)) { - sostat.st_size =0 ; - sostat.st_mtime =-1 ; - }/* * UST lock nests within dynamic loader lock. liblttng-ust/lttng-ust-baddr.c +1
-4*/ @@ -79,61 +82,63 @@ int trace_baddr(void *base_addr_ptr,continue ;if (!session->statedump_pending)continue ; -tracepoint (ust_baddr_statedump, soinfo, - session, base_addr_ptr, - resolved_path, sostat.st_size, - sostat.st_mtime); +tp_cb (session, extra_tp_args); }ust_unlock ();
liblttng-ust/lttng-ust-baddr.c int trace_baddr(void *base_addr_ptr, · line 94
Quoted 10 lines
liblttng-ust/lttng-ust-baddr.c +2
-3return 0 ; }static -int trace_statedump_start (void *owner) +void trace_soinfo_cb (struct lttng_session *session,void *extra_tp_args) { -struct cds_list_head *sessionsp; -struct lttng_session *session; +struct soinfo_data *so_data = (struct soinfo_data *)extra_tp_args;
missing space after ")"
Quoted 17 lines
liblttng-ust/lttng-ust-baddr.c +5
-10-if (ust_lock ()) { -ust_unlock (); -return 1 ; - } +tracepoint (ust_baddr_statedump, soinfo, + session, so_data->base_addr_ptr, + so_data->resolved_path, so_data->size, + so_data->mtime); +} - sessionsp =_lttng_get_sessions (); -cds_list_for_each_entry (session, sessionsp, node) { -if (session->owner != owner) -continue ; -if (!session->statedump_pending) -continue ;
liblttng-ust/lttng-ust-baddr.c int trace_baddr(void *base_addr_ptr, · line 105
Quoted 10 lines
liblttng-ust/lttng-ust-baddr.c +5
-5-tracepoint (ust_baddr_statedump, start, - session); - } -ust_unlock (); -return 0 ; +static +void trace_start_cb (struct lttng_session *session,void *extra_tp_args) +{ +tracepoint (ust_baddr_statedump, start, + session);
This should fit on a single line.
liblttng-ust/lttng-ust-baddr.c int trace_baddr(void *base_addr_ptr, · line 112
Quoted 10 lines
liblttng-ust/lttng-ust-baddr.c +3
-3}static -int trace_statedump_end (void *owner) +void trace_end_cb (struct lttng_session *session,void *extra_tp_args) { -struct cds_list_head *sessionsp; -struct lttng_session *session; +tracepoint (ust_baddr_statedump, end, + session);
This should fit on a single line.
Quoted 46 lines
liblttng-ust/lttng-ust-baddr.c +25
-14+} -if (ust_lock ()) { -ust_unlock (); -return 1 ; - } +static +int trace_baddr (void *owner,struct soinfo_data *so_data) +{ +struct stat sostat; - sessionsp =_lttng_get_sessions (); -cds_list_for_each_entry (session, sessionsp, node) { -if (session->owner != owner) -continue ; -if (!session->statedump_pending) -continue ; -tracepoint (ust_baddr_statedump, end, - session); +if (so_data->vdso ||stat (so_data->resolved_path, &sostat)) { + sostat.st_size =0 ; + sostat.st_mtime =-1 ; } -ust_unlock (); -return 0 ; + + so_data->size = sostat.st_size; + so_data->mtime = sostat.st_mtime; + +return trace_statedump_event (trace_soinfo_cb, owner, so_data); +} + +static +int trace_statedump_start (void *owner) +{ +return trace_statedump_event (trace_start_cb, owner,NULL ); +} + +static +int trace_statedump_end (void *owner) +{ +return trace_statedump_event (trace_end_cb, owner,NULL ); } static
liblttng-ust/lttng-ust-baddr.c int extract_soinfo_events(struct dl_phdr_info *info, · line 149
Quoted 10 lines
liblttng-ust/lttng-ust-baddr.c +1
-1@@ -141,18 +146,18 @@ int extract_soinfo_events(struct dl_phdr_info *info, size_t size, void *_data) { int j;struct extract_data *data = _data; +struct soinfo_data so_data;void *owner = data->owner;for (j =0 ; j < info->dlpi_phnum; j++) {char resolved_path[PATH_MAX ]; -void *base_addr_ptr;
Please declare so_data in the innermost scope (here). It's not used outside, right ?
Thanks,
Mathieu
Quoted 87 lines
liblttng-ust/lttng-ust-baddr.c +2
-2-int vdso =0 ; + so_data.vdso =0 ;if (info->dlpi_phdr[j].p_type !=PT_LOAD )continue ;/* Calculate virtual memory address of the loadable segment */ - base_addr_ptr = (void *) info->dlpi_addr + so_data.base_addr_ptr = (void *) info->dlpi_addr + info->dlpi_phdr[j].p_vaddr;liblttng-ust/lttng-ust-baddr.c +1
-1if ((info->dlpi_name == NULL || info->dlpi_name[0] == 0)@@ -163,7 +168,7 @@ int extract_soinfo_events(struct dl_phdr_info *info,size_t size, void *_data) * could be e.g. vdso. Don't mistakenly dump * them as being the program executable. */ - data->exec_baddr = base_addr_ptr; + data->exec_baddr = so_data.base_addr_ptr;/* * Deal with program executable outside of phdr liblttng-ust/lttng-ust-baddr.c +1
-1* iteration. @@ -173,7 +178,7 @@ int extract_soinfo_events(struct dl_phdr_info *info, size_t size, void *_data)if (info->dlpi_name ==NULL || info->dlpi_name[0 ] ==0 ) {/* Found vDSO. */ snprintf (resolved_path,PATH_MAX -1 ,"[vdso]" ); - vdso =1 ; + so_data.vdso =1 ; }else {/* liblttng-ust/lttng-ust-baddr.c +5
-2* For regular dl_phdr_info entries we have to check if @@ -183,10 +188,13 @@ int extract_soinfo_events(struct dl_phdr_info *info, size_t size, void *_data)/* Path unknown, put the 'path' into brackets */ snprintf(resolved_path, PATH_MAX - 1, "[%s]", info->dlpi_name); - vdso =1 ; + so_data.vdso =1 ; } } -if (trace_baddr (base_addr_ptr, resolved_path, vdso, owner)) { + + so_data.resolved_path = resolved_path; + +if (trace_baddr (owner, &so_data)) {return 1 ; }liblttng-ust/lttng-ust-baddr.c +4
-4/* @@ -201,13 +209,13 @@ int extract_soinfo_events(struct dl_phdr_info *info, size_t size, void *_data) static void dump_exec_baddr(struct extract_data *data) { - void *owner = data->owner; -void *base_addr_ptr; + struct soinfo_data so_data;char exe_path[PATH_MAX ];ssize_t exe_len; - base_addr_ptr = data->exec_baddr; -if (!base_addr_ptr) + so_data.vdso =0 ; + so_data.base_addr_ptr = data->exec_baddr; +if (!so_data.base_addr_ptr)return ;/* liblttng-ust/lttng-ust-baddr.c +2
-2* We have to use /proc/self/exe to determine the executable full @@ -217,7 +225,8 @@ void dump_exec_baddr(struct extract_data *data)if (exe_len <=0 )return ; exe_path[exe_len] ='\0' ; -trace_baddr (base_addr_ptr, exe_path,0 , owner); + so_data.resolved_path = exe_path; +trace_baddr (data->owner, &so_data); }int lttng_ust_baddr_statedump (void *owner) --2.4.1
_______________________________________________
lttng-dev mailing list
[email protected]
http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
Signature · 3 lines
Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com