X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-context-prio.c;h=972b1f4c66a5369c8d05aeb891b19f54fe66add8;hb=ce590f87205d91e2a6d7a53585d703a3c6451399;hp=891a315d7b990cc1133204f7263034faa35be3b4;hpb=a9dd15dadd7d58f58cfd19d2503d3b6b541723bc;p=lttng-modules.git

diff --git a/lttng-context-prio.c b/lttng-context-prio.c
index 891a315d..972b1f4c 100644
--- a/lttng-context-prio.c
+++ b/lttng-context-prio.c
@@ -1,46 +1,18 @@
-/*
+/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only)
+ *
  * lttng-context-prio.c
  *
  * LTTng priority context.
  *
  * Copyright (C) 2009-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; only
- * version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/sched.h>
-#include "lttng-events.h"
-#include "wrapper/ringbuffer/frontend_types.h"
-#include "wrapper/vmalloc.h"
-#include "wrapper/kallsyms.h"
-#include "lttng-tracer.h"
-
-static
-int (*wrapper_task_prio_sym)(struct task_struct *t);
-
-int wrapper_task_prio_init(void)
-{
-	wrapper_task_prio_sym = (void *) kallsyms_lookup_funcptr("task_prio");
-	if (!wrapper_task_prio_sym) {
-		printk(KERN_WARNING "LTTng: task_prio symbol lookup failed.\n");
-		return -EINVAL;
-	}
-	return 0;
-}
+#include <lttng-events.h>
+#include <wrapper/ringbuffer/frontend_types.h>
+#include <lttng-tracer.h>
 
 static
 size_t prio_get_size(size_t offset)
@@ -59,21 +31,22 @@ void prio_record(struct lttng_ctx_field *field,
 {
 	int prio;
 
-	prio = wrapper_task_prio_sym(current);
+	prio = task_prio(current);
 	lib_ring_buffer_align_ctx(ctx, lttng_alignof(prio));
 	chan->ops->event_write(ctx, &prio, sizeof(prio));
 }
 
+static
+void prio_get_value(struct lttng_ctx_field *field,
+		struct lttng_probe_ctx *lttng_probe_ctx,
+		union lttng_ctx_value *value)
+{
+	value->s64 = task_prio(current);
+}
+
 int lttng_add_prio_to_ctx(struct lttng_ctx **ctx)
 {
 	struct lttng_ctx_field *field;
-	int ret;
-
-	if (!wrapper_task_prio_sym) {
-		ret = wrapper_task_prio_init();
-		if (ret)
-			return ret;
-	}
 
 	field = lttng_append_context(ctx);
 	if (!field)
@@ -84,24 +57,16 @@ int lttng_add_prio_to_ctx(struct lttng_ctx **ctx)
 	}
 	field->event_field.name = "prio";
 	field->event_field.type.atype = atype_integer;
-	field->event_field.type.u.basic.integer.size = sizeof(int) * CHAR_BIT;
-	field->event_field.type.u.basic.integer.alignment = lttng_alignof(int) * CHAR_BIT;
-	field->event_field.type.u.basic.integer.signedness = lttng_is_signed_type(int);
-	field->event_field.type.u.basic.integer.reverse_byte_order = 0;
-	field->event_field.type.u.basic.integer.base = 10;
-	field->event_field.type.u.basic.integer.encoding = lttng_encode_none;
+	field->event_field.type.u.integer.size = sizeof(int) * CHAR_BIT;
+	field->event_field.type.u.integer.alignment = lttng_alignof(int) * CHAR_BIT;
+	field->event_field.type.u.integer.signedness = lttng_is_signed_type(int);
+	field->event_field.type.u.integer.reverse_byte_order = 0;
+	field->event_field.type.u.integer.base = 10;
+	field->event_field.type.u.integer.encoding = lttng_encode_none;
 	field->get_size = prio_get_size;
 	field->record = prio_record;
+	field->get_value = prio_get_value;
 	lttng_context_update(*ctx);
-	wrapper_vmalloc_sync_all();
 	return 0;
 }
 EXPORT_SYMBOL_GPL(lttng_add_prio_to_ctx);
-
-MODULE_LICENSE("GPL and additional rights");
-MODULE_AUTHOR("Mathieu Desnoyers");
-MODULE_DESCRIPTION("Linux Trace Toolkit Priority Context");
-MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "."
-	__stringify(LTTNG_MODULES_MINOR_VERSION) "."
-	__stringify(LTTNG_MODULES_PATCHLEVEL_VERSION)
-	LTTNG_MODULES_EXTRAVERSION);