X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-events.c;h=fb45c612f9fed2cf6c7310f704d549fe335260d8;hb=b53047135828b997a4eeb2cae7344cb169aa9c8c;hp=61439ec7c788efa49b3a4c910fe2d9c0a2cf79d6;hpb=a230fd6d07ab3c99a385f5b17ef0bfe055f47653;p=lttng-modules.git diff --git a/lttng-events.c b/lttng-events.c index 61439ec7..fb45c612 100644 --- a/lttng-events.c +++ b/lttng-events.c @@ -7,12 +7,6 @@ * Copyright (C) 2010-2012 Mathieu Desnoyers */ -/* - * This page_alloc.h wrapper needs to be included before gfpflags.h because it - * overrides a function with a define. - */ -#include "wrapper/page_alloc.h" - #include #include #include @@ -23,25 +17,23 @@ #include #include #include -#include #include #include #include #include #include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #define METADATA_CACHE_DEFAULT_SIZE 4096 @@ -79,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) @@ -618,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) @@ -822,9 +800,9 @@ void register_event(struct lttng_event *event) desc = event->desc; switch (event->instrumentation) { case LTTNG_KERNEL_TRACEPOINT: - ret = lttng_wrapper_tracepoint_probe_register(desc->kname, - desc->probe_callback, - event); + ret = lttng_tracepoint_probe_register(desc->kname, + desc->probe_callback, + event); break; case LTTNG_KERNEL_SYSCALL: ret = lttng_syscall_filter_enable(event->chan, @@ -858,7 +836,7 @@ int _lttng_event_unregister(struct lttng_event *event) desc = event->desc; switch (event->instrumentation) { case LTTNG_KERNEL_TRACEPOINT: - ret = lttng_wrapper_tracepoint_probe_unregister(event->desc->kname, + ret = lttng_tracepoint_probe_unregister(event->desc->kname, event->desc->probe_callback, event); break; @@ -1004,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; } @@ -1034,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; } @@ -1139,7 +1117,7 @@ int lttng_session_list_tracker_ids(struct lttng_session *session, struct seq_file *m; int file_fd, ret; - file_fd = lttng_get_unused_fd(); + file_fd = get_unused_fd_flags(0); if (file_fd < 0) { ret = file_fd; goto fd_error; @@ -1184,8 +1162,8 @@ static int lttng_match_enabler_star_glob(const char *desc_name, const char *pattern) { - if (!strutils_star_glob_match(pattern, LTTNG_SIZE_MAX, - desc_name, LTTNG_SIZE_MAX)) + if (!strutils_star_glob_match(pattern, SIZE_MAX, + desc_name, SIZE_MAX)) return 0; return 1; } @@ -1301,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; @@ -2596,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; @@ -2806,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; @@ -2922,30 +2898,10 @@ 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; - ret = wrapper_lttng_fixup_sig(THIS_MODULE); - if (ret) - return ret; - ret = wrapper_get_pfnblock_flags_mask_init(); - if (ret) - return ret; - ret = wrapper_get_pageblock_flags_mask_init(); - if (ret) - return ret; ret = lttng_probes_init(); if (ret) return ret;