#include "kernel.h"
#include "save.h"
#include "session.h"
-#include "syscall.h"
+#include "lttng-syscall.h"
#include "trace-ust.h"
#include "agent.h"
if (ret) {
goto end;
}
+
+ if (attr->extended.ptr) {
+ struct lttng_channel_extended *ext = NULL;
+
+ ext = (struct lttng_channel_extended *) attr->extended.ptr;
+ ret = config_writer_write_element_unsigned_int(writer,
+ config_element_monitor_timer_interval,
+ ext->monitor_timer_interval);
+ if (ret) {
+ goto end;
+ }
+
+ ret = config_writer_write_element_signed_int(writer,
+ config_element_blocking_timeout,
+ ext->blocking_timeout);
+ if (ret) {
+ goto end;
+ }
+ }
+
end:
return ret ? LTTNG_ERR_SAVE_IO_FAIL : 0;
}
struct lttng_ust_channel_attr *attr)
{
int ret;
+ struct ltt_ust_channel *channel = NULL;
ret = config_writer_write_element_string(writer,
config_element_overwrite_mode,
if (ret) {
goto end;
}
+
+ ret = config_writer_write_element_signed_int(writer,
+ config_element_blocking_timeout,
+ attr->u.s.blocking_timeout);
+ if (ret) {
+ goto end;
+ }
+
+ /*
+ * Fetch the monitor timer which is located in the parent of
+ * lttng_ust_channel_attr
+ */
+ channel = caa_container_of(attr, struct ltt_ust_channel, attr);
+ ret = config_writer_write_element_unsigned_int(writer,
+ config_element_monitor_timer_interval,
+ channel->monitor_timer_interval);
+ if (ret) {
+ goto end;
+ }
+
end:
return ret ? LTTNG_ERR_SAVE_IO_FAIL : 0;
}
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_UPROBE:
+ instrumentation_string = config_event_type_userspace_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;
+ case LTTNG_KERNEL_CONTEXT_CALLSTACK_USER:
+ context_type_string = config_event_context_callstack_user;
+ break;
+ case LTTNG_KERNEL_CONTEXT_CALLSTACK_KERNEL:
+ context_type_string = config_event_context_callstack_kernel;
+ 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
return loglevel_type_string;
}
+static
+int save_kernel_function_event(struct config_writer *writer,
+ struct ltt_kernel_event *event)
+{
+ int ret;
+
+ ret = config_writer_open_element(writer, config_element_function_attributes);
+ if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+
+ ret = config_writer_write_element_string(writer, config_element_name,
+ event->event->u.ftrace.symbol_name);
+ if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+
+ /* /function attributes */
+ ret = config_writer_close_element(writer);
+ if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+end:
+ return ret;
+}
+
+static
+int save_kernel_kprobe_event(struct config_writer *writer,
+ struct ltt_kernel_event *event)
+{
+ int ret;
+ const char *symbol_name;
+ uint64_t addr;
+ uint64_t offset;
+
+ switch (event->event->instrumentation) {
+ case LTTNG_KERNEL_KPROBE:
+ /*
+ * Comments in lttng-kernel.h mention that
+ * either addr or symbol_name are set, not both.
+ */
+ addr = event->event->u.kprobe.addr;
+ offset = event->event->u.kprobe.offset;
+ symbol_name = addr ? NULL : event->event->u.kprobe.symbol_name;
+ break;
+ case LTTNG_KERNEL_KRETPROBE:
+ addr = event->event->u.kretprobe.addr;
+ offset = event->event->u.kretprobe.offset;
+ symbol_name = addr ? NULL : event->event->u.kretprobe.symbol_name;
+ break;
+ default:
+ assert(1);
+ ERR("Unsupported kernel instrumentation type.");
+ ret = LTTNG_ERR_INVALID;
+ goto end;
+ }
+
+ ret = config_writer_open_element(writer, config_element_probe_attributes);
+ if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+
+ if (addr) {
+ ret = config_writer_write_element_unsigned_int( writer,
+ config_element_address, addr);
+ if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+ } else if (symbol_name) {
+ ret = config_writer_write_element_string(writer,
+ config_element_symbol_name, symbol_name);
+ if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+ /* If the offset is non-zero, write it.*/
+ if (offset) {
+ ret = config_writer_write_element_unsigned_int(writer,
+ config_element_offset, offset);
+ if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+ }
+ } else {
+ /*
+ * This really should not happen as we are either setting the
+ * address or the symbol above.
+ */
+ ERR("Invalid probe/function description.");
+ ret = LTTNG_ERR_INVALID;
+ goto end;
+ }
+
+
+ ret = config_writer_close_element(writer);
+ if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+end:
+ return ret;
+}
+
+/*
+ * Save the userspace probe tracepoint event associated with the event to the
+ * config writer.
+ */
+static
+int save_kernel_userspace_probe_tracepoint_event(struct config_writer *writer,
+ struct ltt_kernel_event *event)
+{
+ int ret = 0;
+ const char *probe_name, *provider_name, *binary_path;
+ const struct lttng_userspace_probe_location *userspace_probe_location;
+ const struct lttng_userspace_probe_location_lookup_method *lookup_method;
+ enum lttng_userspace_probe_location_lookup_method_type lookup_type;
+
+ /* Get userspace probe location from the event. */
+ userspace_probe_location = event->userspace_probe_location;
+ if (!userspace_probe_location) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+
+ /* Get lookup method and lookup method type. */
+ lookup_method = lttng_userspace_probe_location_get_lookup_method(userspace_probe_location);
+ if (!lookup_method) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+
+ lookup_type = lttng_userspace_probe_location_lookup_method_get_type(lookup_method);
+
+ /* Get the binary path, probe name and provider name. */
+ binary_path =
+ lttng_userspace_probe_location_tracepoint_get_binary_path(
+ userspace_probe_location);
+ if (!binary_path) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+
+ probe_name =
+ lttng_userspace_probe_location_tracepoint_get_probe_name(
+ userspace_probe_location);
+ if (!probe_name) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+
+ provider_name =
+ lttng_userspace_probe_location_tracepoint_get_provider_name(
+ userspace_probe_location);
+ if (!provider_name) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+
+ /* Open a userspace probe tracepoint attribute. */
+ ret = config_writer_open_element(writer, config_element_userspace_probe_tracepoint_attributes);
+ if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+
+ switch (lookup_type) {
+ case LTTNG_USERSPACE_PROBE_LOCATION_LOOKUP_METHOD_TYPE_TRACEPOINT_SDT:
+ ret = config_writer_write_element_string(writer,
+ config_element_userspace_probe_lookup,
+ config_element_userspace_probe_lookup_tracepoint_sdt);
+ if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+ break;
+ default:
+ ERR("Unsupported kernel userspace probe tracepoint lookup method.");
+ ret = LTTNG_ERR_INVALID;
+ goto end;
+ }
+
+ /* Write the binary path, provider name and the probe name. */
+ ret = config_writer_write_element_string(writer,
+ config_element_userspace_probe_location_binary_path,
+ binary_path);
+ if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+
+ ret = config_writer_write_element_string(writer,
+ config_element_userspace_probe_tracepoint_location_provider_name,
+ provider_name);
+ if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+
+ ret = config_writer_write_element_string(writer,
+ config_element_userspace_probe_tracepoint_location_probe_name,
+ probe_name);
+ if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+
+ /* Close the userspace probe tracepoint attribute. */
+ ret = config_writer_close_element(writer);
+ if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+
+end:
+ return ret;
+}
+
+/*
+ * Save the userspace probe function event associated with the event to the
+ * config writer.
+ */
+static
+int save_kernel_userspace_probe_function_event(struct config_writer *writer,
+ struct ltt_kernel_event *event)
+{
+ int ret = 0;
+ const char *function_name, *binary_path;
+ const struct lttng_userspace_probe_location *userspace_probe_location;
+ const struct lttng_userspace_probe_location_lookup_method *lookup_method;
+ enum lttng_userspace_probe_location_lookup_method_type lookup_type;
+
+ /* Get userspace probe location from the event. */
+ userspace_probe_location = event->userspace_probe_location;
+ if (!userspace_probe_location) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+
+ /* Get lookup method and lookup method type. */
+ lookup_method = lttng_userspace_probe_location_get_lookup_method(
+ userspace_probe_location);
+ if (!lookup_method) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+
+ /* Get the binary path and the function name. */
+ binary_path =
+ lttng_userspace_probe_location_function_get_binary_path(
+ userspace_probe_location);
+ if (!binary_path) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+
+ function_name =
+ lttng_userspace_probe_location_function_get_function_name(
+ userspace_probe_location);
+ if (!function_name) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+
+ /* Open a userspace probe function attribute. */
+ ret = config_writer_open_element(writer,
+ config_element_userspace_probe_function_attributes);
+ if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+
+ lookup_type = lttng_userspace_probe_location_lookup_method_get_type(lookup_method);
+ switch (lookup_type) {
+ case LTTNG_USERSPACE_PROBE_LOCATION_LOOKUP_METHOD_TYPE_FUNCTION_ELF:
+ ret = config_writer_write_element_string(writer,
+ config_element_userspace_probe_lookup,
+ config_element_userspace_probe_lookup_function_elf);
+ if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+ break;
+ case LTTNG_USERSPACE_PROBE_LOCATION_LOOKUP_METHOD_TYPE_FUNCTION_DEFAULT:
+ ret = config_writer_write_element_string(writer,
+ config_element_userspace_probe_lookup,
+ config_element_userspace_probe_lookup_function_default);
+ if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+ break;
+ default:
+ ERR("Unsupported kernel userspace probe function lookup method.");
+ ret = LTTNG_ERR_INVALID;
+ goto end;
+ }
+
+ /* Write the binary path and the function name. */
+ ret = config_writer_write_element_string(writer,
+ config_element_userspace_probe_location_binary_path,
+ binary_path);
+ if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+
+ ret = config_writer_write_element_string(writer,
+ config_element_userspace_probe_function_location_function_name,
+ function_name);
+ if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+
+ /* Close the userspace probe function attribute. */
+ ret = config_writer_close_element(writer);
+ if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+
+end:
+ return ret;
+}
+
+static
+int save_kernel_userspace_probe_event(struct config_writer *writer,
+ struct ltt_kernel_event *event)
+{
+ int ret;
+ struct lttng_userspace_probe_location *userspace_probe_location;
+
+ /* Get userspace probe location from the event. */
+ userspace_probe_location = event->userspace_probe_location;
+ if (!userspace_probe_location) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+
+ switch(lttng_userspace_probe_location_get_type(userspace_probe_location)) {
+ case LTTNG_USERSPACE_PROBE_LOCATION_TYPE_FUNCTION:
+ {
+ ret = save_kernel_userspace_probe_function_event(writer, event);
+ if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+ break;
+ }
+ case LTTNG_USERSPACE_PROBE_LOCATION_TYPE_TRACEPOINT:
+ {
+ ret = save_kernel_userspace_probe_tracepoint_event(writer, event);
+ if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+ break;
+ }
+ case LTTNG_USERSPACE_PROBE_LOCATION_TYPE_UNKNOWN:
+ default:
+ ERR("Unsupported kernel userspace probe location type.");
+ ret = LTTNG_ERR_INVALID;
+ goto end;
+ }
+
+end:
+ return ret;
+}
+
static
int save_kernel_event(struct config_writer *writer,
- struct ltt_kernel_event *event)
+ struct ltt_kernel_event *event)
{
int ret;
const char *instrumentation_type;
if (event->event->instrumentation == LTTNG_KERNEL_FUNCTION ||
event->event->instrumentation == LTTNG_KERNEL_KPROBE ||
+ event->event->instrumentation == LTTNG_KERNEL_UPROBE ||
event->event->instrumentation == LTTNG_KERNEL_KRETPROBE) {
- ret = config_writer_open_element(writer,
- config_element_attributes);
- if (ret) {
- ret = LTTNG_ERR_SAVE_IO_FAIL;
- goto end;
- }
-
- switch (event->event->instrumentation) {
- case LTTNG_KERNEL_SYSCALL:
- case LTTNG_KERNEL_FUNCTION:
- ret = config_writer_open_element(writer,
- config_element_function_attributes);
- if (ret) {
- ret = LTTNG_ERR_SAVE_IO_FAIL;
- goto end;
- }
-
- ret = config_writer_write_element_string(writer,
- config_element_name,
- event->event->u.ftrace.symbol_name);
- if (ret) {
- ret = LTTNG_ERR_SAVE_IO_FAIL;
- goto end;
- }
-
- /* /function attributes */
- ret = config_writer_close_element(writer);
+ ret = config_writer_open_element(writer,
+ config_element_attributes);
+ if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+
+ switch (event->event->instrumentation) {
+ case LTTNG_KERNEL_SYSCALL:
+ case LTTNG_KERNEL_FUNCTION:
+ ret = save_kernel_function_event(writer, event);
if (ret) {
- ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
}
break;
case LTTNG_KERNEL_KPROBE:
case LTTNG_KERNEL_KRETPROBE:
- {
- const char *symbol_name;
- uint64_t addr;
- uint64_t offset;
-
- if (event->event->instrumentation ==
- LTTNG_KERNEL_KPROBE) {
- /*
- * Comments in lttng-kernel.h mention that
- * either addr or symbol_name are set, not both.
- */
- addr = event->event->u.kprobe.addr;
- offset = event->event->u.kprobe.offset;
- symbol_name = addr ? NULL :
- event->event->u.kprobe.symbol_name;
- } else {
- symbol_name =
- event->event->u.kretprobe.symbol_name;
- addr = event->event->u.kretprobe.addr;
- offset = event->event->u.kretprobe.offset;
- }
-
- ret = config_writer_open_element(writer,
- config_element_probe_attributes);
+ ret = save_kernel_kprobe_event(writer, event);
if (ret) {
- ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
}
-
- if (symbol_name) {
- ret = config_writer_write_element_string(writer,
- config_element_symbol_name,
- symbol_name);
- if (ret) {
- ret = LTTNG_ERR_SAVE_IO_FAIL;
- goto end;
- }
- }
-
- if (addr) {
- ret = config_writer_write_element_unsigned_int(
- writer, config_element_address, addr);
- if (ret) {
- ret = LTTNG_ERR_SAVE_IO_FAIL;
- goto end;
- }
- }
-
- if (offset) {
- ret = config_writer_write_element_unsigned_int(
- writer, config_element_offset, offset);
- if (ret) {
- ret = LTTNG_ERR_SAVE_IO_FAIL;
- goto end;
- }
- }
-
- ret = config_writer_close_element(writer);
+ break;
+ case LTTNG_KERNEL_UPROBE:
+ ret = save_kernel_userspace_probe_event(writer, event);
if (ret) {
- ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
}
break;
- }
default:
ERR("Unsupported kernel instrumentation type.");
ret = LTTNG_ERR_INVALID;
return ret;
}
-static
-int save_kernel_syscall(struct config_writer *writer,
- struct ltt_kernel_channel *kchan)
-{
- int ret, i;
- ssize_t count;
- struct lttng_event *events = NULL;
-
- assert(writer);
- assert(kchan);
-
- count = syscall_list_channel(kchan, &events, 0);
- if (!count) {
- /* No syscalls, just gracefully return. */
- ret = 0;
- goto end;
- }
-
- for (i = 0; i < count; i++) {
- struct ltt_kernel_event *kevent;
-
- /* Create a temporary kevent in order to save it. */
- /*
- * TODO: struct lttng_event does not really work for a filter,
- * but unfortunately, it is exposed as external API (and used as
- * internal representation. Using NULL meanwhile.
- */
- kevent = trace_kernel_create_event(&events[i],
- NULL, NULL);
- if (!kevent) {
- ret = -ENOMEM;
- goto end;
- }
- /* Init list in order so the destroy call can del the node. */
- CDS_INIT_LIST_HEAD(&kevent->list);
-
- ret = save_kernel_event(writer, kevent);
- trace_kernel_destroy_event(kevent);
- if (ret) {
- goto end;
- }
- }
-
- /* Everything went well */
- ret = 0;
-
-end:
- free(events);
- return ret;
-}
-
static
int save_kernel_events(struct config_writer *writer,
struct ltt_kernel_channel *kchan)
}
}
- /* Save syscalls if any. */
- ret = save_kernel_syscall(writer, kchan);
- if (ret) {
- goto end;
- }
-
/* /events */
ret = config_writer_close_element(writer);
if (ret) {
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;
ust_event->enabled = agent_event->enabled;
ust_event->attr.instrumentation = LTTNG_UST_TRACEPOINT;
- strncpy(ust_event->attr.name, agent_event->name, LTTNG_SYMBOL_NAME_LEN);
+ 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;
static
int save_agent_events(struct config_writer *writer,
- struct ltt_ust_channel *chan,
struct agent *agent)
{
int ret;
}
if (ctx->ctx == LTTNG_KERNEL_CONTEXT_PERF_CPU_COUNTER) {
- ret = config_writer_open_element(writer, config_element_perf);
+ ret = config_writer_open_element(writer,
+ config_element_context_perf);
if (ret) {
ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
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;
-
-
ret = config_writer_open_element(writer,
config_element_context);
if (ret) {
goto end;
}
- if (ctx->ctx.ctx == LTTNG_UST_CONTEXT_PERF_THREAD_COUNTER) {
- /* Perf contexts are saved as event_perf_context_type */
- ret = config_writer_open_element(writer,
- config_element_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;
- }
- } else {
- /* 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_INVALID;
- 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;
- }
+ 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) {
+ goto end;
}
/* /context */
* the "agent" events associated with this channel and serialize
* them.
*/
- ret = save_agent_events(writer, ust_chan, agent);
+ ret = save_agent_events(writer, agent);
if (ret) {
goto end;
}
switch (output->type) {
case CONSUMER_DST_LOCAL:
ret = config_writer_write_element_string(writer,
- config_element_path, output->dst.trace_path);
+ config_element_path, output->dst.session_root_path);
if (ret) {
ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
return ret;
}
+static
+int save_session_rotation_schedule(struct config_writer *writer,
+ enum lttng_rotation_schedule_type type, uint64_t value)
+{
+ int ret = 0;
+ const char *element_name;
+ const char *value_name;
+
+ switch (type) {
+ case LTTNG_ROTATION_SCHEDULE_TYPE_PERIODIC:
+ element_name = config_element_rotation_schedule_periodic;
+ value_name = config_element_rotation_schedule_periodic_time_us;
+ break;
+ case LTTNG_ROTATION_SCHEDULE_TYPE_SIZE_THRESHOLD:
+ element_name = config_element_rotation_schedule_size_threshold;
+ value_name = config_element_rotation_schedule_size_threshold_bytes;
+ break;
+ default:
+ ret = -1;
+ goto end;
+ }
+
+ ret = config_writer_open_element(writer, element_name);
+ if (ret) {
+ goto end;
+ }
+
+ ret = config_writer_write_element_unsigned_int(writer,
+ value_name, value);
+ if (ret) {
+ goto end;
+ }
+
+ /* Close schedule descriptor element. */
+ ret = config_writer_close_element(writer);
+ if (ret) {
+ goto end;
+ }
+end:
+ return ret;
+}
+
+static
+int save_session_rotation_schedules(struct config_writer *writer,
+ struct ltt_session *session)
+{
+ int ret;
+
+ ret = config_writer_open_element(writer,
+ config_element_rotation_schedules);
+ if (session->rotate_timer_period) {
+ ret = save_session_rotation_schedule(writer,
+ LTTNG_ROTATION_SCHEDULE_TYPE_PERIODIC,
+ session->rotate_timer_period);
+ if (ret) {
+ goto close_schedules;
+ }
+ }
+ if (session->rotate_size) {
+ ret = save_session_rotation_schedule(writer,
+ LTTNG_ROTATION_SCHEDULE_TYPE_SIZE_THRESHOLD,
+ session->rotate_size);
+ if (ret) {
+ goto close_schedules;
+ }
+ }
+
+close_schedules:
+ /* Close rotation schedules element. */
+ ret = config_writer_close_element(writer);
+ if (ret) {
+ goto end;
+ }
+end:
+ return ret;
+}
+
/*
* Save the given session.
*
goto end;
}
- if (session->snapshot_mode || session->live_timer) {
+ if (session->snapshot_mode || session->live_timer ||
+ session->rotate_timer_period || session->rotate_size) {
ret = config_writer_open_element(writer, config_element_attributes);
if (ret) {
ret = LTTNG_ERR_SAVE_IO_FAIL;
ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
}
- } else {
+ } else if (session->live_timer) {
ret = config_writer_write_element_unsigned_int(writer,
config_element_live_timer_interval, session->live_timer);
if (ret) {
goto end;
}
}
+ if (session->rotate_timer_period || session->rotate_size) {
+ ret = save_session_rotation_schedules(writer,
+ session);
+ if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+ }
/* /attributes */
ret = config_writer_close_element(writer);
}
}
+ if (file_opened) {
+ ret = close(fd);
+ if (ret) {
+ PERROR("Closing XML session configuration");
+ }
+ }
+
return ret;
}
projects / lttng-tools.git / blobdiff