#include <common/mi-lttng.h>
#include <common/time.h>
#include <lttng/constant.h>
+#include <lttng/tracker.h>
#include "../command.h"
{
int ret = 0;
int enabled = 1;
- struct lttng_tracker_id *ids = NULL;
- size_t nr_ids, i;
+ 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_ids(handle, tracker_type, &ids, &nr_ids);
+ ret = lttng_list_tracker_ids(handle, tracker_type, &ids);
if (ret) {
return ret;
}
- if (nr_ids == 1 && ids[0].type == LTTNG_ID_ALL) {
- enabled = 0;
+
+ 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) {
_MSG("%s tracker: [", get_tracker_str(tracker_type));
}
for (i = 0; i < nr_ids; i++) {
- struct lttng_tracker_id *id = &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(",");
}
- switch (id->type) {
+ switch (lttng_tracker_id_get_type(id)) {
case LTTNG_ID_ALL:
_MSG(" *");
break;
case LTTNG_ID_VALUE:
- _MSG(" %d", ids[i].value);
+ _MSG(" %d", value);
break;
case LTTNG_ID_STRING:
- _MSG(" %s", ids[i].string);
+ _MSG(" %s", value_string);
break;
case LTTNG_ID_UNKNOWN:
- return CMD_ERROR;
+ ERR("Invalid state for tracker id");
+ ret = CMD_ERROR;
+ goto end;
}
/* Mi */
}
}
end:
- for (i = 0; i < nr_ids; i++) {
- free(ids[i].string);
- }
- free(ids);
+ lttng_tracker_ids_destroy(ids);
return ret;
}
*/
static int list_trackers(const struct lttng_domain *domain)
{
- int ret;
+ int ret = 0;
/* Trackers listing */
if (lttng_opt_mi) {