{
int ret;
struct ltt_ust_context *uctx;
- struct lttng_ht_iter iter;
- struct lttng_ht_node_ulong *uctx_node;
assert(usess);
assert(uchan);
assert(ctx);
+ /* Check if context is duplicate */
+ cds_list_for_each_entry(uctx, &uchan->ctx_list, list) {
+ if (trace_ust_match_context(uctx, ctx)) {
+ ret = -EEXIST;
+ goto duplicate;
+ }
+ }
+
/* Create ltt UST context */
uctx = trace_ust_create_context(ctx);
if (uctx == NULL) {
rcu_read_lock();
- /* Lookup context before adding it */
- lttng_ht_lookup(uchan->ctx, (void *)((unsigned long)uctx->ctx.ctx), &iter);
- uctx_node = lttng_ht_iter_get_node_ulong(&iter);
- if (uctx_node != NULL) {
- ret = -EEXIST;
- rcu_read_unlock();
- goto error;
- }
-
/* Add ltt UST context node to ltt UST channel */
- lttng_ht_add_unique_ulong(uchan->ctx, &uctx->node);
+ lttng_ht_add_ulong(uchan->ctx, &uctx->node);
rcu_read_unlock();
+ cds_list_add_tail(&uctx->list, &uchan->ctx_list);
DBG("Context UST %d added to channel %s", uctx->ctx.ctx, uchan->name);
error:
free(uctx);
+duplicate:
return ret;
}
case LTTNG_EVENT_CONTEXT_PID:
kctx.ctx = LTTNG_KERNEL_CONTEXT_PID;
break;
- case LTTNG_EVENT_CONTEXT_PERF_COUNTER:
- kctx.ctx = LTTNG_KERNEL_CONTEXT_PERF_COUNTER;
- break;
case LTTNG_EVENT_CONTEXT_PROCNAME:
kctx.ctx = LTTNG_KERNEL_CONTEXT_PROCNAME;
break;
case LTTNG_EVENT_CONTEXT_HOSTNAME:
kctx.ctx = LTTNG_KERNEL_CONTEXT_HOSTNAME;
break;
+ case LTTNG_EVENT_CONTEXT_PERF_CPU_COUNTER:
+ case LTTNG_EVENT_CONTEXT_PERF_COUNTER:
+ kctx.ctx = LTTNG_KERNEL_CONTEXT_PERF_CPU_COUNTER;
+ break;
default:
return LTTNG_ERR_KERN_CONTEXT_FAIL;
}
LTTNG_SYMBOL_NAME_LEN);
kctx.u.perf_counter.name[LTTNG_SYMBOL_NAME_LEN - 1] = '\0';
- if (strlen(channel_name) == 0) {
+ if (*channel_name == '\0') {
ret = add_kctx_all_channels(ksession, &kctx);
if (ret != LTTNG_OK) {
goto error;
assert(ctx);
assert(channel_name);
+ rcu_read_lock();
+
/*
* Define which channel's hashtable to use from the domain or quit if
* unknown domain.
}
/* Get UST channel if defined */
- if (strlen(channel_name) != 0) {
+ if (channel_name[0] != '\0') {
uchan = trace_ust_find_channel_by_name(chan_ht, channel_name);
if (uchan == NULL) {
ret = LTTNG_ERR_UST_CHAN_NOT_FOUND;
}
error:
+ rcu_read_unlock();
return ret;
}