* Linux Trace Toolkit Control Library
*
* Copyright (C) 2011 David Goulet <david.goulet@polymtl.ca>
- * Copyright (C) 2016 - Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ * Copyright (C) 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
*
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License, version 2.1 only,
- * as published by the Free Software Foundation.
+ * SPDX-License-Identifier: LGPL-2.1-only
*
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#define _LGPL_SOURCE
*/
int lttng_list_tracker_ids(struct lttng_handle *handle,
enum lttng_tracker_type tracker_type,
- struct lttng_tracker_id ***_ids,
- size_t *_nr_ids)
+ struct lttng_tracker_ids **_ids)
{
int ret, i;
struct lttcomm_session_msg lsm;
char *cmd_payload = NULL, *p;
size_t cmd_header_len;
size_t nr_ids = 0;
- struct lttng_tracker_id **ids = NULL;
+ struct lttng_tracker_ids *ids = NULL;
if (handle == NULL) {
return -LTTNG_ERR_INVALID;
free(cmd_header);
cmd_header = NULL;
- ids = zmalloc(sizeof(*ids) * nr_ids);
+ ids = lttng_tracker_ids_create(nr_ids);
if (!ids) {
ret = -LTTNG_ERR_NOMEM;
goto error;
tracker_id = (struct lttcomm_tracker_id_header *) p;
p += sizeof(struct lttcomm_tracker_id_header);
- id = lttng_tracker_id_create();
+ id = lttng_tracker_ids_get_pointer_of_index(ids, i);
if (!id) {
- ret = -LTTNG_ERR_NOMEM;
+ ret = -LTTNG_ERR_INVALID;
goto error;
}
ret = -LTTNG_ERR_INVALID;
goto error;
}
-
- /* Assign the new object to the list */
- ids[i] = id;
}
free(cmd_payload);
*_ids = ids;
- *_nr_ids = nr_ids;
return 0;
error:
- lttng_tracker_ids_destroy(ids, nr_ids);
- free(ids);
+ lttng_tracker_ids_destroy(ids);
free(cmd_payload);
free(cmd_header);
return ret;
int lttng_list_tracker_pids(struct lttng_handle *handle,
int *_enabled, int32_t **_pids, size_t *_nr_pids)
{
- struct lttng_tracker_id **ids = NULL;
- size_t nr_ids = 0;
+ struct lttng_tracker_ids *ids = NULL;
+ unsigned int nr_ids = 0;
int *pids = NULL;
int ret = 0, i;
enum lttng_tracker_id_status status;
+ const struct lttng_tracker_id *id;
- ret = lttng_list_tracker_ids(handle, LTTNG_TRACKER_PID, &ids, &nr_ids);
- if (ret < 0)
+ ret = lttng_list_tracker_ids(handle, LTTNG_TRACKER_PID, &ids);
+ if (ret < 0) {
return ret;
+ }
- if (nr_ids == 1 && lttng_tracker_id_get_type(ids[0]) == LTTNG_ID_ALL) {
- *_enabled = 0;
+ status = lttng_tracker_ids_get_count(ids, &nr_ids);
+ if (status != LTTNG_TRACKER_ID_STATUS_OK) {
+ ret = -LTTNG_ERR_INVALID;
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;
+ goto end;
+ }
+ }
+
*_enabled = 1;
pids = zmalloc(nr_ids * sizeof(*pids));
goto end;
}
for (i = 0; i < nr_ids; i++) {
- struct lttng_tracker_id *id = ids[i];
-
+ id = lttng_tracker_ids_get_at_index(ids, i);
status = lttng_tracker_id_get_value(id, &pids[i]);
if (status != LTTNG_TRACKER_ID_STATUS_OK) {
ret = -LTTNG_ERR_UNK;
*_pids = pids;
*_nr_pids = nr_ids;
end:
- lttng_tracker_ids_destroy(ids, nr_ids);
- free(ids);
+ lttng_tracker_ids_destroy(ids);
if (ret < 0) {
free(pids);
}
{
int ret;
struct lttcomm_session_msg lsm;
- const char *var_data;
+ const char *var_data = NULL;
size_t var_data_len = 0;
int value;
enum lttng_tracker_id_status status;