#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;
}
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;
}
}
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 = event->event->u.kretprobe.symbol_name;
+ break;
+ default:
+ assert(1);
+ }
+
+ ret = config_writer_open_element(writer, config_element_probe_attributes);
+ 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);
+ if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+end:
+ return ret;
+}
int save_kernel_event(struct config_writer *writer,
- struct ltt_kernel_event *event)
+ struct ltt_kernel_event *event)
{
int ret;
const char *instrumentation_type;
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 = 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);
- if (ret) {
- ret = LTTNG_ERR_SAVE_IO_FAIL;
goto end;
}
break;
- }
default:
ERR("Unsupported kernel instrumentation type.");
ret = LTTNG_ERR_INVALID;
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;
* 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