* Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#define _GNU_SOURCE
+#define _LGPL_SOURCE
#include <assert.h>
#include <inttypes.h>
#include <string.h>
#include <common/defaults.h>
#include <common/error.h>
-#include <common/config/config.h>
-#include <common/config/config-session-internal.h>
+#include <common/config/session-config.h>
#include <common/utils.h>
#include <common/runas.h>
#include <lttng/save-internal.h>
+#include "kernel.h"
#include "save.h"
#include "session.h"
+#include "syscall.h"
#include "trace-ust.h"
+#include "agent.h"
static
int save_kernel_channel_attributes(struct config_writer *writer,
instrumentation_string = config_event_type_tracepoint;
break;
case LTTNG_KERNEL_KPROBE:
- instrumentation_string = config_event_type_kprobe;
+ instrumentation_string = config_event_type_probe;
break;
case LTTNG_KERNEL_FUNCTION:
- instrumentation_string = config_event_type_function;
+ instrumentation_string = config_event_type_function_entry;
break;
case LTTNG_KERNEL_KRETPROBE:
- instrumentation_string = config_event_type_kretprobe;
+ instrumentation_string = config_event_type_function;
break;
case LTTNG_KERNEL_NOOP:
instrumentation_string = config_event_type_noop;
case LTTNG_KERNEL_CONTEXT_HOSTNAME:
context_type_string = config_event_context_hostname;
break;
+ case LTTNG_KERNEL_CONTEXT_INTERRUPTIBLE:
+ context_type_string = config_event_context_interruptible;
+ break;
+ case LTTNG_KERNEL_CONTEXT_PREEMPTIBLE:
+ context_type_string = config_event_context_preemptible;
+ break;
+ case LTTNG_KERNEL_CONTEXT_NEED_RESCHEDULE:
+ context_type_string = config_event_context_need_reschedule;
+ break;
+ case LTTNG_KERNEL_CONTEXT_MIGRATABLE:
+ context_type_string = config_event_context_migratable;
+ break;
default:
context_type_string = NULL;
}
case LTTNG_UST_CONTEXT_PTHREAD_ID:
context_type_string = config_event_context_pthread_id;
break;
+ case LTTNG_UST_CONTEXT_APP_CONTEXT:
+ context_type_string = config_event_context_app;
+ break;
+ case LTTNG_UST_CONTEXT_PERF_THREAD_COUNTER:
+ /*
+ * Error, should not be stored in the XML, perf contexts
+ * are stored as a node of type event_perf_context_type.
+ */
default:
context_type_string = NULL;
+ break;
}
return context_type_string;
goto end;
}
+ if (event->filter_expression) {
+ ret = config_writer_write_element_string(writer,
+ config_element_filter,
+ event->filter_expression);
+ if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+ }
+
if (event->event->instrumentation == LTTNG_KERNEL_FUNCTION ||
event->event->instrumentation == LTTNG_KERNEL_KPROBE ||
event->event->instrumentation == LTTNG_KERNEL_KRETPROBE) {
}
switch (event->event->instrumentation) {
+ case LTTNG_KERNEL_SYSCALL:
case LTTNG_KERNEL_FUNCTION:
ret = config_writer_open_element(writer,
config_element_function_attributes);
static
int save_kernel_events(struct config_writer *writer,
- struct ltt_kernel_event_list *event_list)
+ struct ltt_kernel_channel *kchan)
{
int ret;
struct ltt_kernel_event *event;
goto end;
}
- cds_list_for_each_entry(event, &event_list->head, list) {
+ cds_list_for_each_entry(event, &kchan->events_list.head, list) {
ret = save_kernel_event(writer, event);
if (ret) {
goto end;
goto end;
}
- ret = config_writer_write_element_signed_int(writer,
- config_element_loglevel, event->attr.loglevel);
- if (ret) {
- ret = LTTNG_ERR_SAVE_IO_FAIL;
- goto end;
+ /* The log level is irrelevant if no "filtering" is enabled */
+ if (event->attr.loglevel_type != LTTNG_UST_LOGLEVEL_ALL) {
+ ret = config_writer_write_element_signed_int(writer,
+ config_element_loglevel, event->attr.loglevel);
+ if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
}
if (event->filter_expression) {
for (i = 0; i < event->exclusion->count; i++) {
ret = config_writer_write_element_string(writer,
config_element_exclusion,
- &event->exclusion->names[0][i]);
+ LTTNG_EVENT_EXCLUSION_NAME_AT(
+ event->exclusion, i));
if (ret) {
ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
cds_lfht_for_each_entry(events->ht, &iter.iter, node, node) {
event = caa_container_of(node, struct ltt_ust_event, node);
+ if (event->internal) {
+ /* Internal events must not be exposed to clients */
+ continue;
+ }
ret = save_ust_event(writer, event);
if (ret) {
rcu_read_unlock();
}
static
-int save_kernel_context(struct config_writer *writer,
- struct lttng_kernel_context *ctx)
+int init_ust_event_from_agent_event(struct ltt_ust_event *ust_event,
+ struct agent_event *agent_event)
{
int ret = 0;
+ enum lttng_ust_loglevel_type ust_loglevel_type;
- if (!ctx) {
+ 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;
+ goto end;
+ }
+ switch (agent_event->loglevel_type) {
+ case LTTNG_EVENT_LOGLEVEL_ALL:
+ ust_loglevel_type = LTTNG_UST_LOGLEVEL_ALL;
+ break;
+ case LTTNG_EVENT_LOGLEVEL_SINGLE:
+ ust_loglevel_type = LTTNG_UST_LOGLEVEL_SINGLE;
+ break;
+ case LTTNG_EVENT_LOGLEVEL_RANGE:
+ ust_loglevel_type = LTTNG_UST_LOGLEVEL_RANGE;
+ break;
+ default:
+ ERR("Invalid agent_event loglevel_type.");
+ ret = -1;
goto end;
}
- ret = config_writer_open_element(writer, config_element_contexts);
+ ust_event->attr.loglevel_type = ust_loglevel_type;
+ ust_event->attr.loglevel = agent_event->loglevel_value;
+ ust_event->filter_expression = agent_event->filter_expression;
+ ust_event->exclusion = agent_event->exclusion;
+end:
+ return ret;
+}
+
+static
+int save_agent_events(struct config_writer *writer,
+ struct ltt_ust_channel *chan,
+ struct agent *agent)
+{
+ int ret;
+ struct lttng_ht_iter iter;
+ struct lttng_ht_node_str *node;
+
+ ret = config_writer_open_element(writer, config_element_events);
if (ret) {
ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
}
+ rcu_read_lock();
+ cds_lfht_for_each_entry(agent->events->ht, &iter.iter, node, node) {
+ int ret;
+ struct agent_event *agent_event;
+ struct ltt_ust_event fake_event;
+
+ memset(&fake_event, 0, sizeof(fake_event));
+ agent_event = caa_container_of(node, struct agent_event, node);
+
+ /*
+ * Initialize a fake ust event to reuse the same serialization
+ * function since UST and agent events contain the same info
+ * (and one could wonder why they don't reuse the same
+ * structures...).
+ */
+ ret = init_ust_event_from_agent_event(&fake_event, agent_event);
+ if (ret) {
+ rcu_read_unlock();
+ goto end;
+ }
+ ret = save_ust_event(writer, &fake_event);
+ if (ret) {
+ rcu_read_unlock();
+ goto end;
+ }
+ }
+ rcu_read_unlock();
+
+ /* /events */
+ ret = config_writer_close_element(writer);
+ if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+end:
+ return ret;
+}
+
+static
+int save_kernel_context(struct config_writer *writer,
+ struct lttng_kernel_context *ctx)
+{
+ int ret = 0;
+
+ if (!ctx) {
+ goto end;
+ }
+
ret = config_writer_open_element(writer, config_element_context);
if (ret) {
ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
}
- if (ctx->ctx == LTTNG_KERNEL_CONTEXT_PERF_COUNTER) {
- ret = config_writer_open_element(writer, config_element_perf);
+ if (ctx->ctx == LTTNG_KERNEL_CONTEXT_PERF_CPU_COUNTER) {
+ ret = config_writer_open_element(writer,
+ config_element_context_perf);
if (ret) {
ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
goto end;
}
+end:
+ return ret;
+}
+
+static
+int save_kernel_contexts(struct config_writer *writer,
+ struct ltt_kernel_channel *kchan)
+{
+ int ret;
+ struct ltt_kernel_context *ctx;
+
+ if (cds_list_empty(&kchan->ctx_list)) {
+ ret = 0;
+ goto end;
+ }
+
+ ret = config_writer_open_element(writer, config_element_contexts);
+ if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+
+ cds_list_for_each_entry(ctx, &kchan->ctx_list, list) {
+ ret = save_kernel_context(writer, &ctx->ctx);
+ if (ret) {
+ goto end;
+ }
+ }
+
/* /contexts */
ret = config_writer_close_element(writer);
if (ret) {
return ret;
}
+static
+int save_ust_context_perf_thread_counter(struct config_writer *writer,
+ struct ltt_ust_context *ctx)
+{
+ int ret;
+
+ assert(writer);
+ assert(ctx);
+
+ /* Perf contexts are saved as event_perf_context_type */
+ ret = config_writer_open_element(writer, config_element_context_perf);
+ if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+
+ ret = config_writer_write_element_unsigned_int(writer,
+ config_element_type, ctx->ctx.u.perf_counter.type);
+ if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+
+ ret = config_writer_write_element_unsigned_int(writer,
+ config_element_config, ctx->ctx.u.perf_counter.config);
+ if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+
+ ret = config_writer_write_element_string(writer, config_element_name,
+ ctx->ctx.u.perf_counter.name);
+ if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+
+ /* /perf */
+ ret = config_writer_close_element(writer);
+ if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+end:
+ return ret;
+}
+
+static
+int save_ust_context_app_ctx(struct config_writer *writer,
+ struct ltt_ust_context *ctx)
+{
+ int ret;
+
+ assert(writer);
+ assert(ctx);
+
+ /* Application contexts are saved as application_context_type */
+ ret = config_writer_open_element(writer, config_element_context_app);
+ if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+
+ ret = config_writer_write_element_string(writer,
+ config_element_context_app_provider_name,
+ ctx->ctx.u.app_ctx.provider_name);
+ if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+
+ ret = config_writer_write_element_string(writer,
+ config_element_context_app_ctx_name,
+ ctx->ctx.u.app_ctx.ctx_name);
+ if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+
+ /* /app */
+ ret = config_writer_close_element(writer);
+ if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+end:
+ return ret;
+}
+
+static
+int save_ust_context_generic(struct config_writer *writer,
+ struct ltt_ust_context *ctx)
+{
+ int ret;
+ const char *context_type_string;
+
+ assert(writer);
+ assert(ctx);
+
+ /* Save context as event_context_type_type */
+ context_type_string = get_ust_context_type_string(
+ ctx->ctx.ctx);
+ if (!context_type_string) {
+ ERR("Unsupported UST context type.");
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+
+ ret = config_writer_write_element_string(writer,
+ config_element_type, context_type_string);
+ if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+end:
+ return ret;
+}
+
static
int save_ust_context(struct config_writer *writer,
struct cds_list_head *ctx_list)
}
cds_list_for_each_entry(ctx, ctx_list, list) {
- const char *context_type_string;
-
- context_type_string = get_ust_context_type_string(ctx->ctx.ctx);
- if (!context_type_string) {
- ERR("Unsupported UST context type.")
- ret = LTTNG_ERR_INVALID;
- goto end;
- }
-
ret = config_writer_open_element(writer,
config_element_context);
if (ret) {
goto end;
}
- ret = config_writer_write_element_string(writer,
- config_element_type, context_type_string);
+ switch (ctx->ctx.ctx) {
+ case LTTNG_UST_CONTEXT_PERF_THREAD_COUNTER:
+ ret = save_ust_context_perf_thread_counter(writer, ctx);
+ break;
+ case LTTNG_UST_CONTEXT_APP_CONTEXT:
+ ret = save_ust_context_app_ctx(writer, ctx);
+ break;
+ default:
+ /* Save generic context. */
+ ret = save_ust_context_generic(writer, ctx);
+ }
if (ret) {
- ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
}
goto end;
}
- ret = save_kernel_events(writer, &kchan->events_list);
+ ret = save_kernel_events(writer, kchan);
if (ret) {
goto end;
}
- ret = save_kernel_context(writer, kchan->ctx);
+ ret = save_kernel_contexts(writer, kchan);
if (ret) {
goto end;
}
goto end;
}
- ret = save_ust_events(writer, ust_chan->events);
- if (ret) {
- ret = LTTNG_ERR_SAVE_IO_FAIL;
- goto end;
+ if (ust_chan->domain == LTTNG_DOMAIN_UST) {
+ ret = save_ust_events(writer, ust_chan->events);
+ if (ret) {
+ goto end;
+ }
+ } else {
+ struct agent *agent = NULL;
+
+ agent = trace_ust_find_agent(session, ust_chan->domain);
+ if (!agent) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ ERR("Could not find agent associated to UST subdomain");
+ goto end;
+ }
+
+ /*
+ * Channels associated with a UST sub-domain (such as JUL, Log4j
+ * or Python) don't have any non-internal events. We retrieve
+ * the "agent" events associated with this channel and serialize
+ * them.
+ */
+ ret = save_agent_events(writer, ust_chan, agent);
+ if (ret) {
+ goto end;
+ }
}
ret = save_ust_context(writer, &ust_chan->ctx_list);
}
static
-int save_ust_session(struct config_writer *writer,
- struct ltt_session *session, int save_jul)
+const char *get_config_domain_str(enum lttng_domain_type domain)
+{
+ const char *str_dom;
+
+ switch (domain) {
+ case LTTNG_DOMAIN_KERNEL:
+ str_dom = config_domain_type_kernel;
+ break;
+ case LTTNG_DOMAIN_UST:
+ str_dom = config_domain_type_ust;
+ break;
+ case LTTNG_DOMAIN_JUL:
+ str_dom = config_domain_type_jul;
+ break;
+ case LTTNG_DOMAIN_LOG4J:
+ str_dom = config_domain_type_log4j;
+ break;
+ case LTTNG_DOMAIN_PYTHON:
+ str_dom = config_domain_type_python;
+ break;
+ default:
+ assert(0);
+ }
+
+ return str_dom;
+}
+
+static
+int save_pid_tracker(struct config_writer *writer,
+ struct ltt_session *sess, int domain)
+{
+ int ret = 0;
+ ssize_t nr_pids = 0, i;
+ int32_t *pids = NULL;
+
+ switch (domain) {
+ case LTTNG_DOMAIN_KERNEL:
+ {
+ nr_pids = kernel_list_tracker_pids(sess->kernel_session, &pids);
+ if (nr_pids < 0) {
+ ret = LTTNG_ERR_KERN_LIST_FAIL;
+ goto end;
+ }
+ break;
+ }
+ case LTTNG_DOMAIN_UST:
+ {
+ nr_pids = trace_ust_list_tracker_pids(sess->ust_session, &pids);
+ if (nr_pids < 0) {
+ ret = LTTNG_ERR_UST_LIST_FAIL;
+ goto end;
+ }
+ break;
+ }
+ case LTTNG_DOMAIN_JUL:
+ case LTTNG_DOMAIN_LOG4J:
+ case LTTNG_DOMAIN_PYTHON:
+ default:
+ ret = LTTNG_ERR_UNKNOWN_DOMAIN;
+ goto end;
+ }
+
+ /* Only create a pid_tracker if enabled or untrack all */
+ if (nr_pids != 1 || (nr_pids == 1 && pids[0] != -1)) {
+ ret = config_writer_open_element(writer,
+ config_element_pid_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;
+ }
+
+ for (i = 0; i < nr_pids; i++) {
+ ret = config_writer_open_element(writer,
+ config_element_target_pid);
+ if (ret) {
+ 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 */
+ 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;
+ }
+ }
+end:
+ free(pids);
+ return ret;
+}
+
+static
+int save_ust_domain(struct config_writer *writer,
+ struct ltt_session *session, enum lttng_domain_type domain)
{
int ret;
struct ltt_ust_channel *ust_chan;
const char *buffer_type_string;
struct lttng_ht_node_str *node;
struct lttng_ht_iter iter;
+ const char *config_domain_name;
assert(writer);
assert(session);
- ret = config_writer_write_element_string(writer, config_element_type,
- save_jul ? config_domain_type_jul : config_domain_type_ust);
+ ret = config_writer_open_element(writer,
+ config_element_domain);
+ if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+
+ config_domain_name = get_config_domain_str(domain);
+ if (!config_domain_name) {
+ ret = LTTNG_ERR_INVALID;
+ goto end;
+ }
+
+ ret = config_writer_write_element_string(writer,
+ config_element_type, config_domain_name);
if (ret) {
ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
rcu_read_lock();
cds_lfht_for_each_entry(session->ust_session->domain_global.channels->ht,
&iter.iter, node, node) {
- int jul_channel;
-
ust_chan = caa_container_of(node, struct ltt_ust_channel, node);
- jul_channel = !strcmp(DEFAULT_JUL_CHANNEL_NAME, ust_chan->name);
- if (!(save_jul ^ jul_channel)) {
+ if (domain == ust_chan->domain) {
ret = save_ust_channel(writer, ust_chan, session->ust_session);
if (ret) {
rcu_read_unlock();
ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
}
+
+ if (domain == LTTNG_DOMAIN_UST) {
+ ret = config_writer_open_element(writer,
+ config_element_trackers);
+ if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+
+ ret = save_pid_tracker(writer, session, LTTNG_DOMAIN_UST);
+ if (ret) {
+ goto end;
+ }
+
+ /* /trackers */
+ ret = config_writer_close_element(writer);
+ if (ret) {
+ goto end;
+ }
+ }
+
+ /* /domain */
+ ret = config_writer_close_element(writer);
+ if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+
end:
return ret;
}
goto end;
}
- /* /domain */
- ret = config_writer_close_element(writer);
+ ret = config_writer_open_element(writer,
+ config_element_trackers);
if (ret) {
ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
}
- }
- if (session->ust_session) {
- ret = config_writer_open_element(writer,
- config_element_domain);
+ ret = save_pid_tracker(writer, session, LTTNG_DOMAIN_KERNEL);
if (ret) {
- ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
}
- ret = save_ust_session(writer, session, 0);
+ /* /trackers */
+ ret = config_writer_close_element(writer);
if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
}
-
/* /domain */
ret = config_writer_close_element(writer);
if (ret) {
}
}
- if (session->ust_session &&
- session->ust_session->domain_jul.being_used) {
- ret = config_writer_open_element(writer,
- config_element_domain);
+ if (session->ust_session) {
+ ret = save_ust_domain(writer, session, LTTNG_DOMAIN_UST);
if (ret) {
- ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
}
- ret = save_ust_session(writer, session, 1);
+ ret = save_ust_domain(writer, session, LTTNG_DOMAIN_JUL);
if (ret) {
goto end;
}
- /* /domain */
- ret = config_writer_close_element(writer);
+ ret = save_ust_domain(writer, session, LTTNG_DOMAIN_LOG4J);
+ if (ret) {
+ goto end;
+ }
+
+ ret = save_ust_domain(writer, session, LTTNG_DOMAIN_PYTHON);
if (ret) {
- ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
}
}
struct lttng_save_session_attr *attr, lttng_sock_cred *creds)
{
int ret, fd;
+ unsigned int file_opened = 0; /* Indicate if the file has been opened */
char config_file_path[PATH_MAX];
size_t len;
struct config_writer *writer = NULL;
assert(creds);
session_name_len = strlen(session->name);
+ memset(config_file_path, 0, sizeof(config_file_path));
if (!session_access_ok(session,
LTTNG_SOCK_GET_UID_CRED(creds),
provided_path = lttng_save_session_attr_get_output_url(attr);
if (provided_path) {
+ DBG3("Save session in provided path %s", provided_path);
len = strlen(provided_path);
if (len >= sizeof(config_file_path)) {
ret = LTTNG_ERR_SET_URL;
strncpy(config_file_path + len, session->name, session_name_len);
len += session_name_len;
strcpy(config_file_path + len, DEFAULT_SESSION_CONFIG_FILE_EXTENSION);
+ len += sizeof(DEFAULT_SESSION_CONFIG_FILE_EXTENSION);
+ config_file_path[len] = '\0';
if (!access(config_file_path, F_OK) && !attr->overwrite) {
- /* A file with the same name already exists, skip */
+ /* File exists, notify the user since the overwrite flag is off. */
+ ret = LTTNG_ERR_SAVE_FILE_EXIST;
goto end;
}
ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
}
+ file_opened = 1;
- writer = config_writer_create(fd);
+ writer = config_writer_create(fd, 1);
if (!writer) {
ret = LTTNG_ERR_NOMEM;
goto end;
goto end;
}
+ if(session->shm_path[0] != '\0') {
+ ret = config_writer_write_element_string(writer,
+ config_element_shared_memory_path,
+ session->shm_path);
+ if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+ }
+
ret = save_domains(writer, session);
if (ret) {
goto end;
}
ret = config_writer_write_element_bool(writer, config_element_started,
- session->enabled);
+ session->active);
if (ret) {
ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
goto end;
}
} else {
- ret = config_writer_write_element_signed_int(writer,
+ ret = config_writer_write_element_unsigned_int(writer,
config_element_live_timer_interval, session->live_timer);
if (ret) {
ret = LTTNG_ERR_SAVE_IO_FAIL;
}
if (ret) {
/* Delete file in case of error */
- if (unlink(config_file_path)) {
+ if (file_opened && unlink(config_file_path)) {
PERROR("Unlinking XML session configuration.");
}
}
+ if (file_opened) {
+ ret = close(fd);
+ if (ret) {
+ PERROR("Closing XML session configuration");
+ }
+ }
+
return ret;
}