#include <common/payload-view.h>
#include <common/payload.h>
#include <lttng/domain.h>
-#include <lttng/event-rule/kprobe-internal.h>
-#include <lttng/event-rule/kprobe.h>
+#include <lttng/event-rule/kernel-probe-internal.h>
+#include <lttng/event-rule/kernel-probe.h>
#include <lttng/event-rule/syscall-internal.h>
#include <lttng/event-rule/syscall.h>
#include <lttng/event-rule/tracepoint-internal.h>
#include <lttng/event-rule/tracepoint.h>
-#include <lttng/event-rule/uprobe-internal.h>
-#include <lttng/event-rule/uprobe.h>
+#include <lttng/event-rule/userspace-probe-internal.h>
+#include <lttng/event-rule/userspace-probe.h>
#include <lttng/event.h>
#include <lttng/kernel-probe-internal.h>
#include <lttng/kernel-probe.h>
int lttng_opt_verbose;
int lttng_opt_mi;
-#define NUM_TESTS 187
+#define NUM_TESTS 184
struct tracepoint_test {
enum lttng_domain_type type;
lttng_event_rule_destroy(syscall_from_buffer);
}
-static void test_event_rule_uprobe(void)
+static void test_event_rule_userspace_probe(void)
{
struct lttng_event_rule *uprobe = NULL;
struct lttng_event_rule *uprobe_from_buffer = NULL;
lttng_payload_init(&payload);
- uprobe = lttng_event_rule_uprobe_create();
+ uprobe = lttng_event_rule_userspace_probe_create(probe_location);
ok(uprobe, "uprobe event rule object creation.");
- status = lttng_event_rule_uprobe_set_location(uprobe, probe_location);
- ok(status == LTTNG_EVENT_RULE_STATUS_OK,
- "Setting uprobe event rule location.");
-
- status = lttng_event_rule_uprobe_get_location(
+ status = lttng_event_rule_userspace_probe_get_location(
uprobe, &probe_location_tmp);
ok(status == LTTNG_EVENT_RULE_STATUS_OK,
"Getting uprobe event rule location.");
probe_location, probe_location_tmp),
"Location is equal.");
- status = lttng_event_rule_uprobe_set_name(uprobe, probe_name);
+ status = lttng_event_rule_userspace_probe_set_event_name(uprobe, probe_name);
ok(status == LTTNG_EVENT_RULE_STATUS_OK,
"Setting uprobe event rule name: %s.", probe_name);
- status = lttng_event_rule_uprobe_get_name(uprobe, &tmp);
+ status = lttng_event_rule_userspace_probe_get_event_name(uprobe, &tmp);
ok(status == LTTNG_EVENT_RULE_STATUS_OK, "Getting uprobe name.");
ok(!strcmp(probe_name, tmp), "Uprobe name are equal.");
lttng_userspace_probe_location_lookup_method_destroy(lookup_method);
}
-static void test_event_rule_kprobe_by_location(
+static void test_event_rule_kernel_probe_by_location(
const struct lttng_kernel_probe_location *location)
{
struct lttng_event_rule *kprobe = NULL;
lttng_payload_init(&payload);
- kprobe = lttng_event_rule_kprobe_create();
+ kprobe = lttng_event_rule_kernel_probe_create(location);
ok(kprobe, "kprobe event rule object creation.");
- status = lttng_event_rule_kprobe_set_location(kprobe, location);
- ok(status == LTTNG_EVENT_RULE_STATUS_OK,
- "Setting kprobe event rule location.");
- status = lttng_event_rule_kprobe_get_location(kprobe, &_location);
+ status = lttng_event_rule_kernel_probe_get_location(kprobe, &_location);
ok(status == LTTNG_EVENT_RULE_STATUS_OK,
"Getting kprobe event rule location.");
ok(lttng_kernel_probe_location_is_equal(location, _location), "Locations are equal.");
- status = lttng_event_rule_kprobe_set_name(kprobe, probe_name);
+ status = lttng_event_rule_kernel_probe_set_event_name(kprobe, probe_name);
ok(status == LTTNG_EVENT_RULE_STATUS_OK,
"Setting kprobe event rule name: %s.", probe_name);
- status = lttng_event_rule_kprobe_get_name(kprobe, &tmp);
+ status = lttng_event_rule_kernel_probe_get_event_name(kprobe, &tmp);
ok(status == LTTNG_EVENT_RULE_STATUS_OK, "Getting kprobe name.");
ok(!strcmp(probe_name, tmp), "kprobe name are equal.");
lttng_event_rule_destroy(kprobe_from_buffer);
}
-static void test_event_rule_kprobe(void)
+static void test_event_rule_kernel_probe(void)
{
struct lttng_kernel_probe_location *address_location = NULL;
struct lttng_kernel_probe_location *symbol_location = NULL;
assert(address_location);
assert(symbol_location);
- test_event_rule_kprobe_by_location(address_location);
- test_event_rule_kprobe_by_location(symbol_location);
+ test_event_rule_kernel_probe_by_location(address_location);
+ test_event_rule_kernel_probe_by_location(symbol_location);
lttng_kernel_probe_location_destroy(address_location);
lttng_kernel_probe_location_destroy(symbol_location);
plan_tests(NUM_TESTS);
test_event_rule_tracepoint();
test_event_rule_syscall();
- test_event_rule_uprobe();
- test_event_rule_kprobe();
+ test_event_rule_userspace_probe();
+ test_event_rule_kernel_probe();
return exit_status();
}