X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fprobes%2Flttng-uprobes.c;h=fed3a1d5a2b4c9beefe4f787370398a38d44474f;hb=f5ffbd770ec2b9d1ac9b7059eb33a01432043bce;hp=0240aaca5d34762630a22fd64d705ed0855928e8;hpb=8a57ec025ffbe56153748fd69b60118862707182;p=lttng-modules.git

diff --git a/src/probes/lttng-uprobes.c b/src/probes/lttng-uprobes.c
index 0240aaca..fed3a1d5 100644
--- a/src/probes/lttng-uprobes.c
+++ b/src/probes/lttng-uprobes.c
@@ -42,11 +42,11 @@ int lttng_uprobes_event_handler_pre(struct uprobe_consumer *uc, struct pt_regs *
 	{
 		struct lttng_kernel_event_recorder *event_recorder =
 			container_of(event, struct lttng_kernel_event_recorder, parent);
-		struct lttng_channel *chan = event_recorder->chan;
+		struct lttng_kernel_channel_buffer *chan = event_recorder->chan;
 
-		if (unlikely(!LTTNG_READ_ONCE(chan->session->active)))
+		if (unlikely(!LTTNG_READ_ONCE(chan->parent.session->active)))
 			return 0;
-		if (unlikely(!LTTNG_READ_ONCE(chan->enabled)))
+		if (unlikely(!LTTNG_READ_ONCE(chan->parent.enabled)))
 			return 0;
 		break;
 	}
@@ -64,7 +64,7 @@ int lttng_uprobes_event_handler_pre(struct uprobe_consumer *uc, struct pt_regs *
 	{
 		struct lttng_kernel_event_recorder *event_recorder =
 			container_of(event, struct lttng_kernel_event_recorder, parent);
-		struct lttng_channel *chan = event_recorder->chan;
+		struct lttng_kernel_channel_buffer *chan = event_recorder->chan;
 		struct lttng_kernel_ring_buffer_ctx ctx;
 		int ret;
 
@@ -78,8 +78,7 @@ int lttng_uprobes_event_handler_pre(struct uprobe_consumer *uc, struct pt_regs *
 		/* Event payload. */
 		payload.ip = (unsigned long)instruction_pointer(regs);
 
-		lib_ring_buffer_align_ctx(&ctx, lttng_alignof(payload));
-		chan->ops->event_write(&ctx, &payload, sizeof(payload));
+		chan->ops->event_write(&ctx, &payload, sizeof(payload), lttng_alignof(payload));
 		chan->ops->event_commit(&ctx);
 		break;
 	}
@@ -99,8 +98,16 @@ int lttng_uprobes_event_handler_pre(struct uprobe_consumer *uc, struct pt_regs *
 	return 0;
 }
 
-static const struct lttng_kernel_type_common *event_type =
-	lttng_kernel_static_type_integer_from_type(unsigned long, __BYTE_ORDER, 16);
+static const struct lttng_kernel_event_field *event_fields[] = {
+	lttng_kernel_static_event_field("ip",
+		lttng_kernel_static_type_integer_from_type(unsigned long, __BYTE_ORDER, 16),
+		false, false, false),
+};
+
+static const struct lttng_kernel_tracepoint_class tp_class = {
+	.nr_fields = ARRAY_SIZE(event_fields),
+	.fields = event_fields,
+};
 
 /*
  * Create event description.
@@ -108,43 +115,23 @@ static const struct lttng_kernel_type_common *event_type =
 static
 int lttng_create_uprobe_event(const char *name, struct lttng_kernel_event_recorder *event_recorder)
 {
-	const struct lttng_kernel_event_field **fieldp_array;
-	struct lttng_kernel_event_field *field;
 	struct lttng_kernel_event_desc *desc;
 	int ret;
 
 	desc = kzalloc(sizeof(*desc), GFP_KERNEL);
 	if (!desc)
 		return -ENOMEM;
+	desc->tp_class = &tp_class;
 	desc->event_name = kstrdup(name, GFP_KERNEL);
 	if (!desc->event_name) {
 		ret = -ENOMEM;
 		goto error_str;
 	}
-	desc->nr_fields = 1;
-	fieldp_array = kzalloc(1 * sizeof(struct lttng_kernel_event_field *), GFP_KERNEL);
-	if (!fieldp_array) {
-		ret = -ENOMEM;
-		goto error_fieldp_array;
-	}
-	desc->fields = fieldp_array;
-	desc->fields[0] = field =
-		kzalloc(sizeof(struct lttng_kernel_event_field), GFP_KERNEL);
-	if (!field) {
-		ret = -ENOMEM;
-		goto error_field;
-	}
-	field->name = "ip";
-	field->type = event_type;
 	desc->owner = THIS_MODULE;
 	event_recorder->priv->parent.desc = desc;
 
 	return 0;
 
-error_field:
-	kfree(fieldp_array);
-error_fieldp_array:
-	kfree(desc->event_name);
 error_str:
 	kfree(desc);
 	return ret;
@@ -162,14 +149,12 @@ int lttng_create_uprobe_event_notifier(const char *name, struct lttng_kernel_eve
 	desc = kzalloc(sizeof(*desc), GFP_KERNEL);
 	if (!desc)
 		return -ENOMEM;
+	desc->tp_class = &tp_class;
 	desc->event_name = kstrdup(name, GFP_KERNEL);
 	if (!desc->event_name) {
 		ret = -ENOMEM;
 		goto error_str;
 	}
-
-	desc->nr_fields = 0;
-
 	desc->owner = THIS_MODULE;
 	event_notifier->priv->parent.desc = desc;
 
@@ -367,8 +352,6 @@ EXPORT_SYMBOL_GPL(lttng_uprobes_unregister_event_notifier);
 void lttng_uprobes_destroy_event_private(struct lttng_kernel_event_recorder *event_recorder)
 {
 	iput(event_recorder->priv->parent.u.uprobe.inode);
-	kfree(event_recorder->priv->parent.desc->fields[0]);
-	kfree(event_recorder->priv->parent.desc->fields);
 	kfree(event_recorder->priv->parent.desc->event_name);
 	kfree(event_recorder->priv->parent.desc);
 }