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;
}
}
+ if (file_opened) {
+ ret = close(fd);
+ if (ret) {
+ PERROR("Closing XML session configuration");
+ }
+ }
+
return ret;
}