projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use MT-safe strtok_r in spawn viewer library helper
[lttng-tools.git]
/
src
/
common
/
event-rule
/
event-rule.c
diff --git
a/src/common/event-rule/event-rule.c
b/src/common/event-rule/event-rule.c
index cdf3e0dedbea19b357fcb68a8342a26cf27c44ef..a37559c70608cf174a5401854031521e0a506409 100644
(file)
--- a/
src/common/event-rule/event-rule.c
+++ b/
src/common/event-rule/event-rule.c
@@
-11,6
+11,8
@@
#include <common/macros.h>
#include <common/payload.h>
#include <common/payload-view.h>
#include <common/macros.h>
#include <common/payload.h>
#include <common/payload-view.h>
+#include <common/hashtable/hashtable.h>
+#include <common/hashtable/utils.h>
#include <lttng/event-rule/event-rule-internal.h>
#include <lttng/event-rule/kprobe-internal.h>
#include <lttng/event-rule/syscall-internal.h>
#include <lttng/event-rule/event-rule-internal.h>
#include <lttng/event-rule/kprobe-internal.h>
#include <lttng/event-rule/syscall-internal.h>
@@
-145,16
+147,24
@@
ssize_t lttng_event_rule_create_from_payload(
struct lttng_event_rule **event_rule)
{
ssize_t ret, consumed = 0;
struct lttng_event_rule **event_rule)
{
ssize_t ret, consumed = 0;
- const struct lttng_event_rule_comm *event_rule_comm;
event_rule_create_from_payload_cb create_from_payload = NULL;
event_rule_create_from_payload_cb create_from_payload = NULL;
+ const struct lttng_event_rule_comm *event_rule_comm;
+ const struct lttng_payload_view event_rule_comm_view =
+ lttng_payload_view_from_view(
+ view, 0, sizeof(*event_rule_comm));
if (!view || !event_rule) {
ret = -1;
goto end;
}
if (!view || !event_rule) {
ret = -1;
goto end;
}
- DBG("Deserializing event_rule from payload.");
- event_rule_comm = (const struct lttng_event_rule_comm *) view->buffer.data;
+ if (!lttng_payload_view_is_valid(&event_rule_comm_view)) {
+ ret = -1;
+ goto end;
+ }
+
+ DBG("Deserializing event_rule from payload");
+ event_rule_comm = (const struct lttng_event_rule_comm *) event_rule_comm_view.buffer.data;
consumed += sizeof(*event_rule_comm);
switch ((enum lttng_event_rule_type) event_rule_comm->event_rule_type) {
consumed += sizeof(*event_rule_comm);
switch ((enum lttng_event_rule_type) event_rule_comm->event_rule_type) {
@@
-234,10
+244,11
@@
void lttng_event_rule_put(struct lttng_event_rule *event_rule)
LTTNG_HIDDEN
enum lttng_error_code lttng_event_rule_generate_filter_bytecode(
LTTNG_HIDDEN
enum lttng_error_code lttng_event_rule_generate_filter_bytecode(
- struct lttng_event_rule *rule, uid_t uid, gid_t gid)
+ struct lttng_event_rule *rule,
+ const struct lttng_credentials *creds)
{
assert(rule->generate_filter_bytecode);
{
assert(rule->generate_filter_bytecode);
- return rule->generate_filter_bytecode(rule,
uid, gid
);
+ return rule->generate_filter_bytecode(rule,
creds
);
}
LTTNG_HIDDEN
}
LTTNG_HIDDEN
@@
-256,11
+267,12
@@
const struct lttng_filter_bytecode *lttng_event_rule_get_filter_bytecode(
}
LTTNG_HIDDEN
}
LTTNG_HIDDEN
-struct lttng_event_exclusion *lttng_event_rule_generate_exclusions(
- const struct lttng_event_rule *rule)
+enum lttng_event_rule_generate_exclusions_status
+lttng_event_rule_generate_exclusions(const struct lttng_event_rule *rule,
+ struct lttng_event_exclusion **exclusions)
{
assert(rule->generate_exclusions);
{
assert(rule->generate_exclusions);
- return rule->generate_exclusions(rule);
+ return rule->generate_exclusions(rule
, exclusions
);
}
LTTNG_HIDDEN
}
LTTNG_HIDDEN
@@
-283,3
+295,10
@@
const char *lttng_event_rule_type_str(enum lttng_event_rule_type type)
abort();
}
}
abort();
}
}
+
+LTTNG_HIDDEN
+unsigned long lttng_event_rule_hash(const struct lttng_event_rule *rule)
+{
+ assert(rule->hash);
+ return rule->hash(rule);
+}
This page took
0.027722 seconds
and
4
git commands to generate.