X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-events.c;h=26601a671c976506587564fe556f7eabc16a7566;hb=fca361e81cbb39f076182e9d2c6dd2c4c8c25b5d;hp=ca8587306c2c37b6c6f93ac7ff7cc39a2bfb13c7;hpb=d970f72ef97cd5f1e5e0152ce48a4c6b28eccfb2;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-events.c b/liblttng-ust/lttng-events.c
index ca858730..26601a67 100644
--- a/liblttng-ust/lttng-events.c
+++ b/liblttng-ust/lttng-events.c
@@ -45,7 +45,7 @@
 
 #include <usterr-signal-safe.h>
 #include <helper.h>
-#include <ust-ctl.h>
+#include <lttng/ust-ctl.h>
 #include <ust-comm.h>
 #include "error.h"
 #include "compat.h"
@@ -260,7 +260,7 @@ int lttng_session_enable(struct lttng_session *session)
 	 */
 	cds_list_for_each_entry(chan, &session->chan_head, node) {
 		const struct lttng_ctx *ctx;
-		const struct lttng_event_field *fields = NULL;
+		const struct lttng_ctx_field *fields = NULL;
 		size_t nr_fields = 0;
 		uint32_t chan_id;
 
@@ -270,7 +270,7 @@ int lttng_session_enable(struct lttng_session *session)
 		ctx = chan->ctx;
 		if (ctx) {
 			nr_fields = ctx->nr_fields;
-			fields = &ctx->fields->event_field;
+			fields = ctx->fields;
 		}
 		ret = ustcomm_register_channel(notify_socket,
 			session->objd,
@@ -635,12 +635,9 @@ int lttng_enabler_ref_events(struct lttng_enabler *enabler)
 /*
  * Called at library load: connect the probe on all enablers matching
  * this event.
- * called with session mutex held.
- * TODO: currently, for each desc added, we iterate on all event desc
- * (inefficient). We should create specific code that only target the
- * added desc.
+ * Called with session mutex held.
  */
-int lttng_fix_pending_event_desc(const struct lttng_event_desc *desc)
+int lttng_fix_pending_events(void)
 {
 	struct lttng_session *session;
 
@@ -743,6 +740,8 @@ int lttng_attach_context(struct lttng_ust_context *context_param,
 		return lttng_add_vpid_to_ctx(ctx);
 	case LTTNG_UST_CONTEXT_PROCNAME:
 		return lttng_add_procname_to_ctx(ctx);
+	case LTTNG_UST_CONTEXT_IP:
+		return lttng_add_ip_to_ctx(ctx);
 	default:
 		return -EINVAL;
 	}