projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
event-rule: userspace probe: force location on create
[lttng-tools.git]
/
tests
/
unit
/
test_event_rule.c
diff --git
a/tests/unit/test_event_rule.c
b/tests/unit/test_event_rule.c
index 53f16dbbddbca3a6b3e5d3e71a79e6502ddd8d47..72c37709faab7d5346e5fe6221ea2a974b231f7b 100644
(file)
--- a/
tests/unit/test_event_rule.c
+++ b/
tests/unit/test_event_rule.c
@@
-18,14
+18,14
@@
#include <common/payload-view.h>
#include <common/payload.h>
#include <lttng/domain.h>
#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/k
ernel-
probe-internal.h>
+#include <lttng/event-rule/k
ernel-
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/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/u
serspace-
probe-internal.h>
+#include <lttng/event-rule/u
serspace-
probe.h>
#include <lttng/event.h>
#include <lttng/kernel-probe-internal.h>
#include <lttng/kernel-probe.h>
#include <lttng/event.h>
#include <lttng/kernel-probe-internal.h>
#include <lttng/kernel-probe.h>
@@
-37,7
+37,7
@@
int lttng_opt_quiet = 1;
int lttng_opt_verbose;
int lttng_opt_mi;
int lttng_opt_verbose;
int lttng_opt_mi;
-#define NUM_TESTS 18
7
+#define NUM_TESTS 18
4
struct tracepoint_test {
enum lttng_domain_type type;
struct tracepoint_test {
enum lttng_domain_type type;
@@
-225,7
+225,7
@@
static void test_event_rule_syscall(void)
lttng_event_rule_destroy(syscall_from_buffer);
}
lttng_event_rule_destroy(syscall_from_buffer);
}
-static void test_event_rule_uprobe(void)
+static void test_event_rule_u
serspace_
probe(void)
{
struct lttng_event_rule *uprobe = NULL;
struct lttng_event_rule *uprobe_from_buffer = NULL;
{
struct lttng_event_rule *uprobe = NULL;
struct lttng_event_rule *uprobe_from_buffer = NULL;
@@
-261,14
+261,10
@@
static void test_event_rule_uprobe(void)
lttng_payload_init(&payload);
lttng_payload_init(&payload);
- uprobe = lttng_event_rule_u
probe_create(
);
+ uprobe = lttng_event_rule_u
serspace_probe_create(probe_location
);
ok(uprobe, "uprobe event rule object creation.");
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.");
uprobe, &probe_location_tmp);
ok(status == LTTNG_EVENT_RULE_STATUS_OK,
"Getting uprobe event rule location.");
@@
-276,10
+272,10
@@
static void test_event_rule_uprobe(void)
probe_location, probe_location_tmp),
"Location is equal.");
probe_location, probe_location_tmp),
"Location is equal.");
- status = lttng_event_rule_u
probe_se
t_name(uprobe, probe_name);
+ status = lttng_event_rule_u
serspace_probe_set_even
t_name(uprobe, probe_name);
ok(status == LTTNG_EVENT_RULE_STATUS_OK,
"Setting uprobe event rule name: %s.", probe_name);
ok(status == LTTNG_EVENT_RULE_STATUS_OK,
"Setting uprobe event rule name: %s.", probe_name);
- status = lttng_event_rule_u
probe_ge
t_name(uprobe, &tmp);
+ status = lttng_event_rule_u
serspace_probe_get_even
t_name(uprobe, &tmp);
ok(status == LTTNG_EVENT_RULE_STATUS_OK, "Getting uprobe name.");
ok(!strcmp(probe_name, tmp), "Uprobe name are equal.");
ok(status == LTTNG_EVENT_RULE_STATUS_OK, "Getting uprobe name.");
ok(!strcmp(probe_name, tmp), "Uprobe name are equal.");
@@
-306,7
+302,7
@@
end:
lttng_userspace_probe_location_lookup_method_destroy(lookup_method);
}
lttng_userspace_probe_location_lookup_method_destroy(lookup_method);
}
-static void test_event_rule_kprobe_by_location(
+static void test_event_rule_k
ernel_
probe_by_location(
const struct lttng_kernel_probe_location *location)
{
struct lttng_event_rule *kprobe = NULL;
const struct lttng_kernel_probe_location *location)
{
struct lttng_event_rule *kprobe = NULL;
@@
-323,21
+319,18
@@
static void test_event_rule_kprobe_by_location(
lttng_payload_init(&payload);
lttng_payload_init(&payload);
- kprobe = lttng_event_rule_k
probe_create(
);
+ kprobe = lttng_event_rule_k
ernel_probe_create(location
);
ok(kprobe, "kprobe event rule object creation.");
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.");
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_k
probe_se
t_name(kprobe, probe_name);
+ status = lttng_event_rule_k
ernel_probe_set_even
t_name(kprobe, probe_name);
ok(status == LTTNG_EVENT_RULE_STATUS_OK,
"Setting kprobe event rule name: %s.", probe_name);
ok(status == LTTNG_EVENT_RULE_STATUS_OK,
"Setting kprobe event rule name: %s.", probe_name);
- status = lttng_event_rule_k
probe_ge
t_name(kprobe, &tmp);
+ status = lttng_event_rule_k
ernel_probe_get_even
t_name(kprobe, &tmp);
ok(status == LTTNG_EVENT_RULE_STATUS_OK, "Getting kprobe name.");
ok(!strcmp(probe_name, tmp), "kprobe name are equal.");
ok(status == LTTNG_EVENT_RULE_STATUS_OK, "Getting kprobe name.");
ok(!strcmp(probe_name, tmp), "kprobe name are equal.");
@@
-361,7
+354,7
@@
static void test_event_rule_kprobe_by_location(
lttng_event_rule_destroy(kprobe_from_buffer);
}
lttng_event_rule_destroy(kprobe_from_buffer);
}
-static void test_event_rule_kprobe(void)
+static void test_event_rule_k
ernel_
probe(void)
{
struct lttng_kernel_probe_location *address_location = NULL;
struct lttng_kernel_probe_location *symbol_location = NULL;
{
struct lttng_kernel_probe_location *address_location = NULL;
struct lttng_kernel_probe_location *symbol_location = NULL;
@@
-371,8
+364,8
@@
static void test_event_rule_kprobe(void)
assert(address_location);
assert(symbol_location);
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_k
ernel_
probe_by_location(address_location);
+ test_event_rule_k
ernel_
probe_by_location(symbol_location);
lttng_kernel_probe_location_destroy(address_location);
lttng_kernel_probe_location_destroy(symbol_location);
lttng_kernel_probe_location_destroy(address_location);
lttng_kernel_probe_location_destroy(symbol_location);
@@
-383,7
+376,7
@@
int main(int argc, const char *argv[])
plan_tests(NUM_TESTS);
test_event_rule_tracepoint();
test_event_rule_syscall();
plan_tests(NUM_TESTS);
test_event_rule_tracepoint();
test_event_rule_syscall();
- test_event_rule_uprobe();
- test_event_rule_kprobe();
+ test_event_rule_u
serspace_
probe();
+ test_event_rule_k
ernel_
probe();
return exit_status();
}
return exit_status();
}
This page took
0.025168 seconds
and
4
git commands to generate.