#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_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;
}
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) {
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;
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;
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) {
+ ret = config_writer_write_element_unsigned_int(writer,
+ config_element_rotation_timer_interval,
+ session->rotate_timer_period);
+ if (ret) {
+ ret = LTTNG_ERR_SAVE_IO_FAIL;
+ goto end;
+ }
+ }
+
+ if (session->rotate_size) {
+ ret = config_writer_write_element_unsigned_int(writer,
+ config_element_rotation_size,
+ session->rotate_size);
+ 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