lttng: list: print `per-user` and `per-process` buffer types

[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 229648e07cebe7018d2dfa80fc67151fff97a15c..baf26fb5e65eeaf58a0f5844f43335e8ddcdaba2 100644 (file)
--- a/src/bin/lttng/commands/list.c
+++ b/src/bin/lttng/commands/list.c
@@ -1,18 +1,8 @@
 /*
- * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2011 David Goulet <david.goulet@polymtl.ca>
  *
- * 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
@@ -1540,15 +1530,21 @@ static int list_tracker_ids(enum lttng_tracker_type tracker_type)
        int ret = 0;
        int enabled = 1;
        struct lttng_tracker_ids *ids = NULL;
-       size_t nr_ids, i;
+       unsigned int nr_ids, i;
        const struct lttng_tracker_id *id;
+       enum lttng_tracker_id_status status;
 
        ret = lttng_list_tracker_ids(handle, tracker_type, &ids);
        if (ret) {
                return ret;
        }
 
-       nr_ids = lttng_tracker_ids_get_count(ids);
+       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) {
@@ -2352,9 +2348,9 @@ int cmd_list(int argc, const char **argv)
                                        break;
                                case LTTNG_DOMAIN_UST:
                                        MSG("=== Domain: UST global ===\n");
-                                       MSG("Buffer type: %s\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");