Cleanup: Move lttng-modules instrumentation headers

[lttng-modules.git] / tests / probes / lttng-test.c

diff --git a/tests/probes/lttng-test.c b/tests/probes/lttng-test.c
index 54be4c7c90a4c89cdfab81fa38c873b451057e80..5064a685dad971693e3ee3bd04edb77491cbe2d3 100644 (file)
--- a/tests/probes/lttng-test.c
+++ b/tests/probes/lttng-test.c
@@ -1,42 +1,29 @@
-/*
+/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only)
+ *
  * lttng-test.c
  *
  * Linux Trace Toolkit Next Generation Test Module
  *
  * Copyright 2015 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/init.h>
 #include <linux/module.h>
 #include <linux/proc_fs.h>
 #include <linux/byteorder/generic.h>
+#include <asm/byteorder.h>
 
-#include <lttng-events.h>
-#include <lttng-tracer.h>
+#include <lttng/events.h>
+#include <lttng/tracer.h>
 #include <wrapper/tracepoint.h>
-#include <wrapper/kstrtox.h>
 
 #define TP_MODULE_NOAUTOLOAD
 #define LTTNG_PACKAGE_BUILD
 #define CREATE_TRACE_POINTS
-#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module
+#define TRACE_INCLUDE_PATH instrumentation/events
 #define TRACE_INCLUDE_FILE lttng-test
 #define LTTNG_INSTRUMENTATION
-#include <instrumentation/events/lttng-module/lttng-test.h>
+#include <instrumentation/events/lttng-test.h>
 
 DEFINE_TRACE(lttng_test_filter_event);
 
@@ -51,12 +38,16 @@ void trace_test_event(unsigned int nr_iter)
 {
        int i, netint;
        long values[] = { 1, 2, 3 };
+       uint32_t net_values[] = { 1, 2, 3 };
        char text[10] = "test";
        char escape[10] = "\\*";
 
+       for (i = 0; i < 3; i++) {
+               net_values[i] = htonl(net_values[i]);
+       }
        for (i = 0; i < nr_iter; i++) {
                netint = htonl(i);
-               trace_lttng_test_filter_event(i, netint, values, text, strlen(text), escape);
+               trace_lttng_test_filter_event(i, netint, values, text, strlen(text), escape, net_values);
        }
 }
 
@@ -77,7 +68,7 @@ ssize_t lttng_test_filter_event_write(struct file *file, const char __user *user
        int ret;
 
        /* Get the number of iterations */
-       ret = lttng_kstrtouint_from_user(user_buf, count, 10, &nr_iter);
+       ret = kstrtouint_from_user(user_buf, count, 10, &nr_iter);
        if (ret) {
                written = ret;
                goto end;
@@ -90,9 +81,15 @@ end:
        return written;
 }
 
-static const struct file_operations lttng_test_filter_event_operations = {
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0))
+static const struct proc_ops lttng_test_filter_event_proc_ops = {
+       .proc_write = lttng_test_filter_event_write,
+};
+#else
+static const struct file_operations lttng_test_filter_event_proc_ops = {
        .write = lttng_test_filter_event_write,
 };
+#endif
 
 static
 int __init lttng_test_init(void)
@@ -100,11 +97,11 @@ int __init lttng_test_init(void)
        int ret = 0;
 
        (void) wrapper_lttng_fixup_sig(THIS_MODULE);
-       wrapper_vmalloc_sync_all();
+       wrapper_vmalloc_sync_mappings();
        lttng_test_filter_event_dentry =
                        proc_create_data(LTTNG_TEST_FILTER_EVENT_FILE,
                                S_IRUGO | S_IWUGO, NULL,
-                               &lttng_test_filter_event_operations, NULL);
+                               &lttng_test_filter_event_proc_ops, NULL);
        if (!lttng_test_filter_event_dentry) {
                printk(KERN_ERR "Error creating LTTng test filter file\n");
                ret = -ENOMEM;