X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftrace-ust.c;h=47e98cc782a28277309cb12d38796788d725eb93;hb=a0377dfefe40662ba7d68617bce6ff467114136c;hp=527b354f1a5e5c287e17733202d57670e78ce687;hpb=2b00d46244cab86f1186a7b00cdc660f24a26f72;p=lttng-tools.git diff --git a/src/bin/lttng-sessiond/trace-ust.c b/src/bin/lttng-sessiond/trace-ust.c index 527b354f1..47e98cc78 100644 --- a/src/bin/lttng-sessiond/trace-ust.c +++ b/src/bin/lttng-sessiond/trace-ust.c @@ -35,8 +35,8 @@ int trace_ust_ht_match_event_by_name(struct cds_lfht_node *node, struct ltt_ust_event *event; const char *name; - assert(node); - assert(_key); + LTTNG_ASSERT(node); + LTTNG_ASSERT(_key); event = caa_container_of(node, struct ltt_ust_event, node.node); name = _key; @@ -66,8 +66,8 @@ int trace_ust_ht_match_event(struct cds_lfht_node *node, const void *_key) int ev_loglevel_value; int ll_match; - assert(node); - assert(_key); + LTTNG_ASSERT(node); + LTTNG_ASSERT(_key); event = caa_container_of(node, struct ltt_ust_event, node.node); key = _key; @@ -83,7 +83,7 @@ int trace_ust_ht_match_event(struct cds_lfht_node *node, const void *_key) /* Event loglevel value and type. */ ll_match = loglevels_match(event->attr.loglevel_type, ev_loglevel_value, key->loglevel_type, - key->loglevel_value, LTTNG_UST_LOGLEVEL_ALL); + key->loglevel_value, LTTNG_UST_ABI_LOGLEVEL_ALL); if (!ll_match) { goto no_match; @@ -195,15 +195,15 @@ error: */ struct ltt_ust_event *trace_ust_find_event(struct lttng_ht *ht, char *name, struct lttng_bytecode *filter, - enum lttng_ust_loglevel_type loglevel_type, int loglevel_value, + enum lttng_ust_abi_loglevel_type loglevel_type, int loglevel_value, struct lttng_event_exclusion *exclusion) { struct lttng_ht_node_str *node; struct lttng_ht_iter iter; struct ltt_ust_ht_key key; - assert(name); - assert(ht); + LTTNG_ASSERT(name); + LTTNG_ASSERT(ht); key.name = name; key.filter = filter; @@ -242,7 +242,7 @@ struct agent *trace_ust_find_agent(struct ltt_ust_session *session, struct lttng_ht_iter iter; uint64_t key; - assert(session); + LTTNG_ASSERT(session); DBG3("Trace ust agent lookup for domain %d", domain_type); @@ -285,7 +285,7 @@ struct ltt_ust_session *trace_ust_create_session(uint64_t session_id) lus->metadata_attr.num_subbuf = DEFAULT_METADATA_SUBBUF_NUM; lus->metadata_attr.switch_timer_interval = DEFAULT_METADATA_SWITCH_TIMER; lus->metadata_attr.read_timer_interval = DEFAULT_METADATA_READ_TIMER; - lus->metadata_attr.output = LTTNG_UST_MMAP; + lus->metadata_attr.output = LTTNG_UST_ABI_MMAP; /* * Default buffer type. This can be changed through an enable channel @@ -346,7 +346,7 @@ struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *chan, { struct ltt_ust_channel *luc; - assert(chan); + LTTNG_ASSERT(chan); luc = zmalloc(sizeof(struct ltt_ust_channel)); if (luc == NULL) { @@ -362,7 +362,7 @@ struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *chan, luc->attr.num_subbuf = chan->attr.num_subbuf; luc->attr.switch_timer_interval = chan->attr.switch_timer_interval; luc->attr.read_timer_interval = chan->attr.read_timer_interval; - luc->attr.output = (enum lttng_ust_output) chan->attr.output; + luc->attr.output = (enum lttng_ust_abi_output) chan->attr.output; luc->monitor_timer_interval = ((struct lttng_channel_extended *) chan->attr.extended.ptr)->monitor_timer_interval; luc->attr.u.s.blocking_timeout = ((struct lttng_channel_extended *) @@ -371,7 +371,7 @@ struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *chan, /* Translate to UST output enum */ switch (luc->attr.output) { default: - luc->attr.output = LTTNG_UST_MMAP; + luc->attr.output = LTTNG_UST_ABI_MMAP; break; } @@ -385,7 +385,7 @@ struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *chan, /* Copy channel name */ strncpy(luc->name, chan->name, sizeof(luc->name)); } - luc->name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0'; + luc->name[LTTNG_UST_ABI_SYM_NAME_LEN - 1] = '\0'; /* Init node */ lttng_ht_node_init_str(&luc->node, luc->name); @@ -415,7 +415,7 @@ static int validate_exclusion(struct lttng_event_exclusion *exclusion) size_t i; int ret = 0; - assert(exclusion); + LTTNG_ASSERT(exclusion); for (i = 0; i < exclusion->count; ++i) { size_t j; @@ -454,7 +454,7 @@ enum lttng_error_code trace_ust_create_event(struct lttng_event *ev, struct ltt_ust_event *local_ust_event; enum lttng_error_code ret = LTTNG_OK; - assert(ev); + LTTNG_ASSERT(ev); if (exclusion && validate_exclusion(exclusion)) { ret = LTTNG_ERR_INVALID; @@ -472,16 +472,16 @@ enum lttng_error_code trace_ust_create_event(struct lttng_event *ev, switch (ev->type) { case LTTNG_EVENT_PROBE: - local_ust_event->attr.instrumentation = LTTNG_UST_PROBE; + local_ust_event->attr.instrumentation = LTTNG_UST_ABI_PROBE; break; case LTTNG_EVENT_FUNCTION: - local_ust_event->attr.instrumentation = LTTNG_UST_FUNCTION; + local_ust_event->attr.instrumentation = LTTNG_UST_ABI_FUNCTION; break; case LTTNG_EVENT_FUNCTION_ENTRY: - local_ust_event->attr.instrumentation = LTTNG_UST_FUNCTION; + local_ust_event->attr.instrumentation = LTTNG_UST_ABI_FUNCTION; break; case LTTNG_EVENT_TRACEPOINT: - local_ust_event->attr.instrumentation = LTTNG_UST_TRACEPOINT; + local_ust_event->attr.instrumentation = LTTNG_UST_ABI_TRACEPOINT; break; default: ERR("Unknown ust instrumentation type (%d)", ev->type); @@ -490,20 +490,20 @@ enum lttng_error_code trace_ust_create_event(struct lttng_event *ev, } /* Copy event name */ - strncpy(local_ust_event->attr.name, ev->name, LTTNG_UST_SYM_NAME_LEN); - local_ust_event->attr.name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0'; + strncpy(local_ust_event->attr.name, ev->name, LTTNG_UST_ABI_SYM_NAME_LEN); + local_ust_event->attr.name[LTTNG_UST_ABI_SYM_NAME_LEN - 1] = '\0'; switch (ev->loglevel_type) { case LTTNG_EVENT_LOGLEVEL_ALL: - local_ust_event->attr.loglevel_type = LTTNG_UST_LOGLEVEL_ALL; + local_ust_event->attr.loglevel_type = LTTNG_UST_ABI_LOGLEVEL_ALL; local_ust_event->attr.loglevel = -1; /* Force to -1 */ break; case LTTNG_EVENT_LOGLEVEL_RANGE: - local_ust_event->attr.loglevel_type = LTTNG_UST_LOGLEVEL_RANGE; + local_ust_event->attr.loglevel_type = LTTNG_UST_ABI_LOGLEVEL_RANGE; local_ust_event->attr.loglevel = ev->loglevel; break; case LTTNG_EVENT_LOGLEVEL_SINGLE: - local_ust_event->attr.loglevel_type = LTTNG_UST_LOGLEVEL_SINGLE; + local_ust_event->attr.loglevel_type = LTTNG_UST_ABI_LOGLEVEL_SINGLE; local_ust_event->attr.loglevel = ev->loglevel; break; default: @@ -545,72 +545,72 @@ int trace_ust_context_type_event_to_ust( switch (type) { case LTTNG_EVENT_CONTEXT_VTID: - utype = LTTNG_UST_CONTEXT_VTID; + utype = LTTNG_UST_ABI_CONTEXT_VTID; break; case LTTNG_EVENT_CONTEXT_VPID: - utype = LTTNG_UST_CONTEXT_VPID; + utype = LTTNG_UST_ABI_CONTEXT_VPID; break; case LTTNG_EVENT_CONTEXT_PTHREAD_ID: - utype = LTTNG_UST_CONTEXT_PTHREAD_ID; + utype = LTTNG_UST_ABI_CONTEXT_PTHREAD_ID; break; case LTTNG_EVENT_CONTEXT_PROCNAME: - utype = LTTNG_UST_CONTEXT_PROCNAME; + utype = LTTNG_UST_ABI_CONTEXT_PROCNAME; break; case LTTNG_EVENT_CONTEXT_IP: - utype = LTTNG_UST_CONTEXT_IP; + utype = LTTNG_UST_ABI_CONTEXT_IP; break; case LTTNG_EVENT_CONTEXT_PERF_THREAD_COUNTER: - if (!ustctl_has_perf_counters()) { + if (!lttng_ust_ctl_has_perf_counters()) { utype = -1; WARN("Perf counters not implemented in UST"); } else { - utype = LTTNG_UST_CONTEXT_PERF_THREAD_COUNTER; + utype = LTTNG_UST_ABI_CONTEXT_PERF_THREAD_COUNTER; } break; case LTTNG_EVENT_CONTEXT_APP_CONTEXT: - utype = LTTNG_UST_CONTEXT_APP_CONTEXT; + utype = LTTNG_UST_ABI_CONTEXT_APP_CONTEXT; break; case LTTNG_EVENT_CONTEXT_CGROUP_NS: - utype = LTTNG_UST_CONTEXT_CGROUP_NS; + utype = LTTNG_UST_ABI_CONTEXT_CGROUP_NS; break; case LTTNG_EVENT_CONTEXT_IPC_NS: - utype = LTTNG_UST_CONTEXT_IPC_NS; + utype = LTTNG_UST_ABI_CONTEXT_IPC_NS; break; case LTTNG_EVENT_CONTEXT_MNT_NS: - utype = LTTNG_UST_CONTEXT_MNT_NS; + utype = LTTNG_UST_ABI_CONTEXT_MNT_NS; break; case LTTNG_EVENT_CONTEXT_NET_NS: - utype = LTTNG_UST_CONTEXT_NET_NS; + utype = LTTNG_UST_ABI_CONTEXT_NET_NS; break; case LTTNG_EVENT_CONTEXT_PID_NS: - utype = LTTNG_UST_CONTEXT_PID_NS; + utype = LTTNG_UST_ABI_CONTEXT_PID_NS; break; case LTTNG_EVENT_CONTEXT_TIME_NS: - utype = LTTNG_UST_CONTEXT_TIME_NS; + utype = LTTNG_UST_ABI_CONTEXT_TIME_NS; break; case LTTNG_EVENT_CONTEXT_USER_NS: - utype = LTTNG_UST_CONTEXT_USER_NS; + utype = LTTNG_UST_ABI_CONTEXT_USER_NS; break; case LTTNG_EVENT_CONTEXT_UTS_NS: - utype = LTTNG_UST_CONTEXT_UTS_NS; + utype = LTTNG_UST_ABI_CONTEXT_UTS_NS; break; case LTTNG_EVENT_CONTEXT_VUID: - utype = LTTNG_UST_CONTEXT_VUID; + utype = LTTNG_UST_ABI_CONTEXT_VUID; break; case LTTNG_EVENT_CONTEXT_VEUID: - utype = LTTNG_UST_CONTEXT_VEUID; + utype = LTTNG_UST_ABI_CONTEXT_VEUID; break; case LTTNG_EVENT_CONTEXT_VSUID: - utype = LTTNG_UST_CONTEXT_VSUID; + utype = LTTNG_UST_ABI_CONTEXT_VSUID; break; case LTTNG_EVENT_CONTEXT_VGID: - utype = LTTNG_UST_CONTEXT_VGID; + utype = LTTNG_UST_ABI_CONTEXT_VGID; break; case LTTNG_EVENT_CONTEXT_VEGID: - utype = LTTNG_UST_CONTEXT_VEGID; + utype = LTTNG_UST_ABI_CONTEXT_VEGID; break; case LTTNG_EVENT_CONTEXT_VSGID: - utype = LTTNG_UST_CONTEXT_VSGID; + utype = LTTNG_UST_ABI_CONTEXT_VSGID; break; default: utype = -1; @@ -635,7 +635,7 @@ int trace_ust_match_context(const struct ltt_ust_context *uctx, return 0; } switch (utype) { - case LTTNG_UST_CONTEXT_PERF_THREAD_COUNTER: + case LTTNG_UST_ABI_CONTEXT_PERF_THREAD_COUNTER: if (uctx->ctx.u.perf_counter.type != ctx->u.perf_counter.type) { return 0; @@ -646,13 +646,13 @@ int trace_ust_match_context(const struct ltt_ust_context *uctx, } if (strncmp(uctx->ctx.u.perf_counter.name, ctx->u.perf_counter.name, - LTTNG_UST_SYM_NAME_LEN)) { + LTTNG_UST_ABI_SYM_NAME_LEN)) { return 0; } break; - case LTTNG_UST_CONTEXT_APP_CONTEXT: - assert(uctx->ctx.u.app_ctx.provider_name); - assert(uctx->ctx.u.app_ctx.ctx_name); + case LTTNG_UST_ABI_CONTEXT_APP_CONTEXT: + LTTNG_ASSERT(uctx->ctx.u.app_ctx.provider_name); + LTTNG_ASSERT(uctx->ctx.u.app_ctx.ctx_name); if (strcmp(uctx->ctx.u.app_ctx.provider_name, ctx->u.app_ctx.provider_name) || strcmp(uctx->ctx.u.app_ctx.ctx_name, @@ -677,7 +677,7 @@ struct ltt_ust_context *trace_ust_create_context( struct ltt_ust_context *uctx = NULL; int utype; - assert(ctx); + LTTNG_ASSERT(ctx); utype = trace_ust_context_type_event_to_ust(ctx->ctx); if (utype < 0) { @@ -691,16 +691,16 @@ struct ltt_ust_context *trace_ust_create_context( goto end; } - uctx->ctx.ctx = (enum lttng_ust_context_type) utype; + uctx->ctx.ctx = (enum lttng_ust_abi_context_type) utype; switch (utype) { - case LTTNG_UST_CONTEXT_PERF_THREAD_COUNTER: + case LTTNG_UST_ABI_CONTEXT_PERF_THREAD_COUNTER: uctx->ctx.u.perf_counter.type = ctx->u.perf_counter.type; uctx->ctx.u.perf_counter.config = ctx->u.perf_counter.config; strncpy(uctx->ctx.u.perf_counter.name, ctx->u.perf_counter.name, - LTTNG_UST_SYM_NAME_LEN); - uctx->ctx.u.perf_counter.name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0'; + LTTNG_UST_ABI_SYM_NAME_LEN); + uctx->ctx.u.perf_counter.name[LTTNG_UST_ABI_SYM_NAME_LEN - 1] = '\0'; break; - case LTTNG_UST_CONTEXT_APP_CONTEXT: + case LTTNG_UST_ABI_CONTEXT_APP_CONTEXT: { char *provider_name = NULL, *ctx_name = NULL; @@ -770,7 +770,7 @@ static void fini_id_tracker(struct ust_id_tracker *id_tracker) node.node) { int ret = lttng_ht_del(id_tracker->ht, &iter); - assert(!ret); + LTTNG_ASSERT(!ret); destroy_id_tracker_node(tracker_node); } rcu_read_unlock(); @@ -839,7 +839,7 @@ static int id_tracker_del_id(struct ust_id_tracker *id_tracker, int id) goto end; } ret = lttng_ht_del(id_tracker->ht, &iter); - assert(!ret); + LTTNG_ASSERT(!ret); destroy_id_tracker_node(tracker_node); end: @@ -1216,7 +1216,7 @@ static void destroy_contexts(struct lttng_ht *ht) struct lttng_ht_iter iter; struct ltt_ust_context *ctx; - assert(ht); + LTTNG_ASSERT(ht); rcu_read_lock(); cds_lfht_for_each_entry(ht->ht, &iter.iter, node, node) { @@ -1239,7 +1239,7 @@ static void destroy_contexts(struct lttng_ht *ht) */ void trace_ust_destroy_event(struct ltt_ust_event *event) { - assert(event); + LTTNG_ASSERT(event); DBG2("Trace destroy UST event %s", event->attr.name); free(event->filter_expression); @@ -1253,9 +1253,9 @@ void trace_ust_destroy_event(struct ltt_ust_event *event) */ void trace_ust_destroy_context(struct ltt_ust_context *ctx) { - assert(ctx); + LTTNG_ASSERT(ctx); - if (ctx->ctx.ctx == LTTNG_UST_CONTEXT_APP_CONTEXT) { + if (ctx->ctx.ctx == LTTNG_UST_ABI_CONTEXT_APP_CONTEXT) { free(ctx->ctx.u.app_ctx.provider_name); free(ctx->ctx.u.app_ctx.ctx_name); } @@ -1284,12 +1284,12 @@ static void destroy_events(struct lttng_ht *events) struct lttng_ht_node_str *node; struct lttng_ht_iter iter; - assert(events); + LTTNG_ASSERT(events); rcu_read_lock(); cds_lfht_for_each_entry(events->ht, &iter.iter, node, node) { ret = lttng_ht_del(events, &iter); - assert(!ret); + LTTNG_ASSERT(!ret); call_rcu(&node->head, destroy_event_rcu); } rcu_read_unlock(); @@ -1304,7 +1304,7 @@ static void destroy_events(struct lttng_ht *events) */ static void _trace_ust_destroy_channel(struct ltt_ust_channel *channel) { - assert(channel); + LTTNG_ASSERT(channel); DBG2("Trace destroy UST channel %s", channel->name); @@ -1343,12 +1343,12 @@ void trace_ust_delete_channel(struct lttng_ht *ht, int ret; struct lttng_ht_iter iter; - assert(ht); - assert(channel); + LTTNG_ASSERT(ht); + LTTNG_ASSERT(channel); iter.iter.node = &channel->node.node; ret = lttng_ht_del(ht, &iter); - assert(!ret); + LTTNG_ASSERT(!ret); } /* @@ -1359,7 +1359,7 @@ static void destroy_channels(struct lttng_ht *channels) struct lttng_ht_node_str *node; struct lttng_ht_iter iter; - assert(channels); + LTTNG_ASSERT(channels); rcu_read_lock(); cds_lfht_for_each_entry(channels->ht, &iter.iter, node, node) { @@ -1379,7 +1379,7 @@ static void destroy_channels(struct lttng_ht *channels) */ static void destroy_domain_global(struct ltt_ust_domain_global *dom) { - assert(dom); + LTTNG_ASSERT(dom); destroy_channels(dom->channels); } @@ -1396,7 +1396,7 @@ void trace_ust_destroy_session(struct ltt_ust_session *session) struct buffer_reg_uid *reg, *sreg; struct lttng_ht_iter iter; - assert(session); + LTTNG_ASSERT(session); DBG2("Trace UST destroy session %" PRIu64, session->id); @@ -1407,7 +1407,7 @@ void trace_ust_destroy_session(struct ltt_ust_session *session) cds_lfht_for_each_entry(session->agents->ht, &iter.iter, agt, node.node) { int ret = lttng_ht_del(session->agents, &iter); - assert(!ret); + LTTNG_ASSERT(!ret); agent_destroy(agt); } rcu_read_unlock();