#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/kprobe.h>
-#include <lttng/event-rule/kprobe-internal.h>
+#include <lttng/event-rule/kernel-probe.h>
+#include <lttng/event-rule/kernel-probe-internal.h>
#include <lttng/event-rule/syscall.h>
#include <lttng/event-rule/syscall-internal.h>
#include <lttng/event-rule/tracepoint.h>
#include <lttng/event-rule/tracepoint-internal.h>
-#include <lttng/event-rule/uprobe-internal.h>
+#include <lttng/event-rule/userspace-probe-internal.h>
#include <common/common.h>
#include <common/defaults.h>
#include <common/trace-chunk.h>
assert(condition);
condition_type = lttng_condition_get_type(condition);
- assert(condition_type == LTTNG_CONDITION_TYPE_EVENT_RULE_HIT);
+ assert(condition_type == LTTNG_CONDITION_TYPE_ON_EVENT);
- condition_status = lttng_condition_event_rule_get_rule(
+ condition_status = lttng_condition_on_event_get_rule(
condition, &event_rule);
assert(condition_status == LTTNG_CONDITION_STATUS_OK);
assert(event_rule);
int strncpy_ret;
switch (lttng_event_rule_get_type(rule)) {
- case LTTNG_EVENT_RULE_TYPE_KPROBE:
+ case LTTNG_EVENT_RULE_TYPE_KERNEL_PROBE:
{
uint64_t address = 0, offset = 0;
const char *symbol_name = NULL;
enum lttng_kernel_probe_location_status k_status;
enum lttng_event_rule_status status;
- status = lttng_event_rule_kprobe_get_location(rule, &location);
+ status = lttng_event_rule_kernel_probe_get_location(rule, &location);
if (status != LTTNG_EVENT_RULE_STATUS_OK) {
ret_code = LTTNG_ERR_PROBE_LOCATION_INVAL;
goto error;
}
kernel_event_notifier->event.u.kprobe.symbol_name[LTTNG_KERNEL_SYM_NAME_LEN - 1] = '\0';
- status = lttng_event_rule_kprobe_get_name(rule, &name);
+
+ status = lttng_event_rule_kernel_probe_get_event_name(rule, &name);
assert(status == LTTNG_EVENT_RULE_STATUS_OK);
ret_code = LTTNG_OK;
break;
}
- case LTTNG_EVENT_RULE_TYPE_UPROBE:
+ case LTTNG_EVENT_RULE_TYPE_USERSPACE_PROBE:
{
const struct lttng_userspace_probe_location* location = NULL;
const struct lttng_userspace_probe_location_lookup_method *lookup = NULL;
enum lttng_event_rule_status status;
- status = lttng_event_rule_uprobe_get_location(rule, &location);
+ status = lttng_event_rule_userspace_probe_get_location(rule, &location);
if (status != LTTNG_EVENT_RULE_STATUS_OK) {
ret_code = LTTNG_ERR_PROBE_LOCATION_INVAL;
goto error;
abort();
}
- status = lttng_event_rule_uprobe_get_name(rule, &name);
+ status = lttng_event_rule_userspace_probe_get_event_name(
+ rule, &name);
assert(status == LTTNG_EVENT_RULE_STATUS_OK);
ret_code = LTTNG_OK;
break;
ret_code = LTTNG_OK;
break;
}
- case LTTNG_EVENT_RULE_TYPE_KRETPROBE:
+ case LTTNG_EVENT_RULE_TYPE_KERNEL_FUNCTION:
default:
abort();
break;