projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove lttng_event_rule_tracepoint
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
trace-kernel.c
diff --git
a/src/bin/lttng-sessiond/trace-kernel.c
b/src/bin/lttng-sessiond/trace-kernel.c
index 0ab1b6864808fd687d869956472ac1df63b581b6..bd06ba4ec5dc4f587486b855b5bcb9bd739d7205 100644
(file)
--- a/
src/bin/lttng-sessiond/trace-kernel.c
+++ b/
src/bin/lttng-sessiond/trace-kernel.c
@@
-18,12
+18,13
@@
#include <lttng/userspace-probe-internal.h>
#include <lttng/event-rule/event-rule.h>
#include <lttng/event-rule/event-rule-internal.h>
#include <lttng/userspace-probe-internal.h>
#include <lttng/event-rule/event-rule.h>
#include <lttng/event-rule/event-rule-internal.h>
-#include <lttng/event-rule/kernel-probe.h>
-#include <lttng/event-rule/kernel-probe-internal.h>
+#include <lttng/event-rule/kernel-
k
probe.h>
+#include <lttng/event-rule/kernel-
k
probe-internal.h>
#include <lttng/event-rule/kernel-syscall.h>
#include <lttng/event-rule/kernel-syscall-internal.h>
#include <lttng/event-rule/kernel-syscall.h>
#include <lttng/event-rule/kernel-syscall-internal.h>
-#include <lttng/event-rule/tracepoint.h>
-#include <lttng/event-rule/tracepoint-internal.h>
+#include <lttng/event-rule/kernel-tracepoint.h>
+#include <lttng/event-rule/kernel-tracepoint-internal.h>
+#include <lttng/event-rule/kernel-uprobe.h>
#include <lttng/event-rule/kernel-uprobe-internal.h>
#include <common/common.h>
#include <common/defaults.h>
#include <lttng/event-rule/kernel-uprobe-internal.h>
#include <common/common.h>
#include <common/defaults.h>
@@
-552,7
+553,7
@@
enum lttng_error_code trace_kernel_init_event_notifier_from_event_rule(
int strncpy_ret;
switch (lttng_event_rule_get_type(rule)) {
int strncpy_ret;
switch (lttng_event_rule_get_type(rule)) {
- case LTTNG_EVENT_RULE_TYPE_KERNEL_PROBE:
+ case LTTNG_EVENT_RULE_TYPE_KERNEL_
K
PROBE:
{
uint64_t address = 0, offset = 0;
const char *symbol_name = NULL;
{
uint64_t address = 0, offset = 0;
const char *symbol_name = NULL;
@@
-560,7
+561,7
@@
enum lttng_error_code trace_kernel_init_event_notifier_from_event_rule(
enum lttng_kernel_probe_location_status k_status;
enum lttng_event_rule_status status;
enum lttng_kernel_probe_location_status k_status;
enum lttng_event_rule_status status;
- status = lttng_event_rule_kernel_probe_get_location(rule, &location);
+ status = lttng_event_rule_kernel_
k
probe_get_location(rule, &location);
if (status != LTTNG_EVENT_RULE_STATUS_OK) {
ret_code = LTTNG_ERR_PROBE_LOCATION_INVAL;
goto error;
if (status != LTTNG_EVENT_RULE_STATUS_OK) {
ret_code = LTTNG_ERR_PROBE_LOCATION_INVAL;
goto error;
@@
-603,7
+604,7
@@
enum lttng_error_code trace_kernel_init_event_notifier_from_event_rule(
kernel_event_notifier->event.u.kprobe.symbol_name[LTTNG_KERNEL_ABI_SYM_NAME_LEN - 1] = '\0';
kernel_event_notifier->event.u.kprobe.symbol_name[LTTNG_KERNEL_ABI_SYM_NAME_LEN - 1] = '\0';
- status = lttng_event_rule_kernel_probe_get_event_name(rule, &name);
+ status = lttng_event_rule_kernel_
k
probe_get_event_name(rule, &name);
assert(status == LTTNG_EVENT_RULE_STATUS_OK);
ret_code = LTTNG_OK;
break;
assert(status == LTTNG_EVENT_RULE_STATUS_OK);
ret_code = LTTNG_OK;
break;
@@
-655,15
+656,12
@@
enum lttng_error_code trace_kernel_init_event_notifier_from_event_rule(
ret_code = LTTNG_OK;
break;
}
ret_code = LTTNG_OK;
break;
}
- case LTTNG_EVENT_RULE_TYPE_TRACEPOINT:
+ case LTTNG_EVENT_RULE_TYPE_
KERNEL_
TRACEPOINT:
{
{
- const enum lttng_domain_type domain =
- lttng_event_rule_get_domain_type(rule);
const enum lttng_event_rule_status status =
const enum lttng_event_rule_status status =
- lttng_event_rule_tracepoint_get_name_pattern(
+ lttng_event_rule_
kernel_
tracepoint_get_name_pattern(
rule, &name);
rule, &name);
- assert(domain == LTTNG_DOMAIN_KERNEL);
assert(status == LTTNG_EVENT_RULE_STATUS_OK);
kernel_event_notifier->event.instrumentation =
LTTNG_KERNEL_ABI_TRACEPOINT;
assert(status == LTTNG_EVENT_RULE_STATUS_OK);
kernel_event_notifier->event.instrumentation =
LTTNG_KERNEL_ABI_TRACEPOINT;
This page took
0.024384 seconds
and
4
git commands to generate.