X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Flist.c;h=49470ab86b91d00fc8032f5062b8b89429599ad0;hp=65d8ea6f5c45424444262f87dd4ff7c7e38bbb70;hb=2d97a0067600335f07eecb2c1d9ba68fc164583e;hpb=aff0fa7248c73edb8e02578c83e338716cf695ec diff --git a/src/bin/lttng/commands/list.c b/src/bin/lttng/commands/list.c index 65d8ea6f5..49470ab86 100644 --- a/src/bin/lttng/commands/list.c +++ b/src/bin/lttng/commands/list.c @@ -26,6 +26,7 @@ #include #include #include +#include #include "../command.h" @@ -809,7 +810,7 @@ static int mi_list_ust_event_fields(struct lttng_event_field *fields, int count, } } - /* Close pid, domain, domains */ + /* Close pids, domain, domains */ ret = mi_lttng_close_multi_element(writer, 3); end: return ret; @@ -1512,43 +1513,104 @@ error_channels: return ret; } +static const char *get_tracker_str(enum lttng_tracker_type tracker_type) +{ + switch (tracker_type) { + case LTTNG_TRACKER_PID: + return "PID"; + case LTTNG_TRACKER_VPID: + return "VPID"; + case LTTNG_TRACKER_UID: + return "UID"; + case LTTNG_TRACKER_VUID: + return "VUID"; + case LTTNG_TRACKER_GID: + return "GID"; + case LTTNG_TRACKER_VGID: + return "VGID"; + } + return NULL; +} + /* - * List tracker PID(s) of session and domain. + * List tracker ID(s) of session and domain. */ -static int list_tracker_pids(void) +static int list_tracker_ids(enum lttng_tracker_type tracker_type) { int ret = 0; - int enabled; - int *pids = NULL; - size_t nr_pids; + int enabled = 1; + struct lttng_tracker_id **ids = NULL; + size_t nr_ids, i; - ret = lttng_list_tracker_pids(handle, - &enabled, &pids, &nr_pids); + ret = lttng_list_tracker_ids(handle, tracker_type, &ids, &nr_ids); if (ret) { return ret; } + if (nr_ids == 1 && lttng_tracker_id_get_type(ids[0]) == LTTNG_ID_ALL) { + enabled = 0; + } if (enabled) { - int i; - _MSG("PID tracker: ["); + _MSG("%s tracker: [", get_tracker_str(tracker_type)); - /* Mi tracker_pid element*/ + /* Mi tracker_id element */ if (writer) { - /* Open tracker_pid and targets elements */ - ret = mi_lttng_pid_tracker_open(writer); + /* Open tracker_id and targets elements */ + ret = mi_lttng_id_tracker_open(writer, tracker_type); if (ret) { goto end; } } - for (i = 0; i < nr_pids; i++) { + for (i = 0; i < nr_ids; i++) { + struct lttng_tracker_id *id = ids[i]; + enum lttng_tracker_id_status status; + int value; + const char *value_string; + + switch (lttng_tracker_id_get_type(id)) { + case LTTNG_ID_ALL: + break; + case LTTNG_ID_VALUE: + status = lttng_tracker_id_get_value(id, &value); + break; + case LTTNG_ID_STRING: + status = lttng_tracker_id_get_string( + id, &value_string); + break; + case LTTNG_ID_UNKNOWN: + ret = CMD_ERROR; + goto end; + } + + if (status != LTTNG_TRACKER_ID_STATUS_OK) { + ERR("Invalid state for tracker id"); + ret = CMD_ERROR; + goto end; + } + if (i) { _MSG(","); } - _MSG(" %d", pids[i]); + switch (lttng_tracker_id_get_type(id)) { + case LTTNG_ID_ALL: + _MSG(" *"); + break; + case LTTNG_ID_VALUE: + _MSG(" %d", value); + break; + case LTTNG_ID_STRING: + _MSG(" %s", value_string); + break; + case LTTNG_ID_UNKNOWN: + ERR("Invalid state for tracker id"); + ret = CMD_ERROR; + goto end; + } /* Mi */ if (writer) { - ret = mi_lttng_pid_target(writer, pids[i], 0); + ret = mi_lttng_id_target( + writer, tracker_type, id, 0); if (ret) { goto end; } @@ -1556,26 +1618,25 @@ static int list_tracker_pids(void) } _MSG(" ]\n\n"); - /* Mi close tracker_pid and targets */ + /* Mi close tracker_id and targets */ if (writer) { - ret = mi_lttng_close_multi_element(writer,2); + ret = mi_lttng_close_multi_element(writer, 2); if (ret) { goto end; } } } end: - free(pids); + lttng_tracker_ids_destroy(ids, nr_ids); return ret; - } /* - * List all tracker of a domain + * List all trackers of a domain */ -static int list_trackers(void) +static int list_trackers(const struct lttng_domain *domain) { - int ret; + int ret = 0; /* Trackers listing */ if (lttng_opt_mi) { @@ -1585,12 +1646,59 @@ static int list_trackers(void) } } - /* pid tracker */ - ret = list_tracker_pids(); - if (ret) { - goto end; + switch (domain->type) { + case LTTNG_DOMAIN_KERNEL: + /* pid tracker */ + ret = list_tracker_ids(LTTNG_TRACKER_PID); + if (ret) { + goto end; + } + /* vpid tracker */ + ret = list_tracker_ids(LTTNG_TRACKER_VPID); + if (ret) { + goto end; + } + /* uid tracker */ + ret = list_tracker_ids(LTTNG_TRACKER_UID); + if (ret) { + goto end; + } + /* vuid tracker */ + ret = list_tracker_ids(LTTNG_TRACKER_VUID); + if (ret) { + goto end; + } + /* gid tracker */ + ret = list_tracker_ids(LTTNG_TRACKER_GID); + if (ret) { + goto end; + } + /* vgid tracker */ + ret = list_tracker_ids(LTTNG_TRACKER_VGID); + if (ret) { + goto end; + } + break; + case LTTNG_DOMAIN_UST: + /* vpid tracker */ + ret = list_tracker_ids(LTTNG_TRACKER_VPID); + if (ret) { + goto end; + } + /* vuid tracker */ + ret = list_tracker_ids(LTTNG_TRACKER_VUID); + if (ret) { + goto end; + } + /* vgid tracker */ + ret = list_tracker_ids(LTTNG_TRACKER_VGID); + if (ret) { + goto end; + } + break; + default: + break; } - if (lttng_opt_mi) { /* Close trackers element */ ret = mi_lttng_writer_close_element(writer); @@ -2185,7 +2293,7 @@ int cmd_list(int argc, const char **argv) /* Trackers */ - ret = list_trackers(); + ret = list_trackers(&domain); if (ret) { goto end; } @@ -2282,7 +2390,7 @@ int cmd_list(int argc, const char **argv) switch (domains[i].type) { case LTTNG_DOMAIN_KERNEL: case LTTNG_DOMAIN_UST: - ret = list_trackers(); + ret = list_trackers(&domains[i]); if (ret) { goto end; }