Implement consumer ring buffer position sampling

[lttng-tools.git] / src / bin / lttng-sessiond / trace-ust.c

diff --git a/src/bin/lttng-sessiond/trace-ust.c b/src/bin/lttng-sessiond/trace-ust.c
index 4ed8fb1a554868c10fa17f150f561f3eae808ee9..55ca4fb3c9bfe5fc6b142cc9a5aa51dda4e117c3 100644 (file)
--- a/src/bin/lttng-sessiond/trace-ust.c
+++ b/src/bin/lttng-sessiond/trace-ust.c
@@ -356,6 +356,8 @@ struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *chan,
        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.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->monitor_timer_interval =
+                       ((struct lttng_channel_extended *) chan->attr.extended.ptr)->monitor_timer_interval;

 
        /* Translate to UST output enum */
        switch (luc->attr.output) {
 
        /* Translate to UST output enum */
        switch (luc->attr.output) {


@@ -589,6 +591,15 @@ int trace_ust_match_context(struct ltt_ust_context *uctx,
                        return 0;
                }
                break;
                        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);
+               if (strcmp(uctx->ctx.u.app_ctx.provider_name,
+                               ctx->u.app_ctx.provider_name) ||
+                               strcmp(uctx->ctx.u.app_ctx.ctx_name,
+                               ctx->u.app_ctx.ctx_name)) {
+                       return 0;
+               }

        default:
                break;
 
        default:
                break;