projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename config.h to session-config.h
[lttng-tools.git]
/
src
/
bin
/
lttng
/
commands
/
list.c
diff --git
a/src/bin/lttng/commands/list.c
b/src/bin/lttng/commands/list.c
index 13a5d91f3ca2668125369ca982e979b19f857514..ccbb5b419359414aa626622bd64cc08535f36a26 100644
(file)
--- a/
src/bin/lttng/commands/list.c
+++ b/
src/bin/lttng/commands/list.c
@@
-15,7
+15,6
@@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#define _GNU_SOURCE
#define _LGPL_SOURCE
#include <inttypes.h>
#include <popt.h>
#define _LGPL_SOURCE
#include <inttypes.h>
#include <popt.h>
@@
-340,8
+339,8
@@
static int mi_list_agent_ust_events(struct lttng_event *events, int count,
goto end;
}
goto end;
}
- /* Open p
rocesses
element */
- ret = mi_lttng_p
rocesse
s_open(writer);
+ /* Open p
ids element
element */
+ ret = mi_lttng_p
id
s_open(writer);
if (ret) {
goto end;
}
if (ret) {
goto end;
}
@@
-366,7
+365,7
@@
static int mi_list_agent_ust_events(struct lttng_event *events, int count,
if (!pid_element_open) {
/* Open and write a pid element */
if (!pid_element_open) {
/* Open and write a pid element */
- ret = mi_lttng_p
rocess
(writer, cur_pid, cmdline, 1);
+ ret = mi_lttng_p
id
(writer, cur_pid, cmdline, 1);
if (ret) {
goto error;
}
if (ret) {
goto error;
}
@@
-389,7
+388,7
@@
static int mi_list_agent_ust_events(struct lttng_event *events, int count,
}
}
}
}
- /* Close p
rocesse
s */
+ /* Close p
id
s */
ret = mi_lttng_writer_close_element(writer);
if (ret) {
goto end;
ret = mi_lttng_writer_close_element(writer);
if (ret) {
goto end;
@@
-493,7
+492,7
@@
static int list_ust_events(void)
int i, size, ret = CMD_SUCCESS;
struct lttng_domain domain;
struct lttng_handle *handle;
int i, size, ret = CMD_SUCCESS;
struct lttng_domain domain;
struct lttng_handle *handle;
- struct lttng_event *event_list;
+ struct lttng_event *event_list
= NULL
;
pid_t cur_pid = 0;
char *cmdline = NULL;
pid_t cur_pid = 0;
char *cmdline = NULL;
@@
-577,8
+576,8
@@
static int mi_list_ust_event_fields(struct lttng_event_field *fields, int count,
goto end;
}
goto end;
}
- /* Open p
rocesse
s element */
- ret = mi_lttng_p
rocesse
s_open(writer);
+ /* Open p
id
s element */
+ ret = mi_lttng_p
id
s_open(writer);
if (ret) {
goto end;
}
if (ret) {
goto end;
}
@@
-606,8
+605,8
@@
static int mi_list_ust_event_fields(struct lttng_event_field *fields, int count,
cur_pid = fields[i].event.pid;
cmdline = get_cmdline_by_pid(cur_pid);
if (!pid_element_open) {
cur_pid = fields[i].event.pid;
cmdline = get_cmdline_by_pid(cur_pid);
if (!pid_element_open) {
- /* Open and write a p
rocess
element */
- ret = mi_lttng_p
rocess
(writer, cur_pid, cmdline, 1);
+ /* Open and write a p
id
element */
+ ret = mi_lttng_p
id
(writer, cur_pid, cmdline, 1);
if (ret) {
goto error;
}
if (ret) {
goto error;
}
@@
-661,7
+660,7
@@
static int mi_list_ust_event_fields(struct lttng_event_field *fields, int count,
}
}
}
}
- /* Close p
rocesses
, domain, domains */
+ /* Close p
id
, domain, domains */
ret = mi_lttng_close_multi_element(writer, 3);
end:
return ret;
ret = mi_lttng_close_multi_element(writer, 3);
end:
return ret;
@@
-1855,7
+1854,8
@@
int cmd_list(int argc, const char **argv)
if (ret) {
goto end;
}
if (ret) {
goto end;
}
- continue;
+
+ goto next_domain;
}
switch (domains[i].type) {
}
switch (domains[i].type) {
@@
-1875,6
+1875,7
@@
int cmd_list(int argc, const char **argv)
goto end;
}
goto end;
}
+next_domain:
if (lttng_opt_mi) {
/* Close domain element */
ret = mi_lttng_writer_close_element(writer);
if (lttng_opt_mi) {
/* Close domain element */
ret = mi_lttng_writer_close_element(writer);
This page took
0.025418 seconds
and
4
git commands to generate.