X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcommon%2Fevent-rule%2Fevent-rule.c;h=c6ccc857732c7fc4393055e8360e6243abdca513;hb=f27911615bc5907d61d8ea236da974090bd85d24;hp=cdf3e0dedbea19b357fcb68a8342a26cf27c44ef;hpb=6d420eff669a3de55be3ee348f88a4e244b78ecf;p=lttng-tools.git

diff --git a/src/common/event-rule/event-rule.c b/src/common/event-rule/event-rule.c
index cdf3e0ded..c6ccc8577 100644
--- 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/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>
@@ -39,7 +41,7 @@ enum lttng_domain_type lttng_event_rule_get_domain_type(
 		break;
 	}
 	case LTTNG_EVENT_RULE_TYPE_SYSCALL:
-	case LTTNG_EVENT_RULE_TYPE_KPROBE:
+	case LTTNG_EVENT_RULE_TYPE_KERNEL_PROBE:
 	case LTTNG_EVENT_RULE_TYPE_KRETPROBE:
 	case LTTNG_EVENT_RULE_TYPE_UPROBE:
 		domain_type = LTTNG_DOMAIN_KERNEL;
@@ -145,16 +147,24 @@ ssize_t lttng_event_rule_create_from_payload(
 		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;
+	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;
 	}
 
-	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) {
@@ -162,8 +172,8 @@ ssize_t lttng_event_rule_create_from_payload(
 		create_from_payload =
 				lttng_event_rule_tracepoint_create_from_payload;
 		break;
-	case LTTNG_EVENT_RULE_TYPE_KPROBE:
-		create_from_payload = lttng_event_rule_kprobe_create_from_payload;
+	case LTTNG_EVENT_RULE_TYPE_KERNEL_PROBE:
+		create_from_payload = lttng_event_rule_kernel_probe_create_from_payload;
 		break;
 	case LTTNG_EVENT_RULE_TYPE_KRETPROBE:
 		/* TODO */
@@ -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(
-		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);
-	return rule->generate_filter_bytecode(rule, uid, gid);
+	return rule->generate_filter_bytecode(rule, creds);
 }
 
 LTTNG_HIDDEN
@@ -248,7 +259,7 @@ const char *lttng_event_rule_get_filter(const struct lttng_event_rule *rule)
 }
 
 LTTNG_HIDDEN
-const struct lttng_filter_bytecode *lttng_event_rule_get_filter_bytecode(
+const struct lttng_bytecode *lttng_event_rule_get_filter_bytecode(
 		const struct lttng_event_rule *rule)
 {
 	assert(rule->get_filter_bytecode);
@@ -256,14 +267,45 @@ const struct lttng_filter_bytecode *lttng_event_rule_get_filter_bytecode(
 }
 
 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);
-	return rule->generate_exclusions(rule);
+	return rule->generate_exclusions(rule, exclusions);
 }
 
 LTTNG_HIDDEN
+struct lttng_event *lttng_event_rule_generate_lttng_event(
+		const struct lttng_event_rule *rule)
+{
+	assert(rule->generate_lttng_event);
+	return rule->generate_lttng_event(rule);
+}
+
+LTTNG_HIDDEN
+bool lttng_event_rule_targets_agent_domain(const struct lttng_event_rule *rule)
+{
+	bool targets_agent_domain = false;
+	enum lttng_domain_type type = lttng_event_rule_get_domain_type(rule);
+
+	switch (type) {
+	case LTTNG_DOMAIN_JUL:
+	case LTTNG_DOMAIN_LOG4J:
+	case LTTNG_DOMAIN_PYTHON:
+		targets_agent_domain = true;
+		break;
+	case LTTNG_DOMAIN_UST:
+	case LTTNG_DOMAIN_KERNEL:
+		targets_agent_domain = false;
+		break;
+	default:
+		abort();
+	};
+
+	return targets_agent_domain;
+}
+
 const char *lttng_event_rule_type_str(enum lttng_event_rule_type type)
 {
 	switch (type) {
@@ -273,7 +315,7 @@ const char *lttng_event_rule_type_str(enum lttng_event_rule_type type)
 		return "tracepoint";
 	case LTTNG_EVENT_RULE_TYPE_SYSCALL:
 		return "syscall";
-	case LTTNG_EVENT_RULE_TYPE_KPROBE:
+	case LTTNG_EVENT_RULE_TYPE_KERNEL_PROBE:
 		return "probe";
 	case LTTNG_EVENT_RULE_TYPE_KRETPROBE:
 		return "function";
@@ -283,3 +325,10 @@ const char *lttng_event_rule_type_str(enum lttng_event_rule_type type)
 		abort();
 	}
 }
+
+LTTNG_HIDDEN
+unsigned long lttng_event_rule_hash(const struct lttng_event_rule *rule)
+{
+	assert(rule->hash);
+	return rule->hash(rule);
+}