projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: pipe: stop using ->can_merge (v5.1)
[lttng-modules.git]
/
lttng-events.h
diff --git
a/lttng-events.h
b/lttng-events.h
index 4093bd8abd6a39567bd33213cb33746218c9f3f0..19037062d8f4b6c08348aa885c4bbc54b04b4182 100644
(file)
--- a/
lttng-events.h
+++ b/
lttng-events.h
@@
-15,7
+15,7
@@
#include <linux/kprobes.h>
#include <linux/kref.h>
#include <lttng-cpuhotplug.h>
#include <linux/kprobes.h>
#include <linux/kref.h>
#include <lttng-cpuhotplug.h>
-#include <
wrapper
/uuid.h>
+#include <
linux
/uuid.h>
#include <wrapper/uprobes.h>
#include <lttng-tracer.h>
#include <lttng-abi.h>
#include <wrapper/uprobes.h>
#include <lttng-tracer.h>
#include <lttng-abi.h>
@@
-285,6
+285,13
@@
struct lttng_enabler_ref {
struct lttng_enabler *ref; /* backward ref */
};
struct lttng_enabler *ref; /* backward ref */
};
+struct lttng_uprobe_handler {
+ struct lttng_event *event;
+ loff_t offset;
+ struct uprobe_consumer up_consumer;
+ struct list_head node;
+};
+
/*
* lttng_event structure is referred to by the tracing fast path. It must be
* kept small.
/*
* lttng_event structure is referred to by the tracing fast path. It must be
* kept small.
@@
-311,9
+318,8
@@
struct lttng_event {
char *symbol_name;
} ftrace;
struct {
char *symbol_name;
} ftrace;
struct {
- struct uprobe_consumer up_consumer;
struct inode *inode;
struct inode *inode;
-
loff_t offset
;
+
struct list_head head
;
} uprobe;
} u;
struct list_head list; /* Event list in session */
} uprobe;
} u;
struct list_head list; /* Event list in session */
@@
-710,7
+716,7
@@
int lttng_add_migratable_to_ctx(struct lttng_ctx **ctx)
int lttng_add_callstack_to_ctx(struct lttng_ctx **ctx, int type);
int lttng_add_callstack_to_ctx(struct lttng_ctx **ctx, int type);
-#if defined(CONFIG_PERF_EVENTS)
&& (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
+#if defined(CONFIG_PERF_EVENTS)
int lttng_add_perf_counter_to_ctx(uint32_t type,
uint64_t config,
const char *name,
int lttng_add_perf_counter_to_ctx(uint32_t type,
uint64_t config,
const char *name,
@@
-777,19
+783,27
@@
void lttng_kprobes_destroy_private(struct lttng_event *event)
}
#endif
}
#endif
+int lttng_event_add_callsite(struct lttng_event *event,
+ struct lttng_kernel_event_callsite *callsite);
+
#ifdef CONFIG_UPROBES
int lttng_uprobes_register(const char *name,
#ifdef CONFIG_UPROBES
int lttng_uprobes_register(const char *name,
- const char *path,
-
uint64_t offse
t,
-
struct lttng_event *event
);
+ int fd, struct lttng_event *event);
+
int lttng_uprobes_add_callsite(struct lttng_event *even
t,
+
struct lttng_kernel_event_callsite *callsite
);
void lttng_uprobes_unregister(struct lttng_event *event);
void lttng_uprobes_destroy_private(struct lttng_event *event);
#else
static inline
int lttng_uprobes_register(const char *name,
void lttng_uprobes_unregister(struct lttng_event *event);
void lttng_uprobes_destroy_private(struct lttng_event *event);
#else
static inline
int lttng_uprobes_register(const char *name,
- const char *path,
- uint64_t offset,
- struct lttng_event *event)
+ int fd, struct lttng_event *event)
+{
+ return -ENOSYS;
+}
+
+static inline
+int lttng_uprobes_add_callsite(struct lttng_event *event,
+ struct lttng_kernel_event_callsite *callsite)
{
return -ENOSYS;
}
{
return -ENOSYS;
}
@@
-877,8
+891,6
@@
int lttng_calibrate(struct lttng_kernel_calibrate *calibrate);
extern const struct file_operations lttng_tracepoint_list_fops;
extern const struct file_operations lttng_syscall_list_fops;
extern const struct file_operations lttng_tracepoint_list_fops;
extern const struct file_operations lttng_syscall_list_fops;
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
#define TRACEPOINT_HAS_DATA_ARG
#define TRACEPOINT_HAS_DATA_ARG
-#endif
#endif /* _LTTNG_EVENTS_H */
#endif /* _LTTNG_EVENTS_H */
This page took
0.025601 seconds
and
4
git commands to generate.