Version 2.12.17

[lttng-modules.git] / wrapper / uuid.h

diff --git a/wrapper/uuid.h b/wrapper/uuid.h
index 48b1a9fb7e63b4f6f07e12b8d87470ab643c23fd..7c334947689f21aaeddf2516d1b23ad10afc17ef 100644 (file)
--- a/wrapper/uuid.h
+++ b/wrapper/uuid.h
@@ -1,43 +1,31 @@
-#ifndef _LTTNG_WRAPPER_UUID_H
-#define _LTTNG_WRAPPER_UUID_H
-
-/*
- * wrapper/uuid.h
- *
- * Copyright (C) 2011-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.
+/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only)
  *
- * 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.
+ * wrapper/uuid.h
  *
- * 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
+ * Copyright (C) 2020 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
-#include <linux/version.h>
+#ifndef _LTTNG_WRAPPER_UUID_H
+#define _LTTNG_WRAPPER_UUID_H
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
+#include <lttng-kernel-version.h>
 #include <linux/uuid.h>
-#else
 
-#include <linux/random.h>
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,7,0))
+static inline
+void lttng_guid_gen(guid_t *u)
+{
+       return guid_gen(u);
+}
+#else /* #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,7,0)) */
 
-typedef struct {
-       __u8 b[16];
-} uuid_le;
+typedef uuid_le guid_t;
 
 static inline
-void uuid_le_gen(uuid_le *u)
+void lttng_guid_gen(guid_t *u)
 {
-       generate_random_uuid(u->b);
+       return uuid_le_gen(u);
 }
+#endif /* #else #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,7,0)) */
 
-#endif
 #endif /* _LTTNG_WRAPPER_UUID_H */