X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-events.c;h=627cd4e101df4280b5a44b96f4719301c265df9b;hb=cefef7a70a723c31ab6a0746c7611f145337dabe;hp=825cd60ee21b0b58340f7358a8f52afdb8e1b64f;hpb=218deb69baab57ee2f6728eef18e84697f21197b;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-events.c b/liblttng-ust/lttng-events.c
index 825cd60e..627cd4e1 100644
--- a/liblttng-ust/lttng-events.c
+++ b/liblttng-ust/lttng-events.c
@@ -920,6 +920,9 @@ int lttng_enabler_ref_events(struct lttng_enabler *enabler)
 	struct lttng_session *session = enabler->chan->session;
 	struct lttng_event *event;
 
+	if (!enabler->enabled)
+		goto end;
+
 	/* First ensure that probe events are created for this enabler. */
 	lttng_create_event_if_missing(enabler);
 
@@ -951,6 +954,7 @@ int lttng_enabler_ref_events(struct lttng_enabler *enabler)
 
 		/* TODO: merge event context. */
 	}
+end:
 	return 0;
 }
 
@@ -1141,6 +1145,8 @@ int lttng_attach_context(struct lttng_ust_context *context_param,
 		return lttng_add_net_ns_to_ctx(ctx);
 	case LTTNG_UST_CONTEXT_PID_NS:
 		return lttng_add_pid_ns_to_ctx(ctx);
+	case LTTNG_UST_CONTEXT_TIME_NS:
+		return lttng_add_time_ns_to_ctx(ctx);
 	case LTTNG_UST_CONTEXT_USER_NS:
 		return lttng_add_user_ns_to_ctx(ctx);
 	case LTTNG_UST_CONTEXT_UTS_NS: