X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Flist.c;h=334d4daf1f6bf02d8d77084e10d8ccbdacddfc53;hp=be252ab7600c3299e0243df68338b703d19c9fa7;hb=ac41e67e39946acd97752ce52b964976890c5e87;hpb=b955b4d4c416bfa4db1915b51834c24ee2f35df1 diff --git a/src/bin/lttng/commands/list.c b/src/bin/lttng/commands/list.c index be252ab76..334d4daf1 100644 --- a/src/bin/lttng/commands/list.c +++ b/src/bin/lttng/commands/list.c @@ -1,18 +1,8 @@ /* - * Copyright (C) 2011 - David Goulet + * Copyright (C) 2011 David Goulet * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2 only, - * as published by the Free Software Foundation. + * SPDX-License-Identifier: GPL-2.0-only * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #define _LGPL_SOURCE @@ -24,7 +14,9 @@ #include #include +#include #include +#include #include "../command.h" @@ -251,8 +243,8 @@ end: static void print_userspace_probe_location(struct lttng_event *event) { - struct lttng_userspace_probe_location *location; - struct lttng_userspace_probe_location_lookup_method *lookup_method; + const struct lttng_userspace_probe_location *location; + const struct lttng_userspace_probe_location_lookup_method *lookup_method; enum lttng_userspace_probe_location_lookup_method_type lookup_type; location = lttng_event_get_userspace_probe_location(event); @@ -808,7 +800,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; @@ -1261,7 +1253,7 @@ void print_timer(const char *timer_name, uint32_t space_count, int64_t value) } if (value) { - MSG("%" PRId64 " µs", value); + MSG("%" PRId64 " %s", value, USEC_UNIT); } else { MSG("inactive"); } @@ -1318,7 +1310,8 @@ static void print_channel(struct lttng_channel *channel) if (blocking_timeout == -1) { MSG("%sBlocking timeout: infinite", indent6); } else { - MSG("%sBlocking timeout: %" PRId64 " µs", indent6, blocking_timeout); + MSG("%sBlocking timeout: %" PRId64 " %s", indent6, + blocking_timeout, USEC_UNIT); } } @@ -1510,43 +1503,123 @@ 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_ids *ids = NULL; + unsigned int nr_ids, i; + const struct lttng_tracker_id *id; + enum lttng_tracker_id_status status; - ret = lttng_list_tracker_pids(handle, - &enabled, &pids, &nr_pids); + ret = lttng_list_tracker_ids(handle, tracker_type, &ids); if (ret) { return ret; } + + status = lttng_tracker_ids_get_count(ids, &nr_ids); + if (status != LTTNG_TRACKER_ID_STATUS_OK) { + ret = CMD_ERROR; + goto end; + } + + if (nr_ids == 1) { + id = lttng_tracker_ids_get_at_index(ids, 0); + if (id && lttng_tracker_id_get_type(id) == 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++) { + enum lttng_tracker_id_status status = + LTTNG_TRACKER_ID_STATUS_OK; + int value; + const char *value_string; + + id = lttng_tracker_ids_get_at_index(ids, i); + if (!id) { + ret = CMD_ERROR; + goto end; + } + + 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; } @@ -1554,26 +1627,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); 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) { @@ -1583,12 +1655,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); @@ -1616,7 +1735,7 @@ static enum cmd_error_code print_periodic_rotation_schedule( goto end; } - MSG(" timer period: %" PRIu64" µs", value); + MSG(" timer period: %" PRIu64" %s", value, USEC_UNIT); ret = CMD_SUCCESS; end: return ret; @@ -1823,7 +1942,7 @@ static int list_sessions(const char *session_name) int ret = CMD_SUCCESS; int count, i; unsigned int session_found = 0; - struct lttng_session *sessions; + struct lttng_session *sessions = NULL; count = lttng_list_sessions(&sessions); DBG("Session count %d", count); @@ -1836,7 +1955,7 @@ static int list_sessions(const char *session_name) if (lttng_opt_mi) { /* Mi */ if (session_name == NULL) { - /* List all session */ + /* List all sessions */ ret = mi_list_sessions(sessions, count); } else { /* Note : this return an open session element */ @@ -1844,7 +1963,7 @@ static int list_sessions(const char *session_name) } if (ret) { ret = CMD_ERROR; - goto error; + goto end; } } else { /* Pretty print */ @@ -1857,7 +1976,6 @@ static int list_sessions(const char *session_name) MSG("Available tracing sessions:"); } - for (i = 0; i < count; i++) { if (session_name != NULL) { if (strncmp(sessions[i].name, session_name, NAME_MAX) == 0) { @@ -1865,20 +1983,25 @@ static int list_sessions(const char *session_name) MSG("Tracing session %s: [%s%s]", session_name, active_string(sessions[i].enabled), snapshot_string(sessions[i].snapshot_mode)); - MSG("%sTrace path: %s\n", indent4, sessions[i].path); + if (*sessions[i].path) { + MSG("%sTrace output: %s\n", indent4, sessions[i].path); + } memcpy(&listed_session, &sessions[i], sizeof(listed_session)); break; } } else { - MSG(" %d) %s (%s) [%s%s]", i + 1, - sessions[i].name, sessions[i].path, + MSG(" %d) %s [%s%s]", i + 1, + sessions[i].name, active_string(sessions[i].enabled), snapshot_string(sessions[i].snapshot_mode)); - MSG("%sTrace path: %s", indent4, sessions[i].path); + if (*sessions[i].path) { + MSG("%sTrace output: %s", indent4, sessions[i].path); + } if (sessions[i].live_timer_interval != 0) { - MSG("%sLive timer interval: %u µs", indent4, - sessions[i].live_timer_interval); + MSG("%sLive timer interval: %u %s", indent4, + sessions[i].live_timer_interval, + USEC_UNIT); } MSG(""); } @@ -1887,7 +2010,7 @@ static int list_sessions(const char *session_name) if (!session_found && session_name != NULL) { ERR("Session '%s' not found", session_name); ret = CMD_ERROR; - goto error; + goto end; } if (session_name == NULL) { @@ -1895,9 +2018,8 @@ static int list_sessions(const char *session_name) } } -error: - free(sessions); end: + free(sessions); return ret; } @@ -2180,7 +2302,7 @@ int cmd_list(int argc, const char **argv) /* Trackers */ - ret = list_trackers(); + ret = list_trackers(&domain); if (ret) { goto end; } @@ -2222,22 +2344,22 @@ int cmd_list(int argc, const char **argv) for (i = 0; i < nb_domain; i++) { switch (domains[i].type) { case LTTNG_DOMAIN_KERNEL: - MSG("=== Domain: Kernel ===\n"); + MSG("=== Domain: Linux kernel ===\n"); break; case LTTNG_DOMAIN_UST: - MSG("=== Domain: UST global ===\n"); - MSG("Buffer type: %s\n", + MSG("=== Domain: User space ===\n"); + MSG("Buffering scheme: %s\n", domains[i].buf_type == - LTTNG_BUFFER_PER_PID ? "per PID" : "per UID"); + LTTNG_BUFFER_PER_PID ? "per-process" : "per-user"); break; case LTTNG_DOMAIN_JUL: - MSG("=== Domain: JUL (Java Util Logging) ===\n"); + MSG("=== Domain: java.util.logging (JUL) ===\n"); break; case LTTNG_DOMAIN_LOG4J: - MSG("=== Domain: LOG4j (Logging for Java) ===\n"); + MSG("=== Domain: log4j ===\n"); break; case LTTNG_DOMAIN_PYTHON: - MSG("=== Domain: Python (logging) ===\n"); + MSG("=== Domain: Python logging ===\n"); break; default: MSG("=== Domain: Unimplemented ===\n"); @@ -2277,7 +2399,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; }