#include "trace-ust.h"
#include "agent.h"
+/* Return LTTNG_OK on success else a LTTNG_ERR* code. */
static
int save_kernel_channel_attributes(struct config_writer *writer,
struct lttng_channel_attr *attr)
attr->overwrite ? config_overwrite_mode_overwrite :
config_overwrite_mode_discard);
if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
}
ret = config_writer_write_element_unsigned_int(writer,
config_element_subbuf_size, attr->subbuf_size);
if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
}
config_element_num_subbuf,
attr->num_subbuf);
if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
}
config_element_switch_timer_interval,
attr->switch_timer_interval);
if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
}
config_element_read_timer_interval,
attr->read_timer_interval);
if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
}
attr->output == LTTNG_EVENT_SPLICE ?
config_output_type_splice : config_output_type_mmap);
if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
}
ret = config_writer_write_element_unsigned_int(writer,
config_element_tracefile_size, attr->tracefile_size);
if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
}
config_element_tracefile_count,
attr->tracefile_count);
if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
}
config_element_live_timer_interval,
attr->live_timer_interval);
if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
}
config_element_monitor_timer_interval,
ext->monitor_timer_interval);
if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
}
config_element_blocking_timeout,
ext->blocking_timeout);
if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
}
}
+ ret = LTTNG_OK;
end:
- return ret ? LTTNG_ERR_SAVE_IO_FAIL : 0;
+ return ret;
}
+/* Return LTTNG_OK on success else a LTTNG_ERR* code. */
static
int save_ust_channel_attributes(struct config_writer *writer,
struct lttng_ust_channel_attr *attr)
attr->overwrite ? config_overwrite_mode_overwrite :
config_overwrite_mode_discard);
if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
}
ret = config_writer_write_element_unsigned_int(writer,
config_element_subbuf_size, attr->subbuf_size);
if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
}
config_element_num_subbuf,
attr->num_subbuf);
if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
}
config_element_switch_timer_interval,
attr->switch_timer_interval);
if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
}
config_element_read_timer_interval,
attr->read_timer_interval);
if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
}
attr->output == LTTNG_UST_MMAP ?
config_output_type_mmap : config_output_type_splice);
if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
}
config_element_blocking_timeout,
attr->u.s.blocking_timeout);
if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
}
config_element_monitor_timer_interval,
channel->monitor_timer_interval);
if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
}
+ ret = LTTNG_OK;
end:
- return ret ? LTTNG_ERR_SAVE_IO_FAIL : 0;
+ return ret;
}
static
return loglevel_type_string;
}
+/* Return LTTNG_OK on success else a LTTNG_ERR* code. */
static
int save_kernel_event(struct config_writer *writer,
struct ltt_kernel_event *event)
ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
}
+
+ ret = LTTNG_OK;
end:
return ret;
}
+/* Return LTTNG_OK on success else a LTTNG_ERR* code. */
static
int save_kernel_events(struct config_writer *writer,
struct ltt_kernel_channel *kchan)
cds_list_for_each_entry(event, &kchan->events_list.head, list) {
ret = save_kernel_event(writer, event);
- if (ret) {
+ if (ret != LTTNG_OK) {
goto end;
}
}
ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
}
+
+ ret = LTTNG_OK;
end:
return ret;
}
+/* Return LTTNG_OK on success else a LTTNG_ERR* code. */
static
int save_ust_event(struct config_writer *writer,
struct ltt_ust_event *event)
ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
}
+
+ ret = LTTNG_OK;
end:
return ret;
}
+/* Return LTTNG_OK on success else a LTTNG_ERR* code. */
static
int save_ust_events(struct config_writer *writer,
struct lttng_ht *events)
continue;
}
ret = save_ust_event(writer, event);
- if (ret) {
+ if (ret != LTTNG_OK) {
rcu_read_unlock();
goto end;
}
ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
}
+
+ ret = LTTNG_OK;
end:
return ret;
}
+/* Return LTTNG_OK on success else a LTTNG_ERR* code. */
static
int init_ust_event_from_agent_event(struct ltt_ust_event *ust_event,
struct agent_event *agent_event)
{
- int ret = 0;
+ int ret;
enum lttng_ust_loglevel_type ust_loglevel_type;
ust_event->enabled = agent_event->enabled;
ust_event->attr.instrumentation = LTTNG_UST_TRACEPOINT;
if (lttng_strncpy(ust_event->attr.name, agent_event->name,
LTTNG_SYMBOL_NAME_LEN)) {
- ret = -1;
+ ret = LTTNG_ERR_INVALID;
goto end;
}
switch (agent_event->loglevel_type) {
break;
default:
ERR("Invalid agent_event loglevel_type.");
- ret = -1;
+ ret = LTTNG_ERR_INVALID;
goto end;
}
ust_event->attr.loglevel = agent_event->loglevel_value;
ust_event->filter_expression = agent_event->filter_expression;
ust_event->exclusion = agent_event->exclusion;
+
+ ret = LTTNG_OK;
end:
return ret;
}
+/* Return LTTNG_OK on success else a LTTNG_ERR* code. */
static
int save_agent_events(struct config_writer *writer,
struct agent *agent)
* structures...).
*/
ret = init_ust_event_from_agent_event(&fake_event, agent_event);
- if (ret) {
+ if (ret != LTTNG_OK) {
rcu_read_unlock();
goto end;
}
ret = save_ust_event(writer, &fake_event);
- if (ret) {
+ if (ret != LTTNG_OK) {
rcu_read_unlock();
goto end;
}
ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
}
+
+ ret = LTTNG_OK;
end:
return ret;
}
+/* Return LTTNG_OK on success else a LTTNG_ERR* code. */
static
int save_kernel_context(struct config_writer *writer,
struct lttng_kernel_context *ctx)
{
- int ret = 0;
+ int ret = LTTNG_OK;
if (!ctx) {
goto end;
goto end;
}
+ ret = LTTNG_OK;
end:
return ret;
}
+/* Return LTTNG_OK on success else a LTTNG_ERR* code. */
static
int save_kernel_contexts(struct config_writer *writer,
struct ltt_kernel_channel *kchan)
struct ltt_kernel_context *ctx;
if (cds_list_empty(&kchan->ctx_list)) {
- ret = 0;
+ ret = LTTNG_OK;
goto end;
}
cds_list_for_each_entry(ctx, &kchan->ctx_list, list) {
ret = save_kernel_context(writer, &ctx->ctx);
- if (ret) {
+ if (ret != LTTNG_OK) {
goto end;
}
}
ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
}
+
+ ret = LTTNG_OK;
end:
return ret;
}
+/* Return LTTNG_OK on success else a LTTNG_ERR* code. */
static
int save_ust_context_perf_thread_counter(struct config_writer *writer,
struct ltt_ust_context *ctx)
ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
}
+
+ ret = LTTNG_OK;
end:
return ret;
}
+/* Return LTTNG_OK on success else a LTTNG_ERR* code. */
static
int save_ust_context_app_ctx(struct config_writer *writer,
struct ltt_ust_context *ctx)
ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
}
+
+ ret = LTTNG_OK;
end:
return ret;
}
+/* Return LTTNG_OK on success else a LTTNG_ERR* code. */
static
int save_ust_context_generic(struct config_writer *writer,
struct ltt_ust_context *ctx)
ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
}
+
+ ret = LTTNG_OK;
end:
return ret;
}
+/* Return LTTNG_OK on success else a LTTNG_ERR* code. */
static
int save_ust_context(struct config_writer *writer,
struct cds_list_head *ctx_list)
/* Save generic context. */
ret = save_ust_context_generic(writer, ctx);
}
- if (ret) {
+ if (ret != LTTNG_OK) {
goto end;
}
ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
}
+
+ ret = LTTNG_OK;
end:
return ret;
}
+/* Return LTTNG_OK on success else a LTTNG_ERR* code. */
static
int save_kernel_channel(struct config_writer *writer,
struct ltt_kernel_channel *kchan)
}
ret = save_kernel_channel_attributes(writer, &kchan->channel->attr);
- if (ret) {
+ if (ret != LTTNG_OK) {
goto end;
}
ret = save_kernel_events(writer, kchan);
- if (ret) {
+ if (ret != LTTNG_OK) {
goto end;
}
ret = save_kernel_contexts(writer, kchan);
- if (ret) {
+ if (ret != LTTNG_OK) {
goto end;
}
ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
}
+
+ ret = LTTNG_OK;
end:
return ret;
}
+/* Return LTTNG_OK on success else a LTTNG_ERR* code. */
static
int save_ust_channel(struct config_writer *writer,
struct ltt_ust_channel *ust_chan,
}
ret = save_ust_channel_attributes(writer, &ust_chan->attr);
- if (ret) {
+ if (ret != LTTNG_OK) {
goto end;
}
if (ust_chan->domain == LTTNG_DOMAIN_UST) {
ret = save_ust_events(writer, ust_chan->events);
- if (ret) {
+ if (ret != LTTNG_OK) {
goto end;
}
} else {
* them.
*/
ret = save_agent_events(writer, agent);
- if (ret) {
+ if (ret != LTTNG_OK) {
goto end;
}
}
ret = save_ust_context(writer, &ust_chan->ctx_list);
- if (ret) {
+ if (ret != LTTNG_OK) {
goto end;
}
ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
}
+
+ ret = LTTNG_OK;
end:
return ret;
}
+/* Return LTTNG_OK on success else a LTTNG_ERR* code. */
static
int save_kernel_session(struct config_writer *writer,
struct ltt_session *session)
cds_list_for_each_entry(kchan, &session->kernel_session->channel_list.head,
list) {
ret = save_kernel_channel(writer, kchan);
- if (ret) {
+ if (ret != LTTNG_OK) {
goto end;
}
}
ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
}
+
+ ret = LTTNG_OK;
end:
return ret;
}
return str_dom;
}
+/* Return LTTNG_OK on success else a LTTNG_ERR* code. */
static
-int save_pid_tracker(struct config_writer *writer,
- struct ltt_session *sess, int domain)
+int save_id_tracker(struct config_writer *writer,
+ struct ltt_session *sess, int domain,
+ enum lttng_tracker_type tracker_type)
{
- int ret = 0;
- ssize_t nr_pids = 0, i;
- int32_t *pids = NULL;
+ int ret = LTTNG_OK;
+ ssize_t nr_ids = 0, i;
+ struct lttng_tracker_id *ids = NULL;
+ const char *element_id_tracker, *element_target_id, *element_id;
+
+ switch (tracker_type) {
+ case LTTNG_TRACKER_PID:
+ element_id_tracker = config_element_pid_tracker;
+ element_target_id = config_element_target_pid;
+ element_id = config_element_pid;
+ break;
+ case LTTNG_TRACKER_VPID:
+ element_id_tracker = config_element_vpid_tracker;
+ element_target_id = config_element_target_vpid;
+ element_id = config_element_id;
+ break;
+ case LTTNG_TRACKER_UID:
+ element_id_tracker = config_element_uid_tracker;
+ element_target_id = config_element_target_uid;
+ element_id = config_element_id;
+ break;
+ case LTTNG_TRACKER_VUID:
+ element_id_tracker = config_element_vuid_tracker;
+ element_target_id = config_element_target_vuid;
+ element_id = config_element_id;
+ break;
+ case LTTNG_TRACKER_GID:
+ element_id_tracker = config_element_gid_tracker;
+ element_target_id = config_element_target_gid;
+ element_id = config_element_id;
+ break;
+ case LTTNG_TRACKER_VGID:
+ element_id_tracker = config_element_vgid_tracker;
+ element_target_id = config_element_target_vgid;
+ element_id = config_element_id;
+ break;
+ default:
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
switch (domain) {
case LTTNG_DOMAIN_KERNEL:
{
- nr_pids = kernel_list_tracker_pids(sess->kernel_session, &pids);
- if (nr_pids < 0) {
+ nr_ids = kernel_list_tracker_ids(tracker_type, sess->kernel_session, &ids);
+ if (nr_ids < 0) {
ret = LTTNG_ERR_KERN_LIST_FAIL;
goto end;
}
}
case LTTNG_DOMAIN_UST:
{
- nr_pids = trace_ust_list_tracker_pids(sess->ust_session, &pids);
- if (nr_pids < 0) {
+ nr_ids = trace_ust_list_tracker_ids(tracker_type, sess->ust_session, &ids);
+ if (nr_ids < 0) {
ret = LTTNG_ERR_UST_LIST_FAIL;
goto end;
}
goto end;
}
- /* Only create a pid_tracker if enabled or untrack all */
- if (nr_pids != 1 || (nr_pids == 1 && pids[0] != -1)) {
+
+ if (nr_ids == 1 && ids[0].type == LTTNG_ID_ALL) {
+ /* Tracking all, nothing to output. */
+ ret = LTTNG_OK;
+ goto end;
+ }
+
+ ret = config_writer_open_element(writer, element_id_tracker);
+ if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+
+ ret = config_writer_open_element(writer,
+ config_element_targets);
+ if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+
+ if (nr_ids == 0) {
+ /* Tracking none: empty list. */
ret = config_writer_open_element(writer,
- config_element_pid_tracker);
+ element_target_id);
if (ret) {
ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
}
- ret = config_writer_open_element(writer,
- config_element_targets);
+ /* /$element_target_id */
+ ret = config_writer_close_element(writer);
if (ret) {
ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
}
-
- for (i = 0; i < nr_pids; i++) {
- ret = config_writer_open_element(writer,
- config_element_target_pid);
- if (ret) {
+ } else {
+ /* Tracking list. */
+ for (i = 0; i < nr_ids; i++) {
+ switch (ids[i].type) {
+ case LTTNG_ID_VALUE:
+ ret = config_writer_open_element(writer,
+ element_target_id);
+ if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+ ret = config_writer_write_element_unsigned_int(writer,
+ element_id, ids[i].value);
+ break;
+ case LTTNG_ID_STRING:
+ ret = config_writer_open_element(writer,
+ element_target_id);
+ if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+ ret = config_writer_write_element_string(writer,
+ config_element_name, ids[i].string);
+ break;
+ default:
+ /* Unexpected. */
ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
}
-
- ret = config_writer_write_element_unsigned_int(writer,
- config_element_pid, pids[i]);
if (ret) {
ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
}
- /* /pid_target */
+ /* /$element_target_id */
ret = config_writer_close_element(writer);
if (ret) {
ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
}
}
+ }
- /* /targets */
- ret = config_writer_close_element(writer);
- if (ret) {
- ret = LTTNG_ERR_SAVE_IO_FAIL;
- goto end;
- }
+ /* /targets */
+ ret = config_writer_close_element(writer);
+ if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
- /* /pid_tracker */
- ret = config_writer_close_element(writer);
- if (ret) {
- ret = LTTNG_ERR_SAVE_IO_FAIL;
- goto end;
- }
+ /* /$element_id_tracker */
+ ret = config_writer_close_element(writer);
+ if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
}
+
+ ret = LTTNG_OK;
end:
- free(pids);
+ free(ids);
return ret;
}
+/* Return LTTNG_OK on success else a LTTNG_ERR* code. */
+static
+int save_id_trackers(struct config_writer *writer,
+ struct ltt_session *sess, int domain)
+{
+ int ret;
+
+ switch (domain) {
+ case LTTNG_DOMAIN_KERNEL:
+ ret = save_id_tracker(writer, sess, domain, LTTNG_TRACKER_PID);
+ if (ret != LTTNG_OK)
+ return ret;
+ ret = save_id_tracker(writer, sess, domain, LTTNG_TRACKER_VPID);
+ if (ret != LTTNG_OK)
+ return ret;
+ ret = save_id_tracker(writer, sess, domain, LTTNG_TRACKER_UID);
+ if (ret != LTTNG_OK)
+ return ret;
+ ret = save_id_tracker(writer, sess, domain, LTTNG_TRACKER_VUID);
+ if (ret != LTTNG_OK)
+ return ret;
+ ret = save_id_tracker(writer, sess, domain, LTTNG_TRACKER_GID);
+ if (ret != LTTNG_OK)
+ return ret;
+ ret = save_id_tracker(writer, sess, domain, LTTNG_TRACKER_VGID);
+ if (ret != LTTNG_OK)
+ return ret;
+ break;
+ case LTTNG_DOMAIN_UST:
+ ret = save_id_tracker(writer, sess, domain, LTTNG_TRACKER_VPID);
+ if (ret != LTTNG_OK)
+ return ret;
+ ret = save_id_tracker(writer, sess, domain, LTTNG_TRACKER_VUID);
+ if (ret != LTTNG_OK)
+ return ret;
+ ret = save_id_tracker(writer, sess, domain, LTTNG_TRACKER_VGID);
+ if (ret != LTTNG_OK)
+ return ret;
+ break;
+ default:
+ return LTTNG_ERR_INVALID;
+ }
+ return LTTNG_OK;
+}
+
+/* Return LTTNG_OK on success else a LTTNG_ERR* code. */
static
int save_ust_domain(struct config_writer *writer,
struct ltt_session *session, enum lttng_domain_type domain)
ust_chan = caa_container_of(node, struct ltt_ust_channel, node);
if (domain == ust_chan->domain) {
ret = save_ust_channel(writer, ust_chan, session->ust_session);
- if (ret) {
+ if (ret != LTTNG_OK) {
rcu_read_unlock();
goto end;
}
goto end;
}
- ret = save_pid_tracker(writer, session, LTTNG_DOMAIN_UST);
- if (ret) {
+ ret = save_id_trackers(writer, session, LTTNG_DOMAIN_UST);
+ if (ret != LTTNG_OK) {
goto end;
}
/* /trackers */
ret = config_writer_close_element(writer);
if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
}
}
goto end;
}
+ ret = LTTNG_OK;
end:
return ret;
}
+/* Return LTTNG_OK on success else a LTTNG_ERR* code. */
static
int save_domains(struct config_writer *writer, struct ltt_session *session)
{
- int ret = 0;
+ int ret = LTTNG_OK;
assert(writer);
assert(session);
goto end;
}
-
if (session->kernel_session) {
ret = config_writer_open_element(writer,
config_element_domain);
}
ret = save_kernel_session(writer, session);
- if (ret) {
+ if (ret != LTTNG_OK) {
goto end;
}
goto end;
}
- ret = save_pid_tracker(writer, session, LTTNG_DOMAIN_KERNEL);
- if (ret) {
+ ret = save_id_trackers(writer, session, LTTNG_DOMAIN_KERNEL);
+ if (ret != LTTNG_OK) {
goto end;
}
if (session->ust_session) {
ret = save_ust_domain(writer, session, LTTNG_DOMAIN_UST);
- if (ret) {
+ if (ret != LTTNG_OK) {
goto end;
}
ret = save_ust_domain(writer, session, LTTNG_DOMAIN_JUL);
- if (ret) {
+ if (ret != LTTNG_OK) {
goto end;
}
ret = save_ust_domain(writer, session, LTTNG_DOMAIN_LOG4J);
- if (ret) {
+ if (ret != LTTNG_OK) {
goto end;
}
ret = save_ust_domain(writer, session, LTTNG_DOMAIN_PYTHON);
- if (ret) {
+ if (ret != LTTNG_OK) {
goto end;
}
}
ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
}
+
+ ret = LTTNG_OK;
end:
return ret;
}
+/* Return LTTNG_OK on success else a LTTNG_ERR* code. */
static
int save_consumer_output(struct config_writer *writer,
struct consumer_output *output)
ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end_net_output;
}
-
+ ret = LTTNG_OK;
end_net_output:
free(uri);
- if (ret) {
+ if (ret != LTTNG_OK) {
goto end;
}
} else {
ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
}
+
+ ret = LTTNG_OK;
end:
return ret;
}
+/* Return LTTNG_OK on success else a LTTNG_ERR* code. */
static
int save_snapshot_outputs(struct config_writer *writer,
struct snapshot *snapshot)
}
ret = save_consumer_output(writer, output->consumer);
- if (ret) {
+ if (ret != LTTNG_OK) {
goto end_unlock;
}
goto end;
}
+ ret = LTTNG_OK;
end:
return ret;
end_unlock:
return ret;
}
+/* Return LTTNG_OK on success else a LTTNG_ERR* code. */
static
int save_session_output(struct config_writer *writer,
struct ltt_session *session)
if ((session->snapshot_mode && session->snapshot.nb_output == 0) ||
(!session->snapshot_mode && !session->consumer)) {
/* Session is in no output mode */
- ret = 0;
+ ret = LTTNG_OK;
goto end;
}
if (session->snapshot_mode) {
ret = save_snapshot_outputs(writer, &session->snapshot);
- if (ret) {
+ if (ret != LTTNG_OK) {
goto end;
}
} else {
if (session->consumer) {
ret = save_consumer_output(writer, session->consumer);
- if (ret) {
+ if (ret != LTTNG_OK) {
goto end;
}
}
ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
}
+ ret = LTTNG_OK;
end:
return ret;
}
/*
* Save the given session.
*
- * Return 0 on success else a LTTNG_ERR* code.
+ * Return LTTNG_OK on success else a LTTNG_ERR* code.
*/
static
int save_session(struct ltt_session *session,
goto end;
}
- if(session->shm_path[0] != '\0') {
+ if (session->shm_path[0] != '\0') {
ret = config_writer_write_element_string(writer,
config_element_shared_memory_path,
session->shm_path);
}
ret = save_domains(writer, session);
- if (ret) {
+ if (ret != LTTNG_OK) {
goto end;
}
}
ret = save_session_output(writer, session);
- if (ret) {
+ if (ret != LTTNG_OK) {
goto end;
}
ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
}
+
+ ret = LTTNG_OK;
end:
if (writer && config_writer_destroy(writer)) {
/* Preserve the original error code */
- ret = ret ? ret : LTTNG_ERR_SAVE_IO_FAIL;
+ ret = ret != LTTNG_OK ? ret : LTTNG_ERR_SAVE_IO_FAIL;
}
- if (ret) {
+ if (ret != LTTNG_OK) {
/* Delete file in case of error */
if (file_opened && unlink(config_file_path)) {
PERROR("Unlinking XML session configuration.");
}
if (file_opened) {
- ret = close(fd);
- if (ret) {
+ int closeret;
+
+ closeret = close(fd);
+ if (closeret) {
PERROR("Closing XML session configuration");
}
}
session_lock(session);
ret = save_session(session, attr, creds);
session_unlock(session);
- if (ret) {
+ if (ret != LTTNG_OK) {
goto end;
}
} else {
session_unlock(session);
/* Don't abort if we don't have the required permissions. */
- if (ret && ret != LTTNG_ERR_EPERM) {
+ if (ret != LTTNG_OK && ret != LTTNG_ERR_EPERM) {
goto end;
}
}
projects / lttng-tools.git / blobdiff