projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move wrapper/ringbuffer to include/ringbuffer
[lttng-modules.git]
/
lttng-events.c
diff --git
a/lttng-events.c
b/lttng-events.c
index aa0f2e2abc3fa9632f16353f374d5aa5bb2ad8dd..aec99fb64956167a993889f40659e232ae8310df 100644
(file)
--- a/
lttng-events.c
+++ b/
lttng-events.c
@@
-7,12
+7,6
@@
* Copyright (C) 2010-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
*/
* Copyright (C) 2010-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
*/
-/*
- * 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 <linux/module.h>
#include <linux/mutex.h>
#include <linux/sched.h>
#include <linux/module.h>
#include <linux/mutex.h>
#include <linux/sched.h>
@@
-23,26
+17,23
@@
#include <linux/seq_file.h>
#include <linux/file.h>
#include <linux/anon_inodes.h>
#include <linux/seq_file.h>
#include <linux/file.h>
#include <linux/anon_inodes.h>
-#include <wrapper/file.h>
#include <linux/jhash.h>
#include <linux/uaccess.h>
#include <linux/uuid.h>
#include <linux/dmi.h>
#include <linux/vmalloc.h>
#include <linux/jhash.h>
#include <linux/uaccess.h>
#include <linux/uuid.h>
#include <linux/dmi.h>
#include <linux/vmalloc.h>
+#include <linux/limits.h>
#include <wrapper/random.h>
#include <wrapper/random.h>
-#include <wrapper/tracepoint.h>
-#include <wrapper/list.h>
-#include <wrapper/types.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-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 <
wrapper/ringbuffer/backend
.h>
-#include <
wrapper/ringbuffer/front
end.h>
-#include <
wrapper/time
.h>
+#include <
lttng-tracepoint
.h>
+#include <
include/ringbuffer/back
end.h>
+#include <
include/ringbuffer/frontend
.h>
#define METADATA_CACHE_DEFAULT_SIZE 4096
#define METADATA_CACHE_DEFAULT_SIZE 4096
@@
-80,21
+71,7
@@
int _lttng_field_statedump(struct lttng_session *session,
void synchronize_trace(void)
{
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();
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)
}
void lttng_lock_sessions(void)
@@
-619,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)];
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)
WARN_ON_ONCE(!event->desc);
if (!strncmp(event->desc->name, event_name,
LTTNG_KERNEL_SYM_NAME_LEN - 1)
@@
-823,9
+800,9
@@
void register_event(struct lttng_event *event)
desc = event->desc;
switch (event->instrumentation) {
case LTTNG_KERNEL_TRACEPOINT:
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,
break;
case LTTNG_KERNEL_SYSCALL:
ret = lttng_syscall_filter_enable(event->chan,
@@
-859,7
+836,7
@@
int _lttng_event_unregister(struct lttng_event *event)
desc = event->desc;
switch (event->instrumentation) {
case LTTNG_KERNEL_TRACEPOINT:
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;
event->desc->probe_callback,
event);
break;
@@
-1005,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];
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;
}
if (iter++ >= *pos)
return e;
}
@@
-1035,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];
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;
}
if (iter++ >= *ppos)
return e;
}
@@
-1140,7
+1117,7
@@
int lttng_session_list_tracker_ids(struct lttng_session *session,
struct seq_file *m;
int file_fd, ret;
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;
if (file_fd < 0) {
ret = file_fd;
goto fd_error;
@@
-1185,8
+1162,8
@@
static
int lttng_match_enabler_star_glob(const char *desc_name,
const char *pattern)
{
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;
}
return 0;
return 1;
}
@@
-1302,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)];
*/
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;
if (event->desc == desc
&& event->chan == enabler->chan)
found = 1;
@@
-2511,20
+2488,12
@@
int64_t measure_clock_offset(void)
uint64_t tcf = trace_clock_freq();
int64_t offset;
unsigned long flags;
uint64_t tcf = trace_clock_freq();
int64_t offset;
unsigned long flags;
-#ifdef LTTNG_KERNEL_HAS_TIMESPEC64
struct timespec64 rts = { 0, 0 };
struct timespec64 rts = { 0, 0 };
-#else
- struct timespec rts = { 0, 0 };
-#endif
/* Disable interrupts to increase correlation precision. */
local_irq_save(flags);
monotonic[0] = trace_clock_read64();
/* Disable interrupts to increase correlation precision. */
local_irq_save(flags);
monotonic[0] = trace_clock_read64();
-#ifdef LTTNG_KERNEL_HAS_TIMESPEC64
ktime_get_real_ts64(&rts);
ktime_get_real_ts64(&rts);
-#else
- getnstimeofday(&rts);
-#endif
monotonic[1] = trace_clock_read64();
local_irq_restore(flags);
monotonic[1] = trace_clock_read64();
local_irq_restore(flags);
@@
-2815,8
+2784,6
@@
void lttng_transport_unregister(struct lttng_transport *transport)
}
EXPORT_SYMBOL_GPL(lttng_transport_unregister);
}
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;
enum cpuhp_state lttng_hp_prepare;
enum cpuhp_state lttng_hp_online;
@@
-2931,30
+2898,10
@@
static void __exit lttng_exit_cpu_hotplug(void)
cpuhp_remove_multi_state(lttng_hp_prepare);
}
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;
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;
ret = lttng_probes_init();
if (ret)
return ret;
This page took
0.032025 seconds
and
4
git commands to generate.