{
int ret, value;
struct lttng_tracker_list *tracker_list;
+ struct lttng_tracker_id *saved_ids;
+ ssize_t saved_ids_count, i;
ret = lttng_tracker_id_lookup_string(tracker_type,
id, &value);
return ret;
}
- /* Add to list. */
tracker_list = get_id_tracker_list(session, tracker_type);
if (!tracker_list) {
return LTTNG_ERR_INVALID;
}
+ /* Save list for restore on error. */
+ saved_ids_count = lttng_tracker_id_get_list(tracker_list, &saved_ids);
+ if (saved_ids_count < 0) {
+ return LTTNG_ERR_INVALID;
+ }
+ /* Add to list. */
ret = lttng_tracker_list_add(tracker_list, id);
if (ret != LTTNG_OK) {
- return ret;
+ goto end;
}
switch (tracker_type) {
value, session->id);
ret = kernctl_track_pid(session->fd, value);
if (!ret) {
- return LTTNG_OK;
+ ret = LTTNG_OK;
+ goto end;
}
break;
case LTTNG_TRACKER_VPID:
value, session->id);
ret = kernctl_track_id(session->fd, LTTNG_TRACKER_VPID, value);
if (!ret) {
- return LTTNG_OK;
+ ret = LTTNG_OK;
+ goto end;
}
break;
case LTTNG_TRACKER_UID:
value, session->id);
ret = kernctl_track_id(session->fd, LTTNG_TRACKER_UID, value);
if (!ret) {
- return LTTNG_OK;
+ ret = LTTNG_OK;
+ goto end;
}
break;
case LTTNG_TRACKER_GID:
value, session->id);
ret = kernctl_track_id(session->fd, LTTNG_TRACKER_GID, value);
if (!ret) {
- return LTTNG_OK;
+ ret = LTTNG_OK;
+ goto end;
}
break;
case LTTNG_TRACKER_VUID:
value, session->id);
ret = kernctl_track_id(session->fd, LTTNG_TRACKER_VUID, value);
if (!ret) {
- return LTTNG_OK;
+ ret = LTTNG_OK;
+ goto end;
}
break;
case LTTNG_TRACKER_VGID:
value, session->id);
ret = kernctl_track_id(session->fd, LTTNG_TRACKER_VGID, value);
if (!ret) {
- return LTTNG_OK;
+ ret = LTTNG_OK;
+ goto end;
}
break;
default:
- return LTTNG_ERR_INVALID;
+ ret = -EINVAL;
+ break;
}
+ /* Error handling. */
switch (-ret) {
case EINVAL:
- return LTTNG_ERR_INVALID;
+ ret = LTTNG_ERR_INVALID;
+ break;
case ENOMEM:
- return LTTNG_ERR_NOMEM;
+ ret = LTTNG_ERR_NOMEM;
+ break;
case EEXIST:
- return LTTNG_ERR_ID_TRACKED;
+ ret = LTTNG_ERR_ID_TRACKED;
+ break;
default:
- return LTTNG_ERR_UNK;
+ ret = LTTNG_ERR_UNK;
+ break;
+ }
+ if (lttng_tracker_id_set_list(tracker_list, saved_ids, saved_ids_count) != LTTNG_OK) {
+ 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);
+ return ret;
}
int kernel_untrack_id(enum lttng_tracker_type tracker_type,
{
int ret, value;
struct lttng_tracker_list *tracker_list;
+ struct lttng_tracker_id *saved_ids;
+ ssize_t saved_ids_count, i;
ret = lttng_tracker_id_lookup_string(tracker_type,
id, &value);
return ret;
}
- /* Remove from list. */
tracker_list = get_id_tracker_list(session, tracker_type);
if (!tracker_list) {
return LTTNG_ERR_INVALID;
}
+ /* Save list for restore on error. */
+ saved_ids_count = lttng_tracker_id_get_list(tracker_list, &saved_ids);
+ if (saved_ids_count < 0) {
+ return LTTNG_ERR_INVALID;
+ }
+ /* Remove from list. */
ret = lttng_tracker_list_remove(tracker_list, id);
if (ret != LTTNG_OK) {
- return ret;
+ goto end;
}
switch (tracker_type) {
value, session->id);
ret = kernctl_untrack_pid(session->fd, value);
if (!ret) {
- return LTTNG_OK;
+ ret = LTTNG_OK;
+ goto end;
}
break;
case LTTNG_TRACKER_VPID:
value, session->id);
ret = kernctl_untrack_id(session->fd, LTTNG_TRACKER_VPID, value);
if (!ret) {
- return LTTNG_OK;
+ ret = LTTNG_OK;
+ goto end;
}
break;
case LTTNG_TRACKER_UID:
value, session->id);
ret = kernctl_untrack_id(session->fd, LTTNG_TRACKER_UID, value);
if (!ret) {
- return LTTNG_OK;
+ ret = LTTNG_OK;
+ goto end;
}
break;
case LTTNG_TRACKER_GID:
value, session->id);
ret = kernctl_untrack_id(session->fd, LTTNG_TRACKER_GID, value);
if (!ret) {
- return LTTNG_OK;
+ ret = LTTNG_OK;
+ goto end;
}
break;
case LTTNG_TRACKER_VUID:
value, session->id);
ret = kernctl_untrack_id(session->fd, LTTNG_TRACKER_VUID, value);
if (!ret) {
- return LTTNG_OK;
+ ret = LTTNG_OK;
+ goto end;
}
break;
case LTTNG_TRACKER_VGID:
value, session->id);
ret = kernctl_untrack_id(session->fd, LTTNG_TRACKER_VGID, value);
if (!ret) {
- return LTTNG_OK;
+ ret = LTTNG_OK;
+ goto end;
}
break;
default:
- return LTTNG_ERR_INVALID;
+ ret = -EINVAL;
+ break;
}
+ /* Error handling. */
switch (-ret) {
case EINVAL:
- return LTTNG_ERR_INVALID;
+ ret = LTTNG_ERR_INVALID;
+ break;
case ENOMEM:
- return LTTNG_ERR_NOMEM;
- case ENOENT:
- return LTTNG_ERR_ID_NOT_TRACKED;
+ ret = LTTNG_ERR_NOMEM;
+ break;
+ case EEXIST:
+ ret = LTTNG_ERR_ID_TRACKED;
+ break;
default:
- return LTTNG_ERR_UNK;
+ ret = LTTNG_ERR_UNK;
+ break;
+ }
+
+ if (lttng_tracker_id_set_list(tracker_list, saved_ids, saved_ids_count) != LTTNG_OK) {
+ 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);
+ return ret;
}
/*
struct ust_id_tracker *id_tracker;
struct lttng_tracker_list *tracker_list;
int value;
+ struct lttng_tracker_id *saved_ids;
+ ssize_t saved_ids_count, i;
if (tracker_type == LTTNG_TRACKER_PID) {
DBG("Backward compatible behavior: translate PID tracker to VPID tracker for UST domain.");
if (retval != LTTNG_OK) {
return retval;
}
-
- /* Add to list. */
tracker_list = get_id_tracker_list(session, tracker_type);
if (!tracker_list) {
return LTTNG_ERR_INVALID;
}
+ /* Save list for restore on error. */
+ saved_ids_count = lttng_tracker_id_get_list(tracker_list, &saved_ids);
+ if (saved_ids_count < 0) {
+ return LTTNG_ERR_INVALID;
+ }
+ /* Add to list. */
retval = lttng_tracker_list_add(tracker_list, id);
if (retval != LTTNG_OK) {
- return retval;
+ goto end;
}
id_tracker = get_id_tracker(session, tracker_type);
retval = init_id_tracker(id_tracker);
if (retval != LTTNG_OK) {
ERR("Error initializing ID tracker");
- goto end;
+ goto end_restore;
}
retval = id_tracker_add_id(id_tracker, value);
if (retval != LTTNG_OK) {
fini_id_tracker(id_tracker);
- goto end;
+ goto end_restore;
}
/* Keep only apps matching ID. */
ust_app_global_update_all(session);
retval = id_tracker_add_id(id_tracker, value);
if (retval != LTTNG_OK) {
- goto end;
+ goto end_restore;
}
/* Add session to application */
switch (tracker_type) {
}
}
}
+ goto end;
+
+end_restore:
+ if (lttng_tracker_id_set_list(tracker_list, saved_ids, saved_ids_count) != LTTNG_OK) {
+ 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);
return retval;
}
struct ust_id_tracker *id_tracker;
struct lttng_tracker_list *tracker_list;
int value;
+ struct lttng_tracker_id *saved_ids;
+ ssize_t saved_ids_count, i;
if (tracker_type == LTTNG_TRACKER_PID) {
DBG("Backward compatible behavior: translate PID tracker to VPID tracker for UST domain.");
return retval;
}
- /* Remove from list. */
tracker_list = get_id_tracker_list(session, tracker_type);
if (!tracker_list) {
return LTTNG_ERR_INVALID;
}
+ /* Save list for restore on error. */
+ saved_ids_count = lttng_tracker_id_get_list(tracker_list, &saved_ids);
+ if (saved_ids_count < 0) {
+ return LTTNG_ERR_INVALID;
+ }
+ /* Remove from list. */
retval = lttng_tracker_list_remove(tracker_list, id);
if (retval != LTTNG_OK) {
- return retval;
+ goto end;
}
id_tracker = get_id_tracker(session, tracker_type);
ERR("Error initializing ID tracker");
/* Rollback operation. */
*id_tracker = tmp_tracker;
- goto end;
+ goto end_restore;
}
fini_id_tracker(&tmp_tracker);
if (!id_tracker->ht) {
/* No ID being tracked. */
retval = LTTNG_ERR_ID_NOT_TRACKED;
- goto end;
+ goto end_restore;
}
/* Remove ID from tracker */
retval = id_tracker_del_id(id_tracker, value);
if (retval != LTTNG_OK) {
- goto end;
+ goto end_restore;
}
switch (tracker_type) {
case LTTNG_TRACKER_VPID:
ust_app_global_update_all(session);
}
}
+ goto end;
+
+end_restore:
+ if (lttng_tracker_id_set_list(tracker_list, saved_ids, saved_ids_count) != LTTNG_OK) {
+ 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);
return retval;
}