X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fsave.c;h=f0a6e43d55e810ccb332667dfae8de39602af108;hb=2ddbdc7a9c2d62a7691578418d4e340c5b121972;hp=09194008a834ae2fc0111bee26bf7b89cf3b54ee;hpb=d37ac3cdc4fe21f117edfb829db4d0eb7cf914a1;p=lttng-tools.git diff --git a/src/bin/lttng-sessiond/save.c b/src/bin/lttng-sessiond/save.c index 09194008a..f0a6e43d5 100644 --- a/src/bin/lttng-sessiond/save.c +++ b/src/bin/lttng-sessiond/save.c @@ -6,7 +6,6 @@ */ #define _LGPL_SOURCE -#include #include #include #include @@ -134,7 +133,7 @@ end: /* Return LTTNG_OK on success else a LTTNG_ERR* code. */ static int save_ust_channel_attributes(struct config_writer *writer, - struct lttng_ust_channel_attr *attr) + struct lttng_ust_abi_channel_attr *attr) { int ret; struct ltt_ust_channel *channel = NULL; @@ -181,7 +180,7 @@ int save_ust_channel_attributes(struct config_writer *writer, ret = config_writer_write_element_string(writer, config_element_output_type, - attr->output == LTTNG_UST_MMAP ? + attr->output == LTTNG_UST_ABI_MMAP ? config_output_type_mmap : config_output_type_splice); if (ret) { ret = LTTNG_ERR_SAVE_IO_FAIL; @@ -216,33 +215,33 @@ end: static const char *get_kernel_instrumentation_string( - enum lttng_kernel_instrumentation instrumentation) + enum lttng_kernel_abi_instrumentation instrumentation) { const char *instrumentation_string; switch (instrumentation) { - case LTTNG_KERNEL_ALL: + case LTTNG_KERNEL_ABI_ALL: instrumentation_string = config_event_type_all; break; - case LTTNG_KERNEL_TRACEPOINT: + case LTTNG_KERNEL_ABI_TRACEPOINT: instrumentation_string = config_event_type_tracepoint; break; - case LTTNG_KERNEL_KPROBE: + case LTTNG_KERNEL_ABI_KPROBE: instrumentation_string = config_event_type_probe; break; - case LTTNG_KERNEL_UPROBE: + case LTTNG_KERNEL_ABI_UPROBE: instrumentation_string = config_event_type_userspace_probe; break; - case LTTNG_KERNEL_FUNCTION: + case LTTNG_KERNEL_ABI_FUNCTION: instrumentation_string = config_event_type_function_entry; break; - case LTTNG_KERNEL_KRETPROBE: + case LTTNG_KERNEL_ABI_KRETPROBE: instrumentation_string = config_event_type_function; break; - case LTTNG_KERNEL_NOOP: + case LTTNG_KERNEL_ABI_NOOP: instrumentation_string = config_event_type_noop; break; - case LTTNG_KERNEL_SYSCALL: + case LTTNG_KERNEL_ABI_SYSCALL: instrumentation_string = config_event_type_syscall; break; default: @@ -254,117 +253,117 @@ const char *get_kernel_instrumentation_string( static const char *get_kernel_context_type_string( - enum lttng_kernel_context_type context_type) + enum lttng_kernel_abi_context_type context_type) { const char *context_type_string; switch (context_type) { - case LTTNG_KERNEL_CONTEXT_PID: + case LTTNG_KERNEL_ABI_CONTEXT_PID: context_type_string = config_event_context_pid; break; - case LTTNG_KERNEL_CONTEXT_PROCNAME: + case LTTNG_KERNEL_ABI_CONTEXT_PROCNAME: context_type_string = config_event_context_procname; break; - case LTTNG_KERNEL_CONTEXT_PRIO: + case LTTNG_KERNEL_ABI_CONTEXT_PRIO: context_type_string = config_event_context_prio; break; - case LTTNG_KERNEL_CONTEXT_NICE: + case LTTNG_KERNEL_ABI_CONTEXT_NICE: context_type_string = config_event_context_nice; break; - case LTTNG_KERNEL_CONTEXT_VPID: + case LTTNG_KERNEL_ABI_CONTEXT_VPID: context_type_string = config_event_context_vpid; break; - case LTTNG_KERNEL_CONTEXT_TID: + case LTTNG_KERNEL_ABI_CONTEXT_TID: context_type_string = config_event_context_tid; break; - case LTTNG_KERNEL_CONTEXT_VTID: + case LTTNG_KERNEL_ABI_CONTEXT_VTID: context_type_string = config_event_context_vtid; break; - case LTTNG_KERNEL_CONTEXT_PPID: + case LTTNG_KERNEL_ABI_CONTEXT_PPID: context_type_string = config_event_context_ppid; break; - case LTTNG_KERNEL_CONTEXT_VPPID: + case LTTNG_KERNEL_ABI_CONTEXT_VPPID: context_type_string = config_event_context_vppid; break; - case LTTNG_KERNEL_CONTEXT_HOSTNAME: + case LTTNG_KERNEL_ABI_CONTEXT_HOSTNAME: context_type_string = config_event_context_hostname; break; - case LTTNG_KERNEL_CONTEXT_INTERRUPTIBLE: + case LTTNG_KERNEL_ABI_CONTEXT_INTERRUPTIBLE: context_type_string = config_event_context_interruptible; break; - case LTTNG_KERNEL_CONTEXT_PREEMPTIBLE: + case LTTNG_KERNEL_ABI_CONTEXT_PREEMPTIBLE: context_type_string = config_event_context_preemptible; break; - case LTTNG_KERNEL_CONTEXT_NEED_RESCHEDULE: + case LTTNG_KERNEL_ABI_CONTEXT_NEED_RESCHEDULE: context_type_string = config_event_context_need_reschedule; break; - case LTTNG_KERNEL_CONTEXT_MIGRATABLE: + case LTTNG_KERNEL_ABI_CONTEXT_MIGRATABLE: context_type_string = config_event_context_migratable; break; - case LTTNG_KERNEL_CONTEXT_CALLSTACK_USER: + case LTTNG_KERNEL_ABI_CONTEXT_CALLSTACK_USER: context_type_string = config_event_context_callstack_user; break; - case LTTNG_KERNEL_CONTEXT_CALLSTACK_KERNEL: + case LTTNG_KERNEL_ABI_CONTEXT_CALLSTACK_KERNEL: context_type_string = config_event_context_callstack_kernel; break; - case LTTNG_KERNEL_CONTEXT_CGROUP_NS: + case LTTNG_KERNEL_ABI_CONTEXT_CGROUP_NS: context_type_string = config_event_context_cgroup_ns; break; - case LTTNG_KERNEL_CONTEXT_IPC_NS: + case LTTNG_KERNEL_ABI_CONTEXT_IPC_NS: context_type_string = config_event_context_ipc_ns; break; - case LTTNG_KERNEL_CONTEXT_MNT_NS: + case LTTNG_KERNEL_ABI_CONTEXT_MNT_NS: context_type_string = config_event_context_mnt_ns; break; - case LTTNG_KERNEL_CONTEXT_NET_NS: + case LTTNG_KERNEL_ABI_CONTEXT_NET_NS: context_type_string = config_event_context_net_ns; break; - case LTTNG_KERNEL_CONTEXT_PID_NS: + case LTTNG_KERNEL_ABI_CONTEXT_PID_NS: context_type_string = config_event_context_pid_ns; break; - case LTTNG_KERNEL_CONTEXT_TIME_NS: + case LTTNG_KERNEL_ABI_CONTEXT_TIME_NS: context_type_string = config_event_context_time_ns; break; - case LTTNG_KERNEL_CONTEXT_USER_NS: + case LTTNG_KERNEL_ABI_CONTEXT_USER_NS: context_type_string = config_event_context_user_ns; break; - case LTTNG_KERNEL_CONTEXT_UTS_NS: + case LTTNG_KERNEL_ABI_CONTEXT_UTS_NS: context_type_string = config_event_context_uts_ns; break; - case LTTNG_KERNEL_CONTEXT_UID: + case LTTNG_KERNEL_ABI_CONTEXT_UID: context_type_string = config_event_context_uid; break; - case LTTNG_KERNEL_CONTEXT_EUID: + case LTTNG_KERNEL_ABI_CONTEXT_EUID: context_type_string = config_event_context_euid; break; - case LTTNG_KERNEL_CONTEXT_SUID: + case LTTNG_KERNEL_ABI_CONTEXT_SUID: context_type_string = config_event_context_suid; break; - case LTTNG_KERNEL_CONTEXT_GID: + case LTTNG_KERNEL_ABI_CONTEXT_GID: context_type_string = config_event_context_gid; break; - case LTTNG_KERNEL_CONTEXT_EGID: + case LTTNG_KERNEL_ABI_CONTEXT_EGID: context_type_string = config_event_context_egid; break; - case LTTNG_KERNEL_CONTEXT_SGID: + case LTTNG_KERNEL_ABI_CONTEXT_SGID: context_type_string = config_event_context_sgid; break; - case LTTNG_KERNEL_CONTEXT_VUID: + case LTTNG_KERNEL_ABI_CONTEXT_VUID: context_type_string = config_event_context_vuid; break; - case LTTNG_KERNEL_CONTEXT_VEUID: + case LTTNG_KERNEL_ABI_CONTEXT_VEUID: context_type_string = config_event_context_veuid; break; - case LTTNG_KERNEL_CONTEXT_VSUID: + case LTTNG_KERNEL_ABI_CONTEXT_VSUID: context_type_string = config_event_context_vsuid; break; - case LTTNG_KERNEL_CONTEXT_VGID: + case LTTNG_KERNEL_ABI_CONTEXT_VGID: context_type_string = config_event_context_vgid; break; - case LTTNG_KERNEL_CONTEXT_VEGID: + case LTTNG_KERNEL_ABI_CONTEXT_VEGID: context_type_string = config_event_context_vegid; break; - case LTTNG_KERNEL_CONTEXT_VSGID: + case LTTNG_KERNEL_ABI_CONTEXT_VSGID: context_type_string = config_event_context_vsgid; break; default: @@ -376,72 +375,72 @@ const char *get_kernel_context_type_string( static const char *get_ust_context_type_string( - enum lttng_ust_context_type context_type) + enum lttng_ust_abi_context_type context_type) { const char *context_type_string; switch (context_type) { - case LTTNG_UST_CONTEXT_PROCNAME: + case LTTNG_UST_ABI_CONTEXT_PROCNAME: context_type_string = config_event_context_procname; break; - case LTTNG_UST_CONTEXT_VPID: + case LTTNG_UST_ABI_CONTEXT_VPID: context_type_string = config_event_context_vpid; break; - case LTTNG_UST_CONTEXT_VTID: + case LTTNG_UST_ABI_CONTEXT_VTID: context_type_string = config_event_context_vtid; break; - case LTTNG_UST_CONTEXT_IP: + case LTTNG_UST_ABI_CONTEXT_IP: context_type_string = config_event_context_ip; break; - case LTTNG_UST_CONTEXT_PTHREAD_ID: + case LTTNG_UST_ABI_CONTEXT_PTHREAD_ID: context_type_string = config_event_context_pthread_id; break; - case LTTNG_UST_CONTEXT_APP_CONTEXT: + case LTTNG_UST_ABI_CONTEXT_APP_CONTEXT: context_type_string = config_event_context_app; break; - case LTTNG_UST_CONTEXT_CGROUP_NS: + case LTTNG_UST_ABI_CONTEXT_CGROUP_NS: context_type_string = config_event_context_cgroup_ns; break; - case LTTNG_UST_CONTEXT_IPC_NS: + case LTTNG_UST_ABI_CONTEXT_IPC_NS: context_type_string = config_event_context_ipc_ns; break; - case LTTNG_UST_CONTEXT_MNT_NS: + case LTTNG_UST_ABI_CONTEXT_MNT_NS: context_type_string = config_event_context_mnt_ns; break; - case LTTNG_UST_CONTEXT_NET_NS: + case LTTNG_UST_ABI_CONTEXT_NET_NS: context_type_string = config_event_context_net_ns; break; - case LTTNG_UST_CONTEXT_TIME_NS: + case LTTNG_UST_ABI_CONTEXT_TIME_NS: context_type_string = config_event_context_time_ns; break; - case LTTNG_UST_CONTEXT_PID_NS: + case LTTNG_UST_ABI_CONTEXT_PID_NS: context_type_string = config_event_context_pid_ns; break; - case LTTNG_UST_CONTEXT_USER_NS: + case LTTNG_UST_ABI_CONTEXT_USER_NS: context_type_string = config_event_context_user_ns; break; - case LTTNG_UST_CONTEXT_UTS_NS: + case LTTNG_UST_ABI_CONTEXT_UTS_NS: context_type_string = config_event_context_uts_ns; break; - case LTTNG_UST_CONTEXT_VUID: + case LTTNG_UST_ABI_CONTEXT_VUID: context_type_string = config_event_context_vuid; break; - case LTTNG_UST_CONTEXT_VEUID: + case LTTNG_UST_ABI_CONTEXT_VEUID: context_type_string = config_event_context_veuid; break; - case LTTNG_UST_CONTEXT_VSUID: + case LTTNG_UST_ABI_CONTEXT_VSUID: context_type_string = config_event_context_vsuid; break; - case LTTNG_UST_CONTEXT_VGID: + case LTTNG_UST_ABI_CONTEXT_VGID: context_type_string = config_event_context_vgid; break; - case LTTNG_UST_CONTEXT_VEGID: + case LTTNG_UST_ABI_CONTEXT_VEGID: context_type_string = config_event_context_vegid; break; - case LTTNG_UST_CONTEXT_VSGID: + case LTTNG_UST_ABI_CONTEXT_VSGID: context_type_string = config_event_context_vsgid; break; - case LTTNG_UST_CONTEXT_PERF_THREAD_COUNTER: + case LTTNG_UST_ABI_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. @@ -479,18 +478,18 @@ const char *get_buffer_type_string( static const char *get_loglevel_type_string( - enum lttng_ust_loglevel_type loglevel_type) + enum lttng_ust_abi_loglevel_type loglevel_type) { const char *loglevel_type_string; switch (loglevel_type) { - case LTTNG_UST_LOGLEVEL_ALL: + case LTTNG_UST_ABI_LOGLEVEL_ALL: loglevel_type_string = config_loglevel_type_all; break; - case LTTNG_UST_LOGLEVEL_RANGE: + case LTTNG_UST_ABI_LOGLEVEL_RANGE: loglevel_type_string = config_loglevel_type_range; break; - case LTTNG_UST_LOGLEVEL_SINGLE: + case LTTNG_UST_ABI_LOGLEVEL_SINGLE: loglevel_type_string = config_loglevel_type_single; break; default: @@ -540,7 +539,7 @@ int save_kernel_kprobe_event(struct config_writer *writer, uint64_t offset; switch (event->event->instrumentation) { - case LTTNG_KERNEL_KPROBE: + case LTTNG_KERNEL_ABI_KPROBE: /* * Comments in lttng-kernel.h mention that * either addr or symbol_name are set, not both. @@ -549,13 +548,13 @@ int save_kernel_kprobe_event(struct config_writer *writer, offset = event->event->u.kprobe.offset; symbol_name = addr ? NULL : event->event->u.kprobe.symbol_name; break; - case LTTNG_KERNEL_KRETPROBE: + case LTTNG_KERNEL_ABI_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); + LTTNG_ASSERT(1); ERR("Unsupported kernel instrumentation type."); ret = LTTNG_ERR_INVALID; goto end; @@ -929,10 +928,10 @@ int save_kernel_event(struct config_writer *writer, } } - 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) { + if (event->event->instrumentation == LTTNG_KERNEL_ABI_FUNCTION || + event->event->instrumentation == LTTNG_KERNEL_ABI_KPROBE || + event->event->instrumentation == LTTNG_KERNEL_ABI_UPROBE || + event->event->instrumentation == LTTNG_KERNEL_ABI_KRETPROBE) { ret = config_writer_open_element(writer, config_element_attributes); @@ -942,21 +941,21 @@ int save_kernel_event(struct config_writer *writer, } switch (event->event->instrumentation) { - case LTTNG_KERNEL_SYSCALL: - case LTTNG_KERNEL_FUNCTION: + case LTTNG_KERNEL_ABI_SYSCALL: + case LTTNG_KERNEL_ABI_FUNCTION: ret = save_kernel_function_event(writer, event); if (ret) { goto end; } break; - case LTTNG_KERNEL_KPROBE: - case LTTNG_KERNEL_KRETPROBE: + case LTTNG_KERNEL_ABI_KPROBE: + case LTTNG_KERNEL_ABI_KRETPROBE: ret = save_kernel_kprobe_event(writer, event); if (ret) { goto end; } break; - case LTTNG_KERNEL_UPROBE: + case LTTNG_KERNEL_ABI_UPROBE: ret = save_kernel_userspace_probe_event(writer, event); if (ret) { goto end; @@ -1051,7 +1050,7 @@ int save_ust_event(struct config_writer *writer, goto end; } - if (event->attr.instrumentation != LTTNG_UST_TRACEPOINT) { + if (event->attr.instrumentation != LTTNG_UST_ABI_TRACEPOINT) { ERR("Unsupported UST instrumentation type."); ret = LTTNG_ERR_INVALID; goto end; @@ -1079,7 +1078,7 @@ int save_ust_event(struct config_writer *writer, } /* The log level is irrelevant if no "filtering" is enabled */ - if (event->attr.loglevel_type != LTTNG_UST_LOGLEVEL_ALL) { + if (event->attr.loglevel_type != LTTNG_UST_ABI_LOGLEVEL_ALL) { ret = config_writer_write_element_signed_int(writer, config_element_loglevel, event->attr.loglevel); if (ret) { @@ -1188,10 +1187,10 @@ int init_ust_event_from_agent_event(struct ltt_ust_event *ust_event, struct agent_event *agent_event) { int ret; - enum lttng_ust_loglevel_type ust_loglevel_type; + enum lttng_ust_abi_loglevel_type ust_loglevel_type; - ust_event->enabled = agent_event->enabled; - ust_event->attr.instrumentation = LTTNG_UST_TRACEPOINT; + ust_event->enabled = AGENT_EVENT_IS_ENABLED(agent_event); + ust_event->attr.instrumentation = LTTNG_UST_ABI_TRACEPOINT; if (lttng_strncpy(ust_event->attr.name, agent_event->name, LTTNG_SYMBOL_NAME_LEN)) { ret = LTTNG_ERR_INVALID; @@ -1199,13 +1198,13 @@ int init_ust_event_from_agent_event(struct ltt_ust_event *ust_event, } switch (agent_event->loglevel_type) { case LTTNG_EVENT_LOGLEVEL_ALL: - ust_loglevel_type = LTTNG_UST_LOGLEVEL_ALL; + ust_loglevel_type = LTTNG_UST_ABI_LOGLEVEL_ALL; break; case LTTNG_EVENT_LOGLEVEL_SINGLE: - ust_loglevel_type = LTTNG_UST_LOGLEVEL_SINGLE; + ust_loglevel_type = LTTNG_UST_ABI_LOGLEVEL_SINGLE; break; case LTTNG_EVENT_LOGLEVEL_RANGE: - ust_loglevel_type = LTTNG_UST_LOGLEVEL_RANGE; + ust_loglevel_type = LTTNG_UST_ABI_LOGLEVEL_RANGE; break; default: ERR("Invalid agent_event loglevel_type."); @@ -1240,7 +1239,6 @@ int save_agent_events(struct config_writer *writer, 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; @@ -1281,7 +1279,7 @@ end: /* Return LTTNG_OK on success else a LTTNG_ERR* code. */ static int save_kernel_context(struct config_writer *writer, - struct lttng_kernel_context *ctx) + struct lttng_kernel_abi_context *ctx) { int ret = LTTNG_OK; @@ -1295,7 +1293,7 @@ int save_kernel_context(struct config_writer *writer, goto end; } - if (ctx->ctx == LTTNG_KERNEL_CONTEXT_PERF_CPU_COUNTER) { + if (ctx->ctx == LTTNG_KERNEL_ABI_CONTEXT_PERF_CPU_COUNTER) { ret = config_writer_open_element(writer, config_element_context_perf); if (ret) { @@ -1405,8 +1403,8 @@ int save_ust_context_perf_thread_counter(struct config_writer *writer, { int ret; - assert(writer); - assert(ctx); + LTTNG_ASSERT(writer); + LTTNG_ASSERT(ctx); /* Perf contexts are saved as event_perf_context_type */ ret = config_writer_open_element(writer, config_element_context_perf); @@ -1455,8 +1453,8 @@ int save_ust_context_app_ctx(struct config_writer *writer, { int ret; - assert(writer); - assert(ctx); + LTTNG_ASSERT(writer); + LTTNG_ASSERT(ctx); /* Application contexts are saved as application_context_type */ ret = config_writer_open_element(writer, config_element_context_app); @@ -1501,8 +1499,8 @@ int save_ust_context_generic(struct config_writer *writer, int ret; const char *context_type_string; - assert(writer); - assert(ctx); + LTTNG_ASSERT(writer); + LTTNG_ASSERT(ctx); /* Save context as event_context_type_type */ context_type_string = get_ust_context_type_string( @@ -1533,8 +1531,8 @@ int save_ust_context(struct config_writer *writer, int ret; struct ltt_ust_context *ctx; - assert(writer); - assert(ctx_list); + LTTNG_ASSERT(writer); + LTTNG_ASSERT(ctx_list); ret = config_writer_open_element(writer, config_element_contexts); if (ret) { @@ -1551,10 +1549,10 @@ int save_ust_context(struct config_writer *writer, } switch (ctx->ctx.ctx) { - case LTTNG_UST_CONTEXT_PERF_THREAD_COUNTER: + case LTTNG_UST_ABI_CONTEXT_PERF_THREAD_COUNTER: ret = save_ust_context_perf_thread_counter(writer, ctx); break; - case LTTNG_UST_CONTEXT_APP_CONTEXT: + case LTTNG_UST_ABI_CONTEXT_APP_CONTEXT: ret = save_ust_context_app_ctx(writer, ctx); break; default: @@ -1592,8 +1590,8 @@ int save_kernel_channel(struct config_writer *writer, { int ret; - assert(writer); - assert(kchan); + LTTNG_ASSERT(writer); + LTTNG_ASSERT(kchan); ret = config_writer_open_element(writer, config_element_channel); if (ret) { @@ -1650,9 +1648,9 @@ int save_ust_channel(struct config_writer *writer, { int ret; - assert(writer); - assert(ust_chan); - assert(session); + LTTNG_ASSERT(writer); + LTTNG_ASSERT(ust_chan); + LTTNG_ASSERT(session); ret = config_writer_open_element(writer, config_element_channel); if (ret) { @@ -1753,8 +1751,8 @@ int save_kernel_session(struct config_writer *writer, int ret; struct ltt_kernel_channel *kchan; - assert(writer); - assert(session); + LTTNG_ASSERT(writer); + LTTNG_ASSERT(session); ret = config_writer_write_element_string(writer, config_element_type, config_domain_type_kernel); @@ -1819,7 +1817,7 @@ const char *get_config_domain_str(enum lttng_domain_type domain) str_dom = config_domain_type_python; break; default: - assert(0); + abort(); } return str_dom; @@ -1878,14 +1876,14 @@ static int save_process_attr_tracker(struct config_writer *writer, { tracker = kernel_get_process_attr_tracker( sess->kernel_session, process_attr); - assert(tracker); + LTTNG_ASSERT(tracker); break; } case LTTNG_DOMAIN_UST: { tracker = trace_ust_get_process_attr_tracker( sess->ust_session, process_attr); - assert(tracker); + LTTNG_ASSERT(tracker); break; } case LTTNG_DOMAIN_JUL: @@ -1936,7 +1934,7 @@ static int save_process_attr_tracker(struct config_writer *writer, lttng_process_attr_tracker_values_get_at_index( values, i); - assert(value); + LTTNG_ASSERT(value); ret = config_writer_open_element( writer, element_target_id); if (ret) { @@ -1959,11 +1957,11 @@ static int save_process_attr_tracker(struct config_writer *writer, break; case LTTNG_PROCESS_ATTR_VALUE_TYPE_USER_NAME: name = value->value.user_name; - assert(name); + LTTNG_ASSERT(name); break; case LTTNG_PROCESS_ATTR_VALUE_TYPE_GROUP_NAME: name = value->value.group_name; - assert(name); + LTTNG_ASSERT(name); break; default: abort(); @@ -2090,8 +2088,8 @@ int save_ust_domain(struct config_writer *writer, struct lttng_ht_iter iter; const char *config_domain_name; - assert(writer); - assert(session); + LTTNG_ASSERT(writer); + LTTNG_ASSERT(session); ret = config_writer_open_element(writer, config_element_domain); @@ -2195,8 +2193,8 @@ int save_domains(struct config_writer *writer, struct ltt_session *session) { int ret = LTTNG_OK; - assert(writer); - assert(session); + LTTNG_ASSERT(writer); + LTTNG_ASSERT(session); if (!session->kernel_session && !session->ust_session) { goto end; @@ -2289,8 +2287,8 @@ int save_consumer_output(struct config_writer *writer, { int ret; - assert(writer); - assert(output); + LTTNG_ASSERT(writer); + LTTNG_ASSERT(output); ret = config_writer_open_element(writer, config_element_consumer_output); if (ret) { @@ -2418,8 +2416,8 @@ int save_snapshot_outputs(struct config_writer *writer, struct lttng_ht_iter iter; struct snapshot_output *output; - assert(writer); - assert(snapshot); + LTTNG_ASSERT(writer); + LTTNG_ASSERT(snapshot); ret = config_writer_open_element(writer, config_element_snapshot_outputs); if (ret) { @@ -2487,8 +2485,8 @@ int save_session_output(struct config_writer *writer, { int ret; - assert(writer); - assert(session); + LTTNG_ASSERT(writer); + LTTNG_ASSERT(session); if ((session->snapshot_mode && session->snapshot.nb_output == 0) || (!session->snapshot_mode && !session->consumer)) { @@ -2625,16 +2623,15 @@ int save_session(struct ltt_session *session, const char *provided_path; int file_open_flags = O_CREAT | O_WRONLY | O_TRUNC; - assert(session); - assert(attr); - assert(creds); + LTTNG_ASSERT(session); + LTTNG_ASSERT(attr); + LTTNG_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), - LTTNG_SOCK_GET_GID_CRED(creds)) || session->destroyed) { + LTTNG_SOCK_GET_UID_CRED(creds)) || session->destroyed) { ret = LTTNG_ERR_EPERM; goto end; }