projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactoring: introduce lttng_tracker_ids data structure
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
kernel.c
diff --git
a/src/bin/lttng-sessiond/kernel.c
b/src/bin/lttng-sessiond/kernel.c
index 113937536215df1c17044fbd64a9da95115586c8..8ec20e71b76257c96c638850d4a6d72a046c0dda 100644
(file)
--- a/
src/bin/lttng-sessiond/kernel.c
+++ b/
src/bin/lttng-sessiond/kernel.c
@@
-707,8
+707,7
@@
int kernel_track_id(enum lttng_tracker_type tracker_type,
{
int ret, value;
struct lttng_tracker_list *tracker_list;
{
int ret, value;
struct lttng_tracker_list *tracker_list;
- struct lttng_tracker_id *saved_ids;
- ssize_t saved_ids_count, i;
+ struct lttng_tracker_ids *saved_ids;
ret = lttng_tracker_id_lookup_string(tracker_type, id, &value);
if (ret != LTTNG_OK) {
ret = lttng_tracker_id_lookup_string(tracker_type, id, &value);
if (ret != LTTNG_OK) {
@@
-721,8
+720,8
@@
int kernel_track_id(enum lttng_tracker_type tracker_type,
}
/* Save list for restore on error. */
}
/* Save list for restore on error. */
-
saved_ids_coun
t = lttng_tracker_id_get_list(tracker_list, &saved_ids);
- if (
saved_ids_count < 0
) {
+
re
t = lttng_tracker_id_get_list(tracker_list, &saved_ids);
+ if (
ret != LTTNG_OK
) {
return LTTNG_ERR_INVALID;
}
return LTTNG_ERR_INVALID;
}
@@
-808,15
+807,11
@@
int kernel_track_id(enum lttng_tracker_type tracker_type,
break;
}
break;
}
- if (lttng_tracker_id_set_list(tracker_list, saved_ids,
- saved_ids_count) != LTTNG_OK) {
+ if (lttng_tracker_id_set_list(tracker_list, saved_ids) != LTTNG_OK) {
ERR("Error on tracker add error handling.\n");
}
end:
ERR("Error on tracker add error handling.\n");
}
end:
- for (i = 0; i < saved_ids_count; i++) {
- free(saved_ids[i].string);
- }
- free(saved_ids);
+ lttng_tracker_ids_destroy(saved_ids);
return ret;
}
return ret;
}
@@
-826,8
+821,7
@@
int kernel_untrack_id(enum lttng_tracker_type tracker_type,
{
int ret, value;
struct lttng_tracker_list *tracker_list;
{
int ret, value;
struct lttng_tracker_list *tracker_list;
- struct lttng_tracker_id *saved_ids;
- ssize_t saved_ids_count, i;
+ struct lttng_tracker_ids *saved_ids;
ret = lttng_tracker_id_lookup_string(tracker_type, id, &value);
if (ret != LTTNG_OK) {
ret = lttng_tracker_id_lookup_string(tracker_type, id, &value);
if (ret != LTTNG_OK) {
@@
-839,8
+833,8
@@
int kernel_untrack_id(enum lttng_tracker_type tracker_type,
return LTTNG_ERR_INVALID;
}
/* Save list for restore on error. */
return LTTNG_ERR_INVALID;
}
/* Save list for restore on error. */
-
saved_ids_coun
t = lttng_tracker_id_get_list(tracker_list, &saved_ids);
- if (
saved_ids_count < 0
) {
+
re
t = lttng_tracker_id_get_list(tracker_list, &saved_ids);
+ if (
ret != LTTNG_OK
) {
return LTTNG_ERR_INVALID;
}
/* Remove from list. */
return LTTNG_ERR_INVALID;
}
/* Remove from list. */
@@
-928,32
+922,38
@@
int kernel_untrack_id(enum lttng_tracker_type tracker_type,
break;
}
break;
}
- if (lttng_tracker_id_set_list(tracker_list, saved_ids,
- saved_ids_count) != LTTNG_OK) {
+ if (lttng_tracker_id_set_list(tracker_list, saved_ids) != LTTNG_OK) {
ERR("Error on tracker remove error handling.\n");
}
end:
ERR("Error on tracker remove error handling.\n");
}
end:
- for (i = 0; i < saved_ids_count; i++) {
- free(saved_ids[i].string);
- }
- free(saved_ids);
+ lttng_tracker_ids_destroy(saved_ids);
return ret;
}
/*
* Called with session lock held.
*/
return ret;
}
/*
* Called with session lock held.
*/
-
ssize_
t kernel_list_tracker_ids(enum lttng_tracker_type tracker_type,
+
in
t kernel_list_tracker_ids(enum lttng_tracker_type tracker_type,
struct ltt_kernel_session *session,
struct ltt_kernel_session *session,
- struct lttng_tracker_id **_ids)
+ struct lttng_tracker_id
s
**_ids)
{
{
+ int ret = 0;
struct lttng_tracker_list *tracker_list;
tracker_list = get_id_tracker_list(session, tracker_type);
if (!tracker_list) {
struct lttng_tracker_list *tracker_list;
tracker_list = get_id_tracker_list(session, tracker_type);
if (!tracker_list) {
- return -LTTNG_ERR_INVALID;
+ ret = -LTTNG_ERR_INVALID;
+ goto end;
}
}
- return lttng_tracker_id_get_list(tracker_list, _ids);
+
+ ret = lttng_tracker_id_get_list(tracker_list, _ids);
+ if (ret != LTTNG_OK) {
+ ret = -LTTNG_ERR_INVALID;
+ goto end;
+ }
+
+end:
+ return ret;
}
/*
}
/*
This page took
0.025178 seconds
and
4
git commands to generate.