X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-events.c;h=fb45c612f9fed2cf6c7310f704d549fe335260d8;hb=b53047135828b997a4eeb2cae7344cb169aa9c8c;hp=dbf267f811f5f0865c1f387219cefd334800fea9;hpb=4b4a8b1980b91b11e6d3b628f7285906fa46c676;p=lttng-modules.git

diff --git a/lttng-events.c b/lttng-events.c
index dbf267f8..fb45c612 100644
--- a/lttng-events.c
+++ b/lttng-events.c
@@ -24,17 +24,16 @@
 #include <linux/vmalloc.h>
 #include <linux/limits.h>
 
-#include <wrapper/random.h>
-#include <wrapper/list.h>
-#include <lttng-kernel-version.h>
-#include <lttng-events.h>
-#include <lttng-tracer.h>
-#include <lttng-abi-old.h>
-#include <lttng-endian.h>
-#include <lttng-string-utils.h>
-#include <lttng-tracepoint.h>
-#include <wrapper/ringbuffer/backend.h>
-#include <wrapper/ringbuffer/frontend.h>
+#include <linux/random.h>
+#include <lttng/lttng-kernel-version.h>
+#include <lttng/lttng-events.h>
+#include <lttng/lttng-tracer.h>
+#include <lttng/lttng-abi-old.h>
+#include <lttng/lttng-endian.h>
+#include <lttng/lttng-string-utils.h>
+#include <lttng/lttng-tracepoint.h>
+#include <ringbuffer/backend.h>
+#include <ringbuffer/frontend.h>
 
 #define METADATA_CACHE_DEFAULT_SIZE 4096
 
@@ -72,21 +71,7 @@ int _lttng_field_statedump(struct lttng_session *session,
 
 void synchronize_trace(void)
 {
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,1,0))
 	synchronize_rcu();
-#else
-	synchronize_sched();
-#endif
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
-#ifdef CONFIG_PREEMPT_RT_FULL
-	synchronize_rcu();
-#endif
-#else /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) */
-#ifdef CONFIG_PREEMPT_RT
-	synchronize_rcu();
-#endif
-#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) */
 }
 
 void lttng_lock_sessions(void)
@@ -611,7 +596,7 @@ struct lttng_event *_lttng_event_create(struct lttng_channel *chan,
 	name_len = strlen(event_name);
 	hash = jhash(event_name, name_len, 0);
 	head = &session->events_ht.table[hash & (LTTNG_EVENT_HT_SIZE - 1)];
-	lttng_hlist_for_each_entry(event, head, hlist) {
+	hlist_for_each_entry(event, head, hlist) {
 		WARN_ON_ONCE(!event->desc);
 		if (!strncmp(event->desc->name, event_name,
 					LTTNG_KERNEL_SYM_NAME_LEN - 1)
@@ -997,7 +982,7 @@ void *id_list_start(struct seq_file *m, loff_t *pos)
 		for (i = 0; i < LTTNG_ID_TABLE_SIZE; i++) {
 			struct hlist_head *head = &id_tracker_p->id_hash[i];
 
-			lttng_hlist_for_each_entry(e, head, hlist) {
+			hlist_for_each_entry(e, head, hlist) {
 				if (iter++ >= *pos)
 					return e;
 			}
@@ -1027,7 +1012,7 @@ void *id_list_next(struct seq_file *m, void *p, loff_t *ppos)
 		for (i = 0; i < LTTNG_ID_TABLE_SIZE; i++) {
 			struct hlist_head *head = &id_tracker_p->id_hash[i];
 
-			lttng_hlist_for_each_entry(e, head, hlist) {
+			hlist_for_each_entry(e, head, hlist) {
 				if (iter++ >= *ppos)
 					return e;
 			}
@@ -1294,7 +1279,7 @@ void lttng_create_tracepoint_if_missing(struct lttng_enabler *enabler)
 			 */
 			hash = jhash(event_name, name_len, 0);
 			head = &session->events_ht.table[hash & (LTTNG_EVENT_HT_SIZE - 1)];
-			lttng_hlist_for_each_entry(event, head, hlist) {
+			hlist_for_each_entry(event, head, hlist) {
 				if (event->desc == desc
 						&& event->chan == enabler->chan)
 					found = 1;
@@ -2589,7 +2574,7 @@ static
 int _lttng_session_metadata_statedump(struct lttng_session *session)
 {
 	unsigned char *uuid_c = session->uuid.b;
-	unsigned char uuid_s[37], clock_uuid_s[BOOT_ID_LEN];
+	unsigned char uuid_s[LTTNG_MODULES_UUID_STR_LEN], clock_uuid_s[LTTNG_MODULES_UUID_STR_LEN];
 	const char *product_uuid;
 	struct lttng_channel *chan;
 	struct lttng_event *event;
@@ -2799,8 +2784,6 @@ void lttng_transport_unregister(struct lttng_transport *transport)
 }
 EXPORT_SYMBOL_GPL(lttng_transport_unregister);
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0))
-
 enum cpuhp_state lttng_hp_prepare;
 enum cpuhp_state lttng_hp_online;
 
@@ -2915,17 +2898,6 @@ static void __exit lttng_exit_cpu_hotplug(void)
 	cpuhp_remove_multi_state(lttng_hp_prepare);
 }
 
-#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)) */
-static int lttng_init_cpu_hotplug(void)
-{
-	return 0;
-}
-static void lttng_exit_cpu_hotplug(void)
-{
-}
-#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)) */
-
-
 static int __init lttng_events_init(void)
 {
 	int ret;