X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fkernel-probe.c;h=d2637f933efa18afb243049353cdab4c089908a2;hp=9a84727cac09dee1644ea0186df607f07050eecc;hb=44635d77b591f83a80d48cd93497bd1cd6aa788d;hpb=077192fd1880652a61400b493a0b6cf5bb199435

diff --git a/src/common/kernel-probe.c b/src/common/kernel-probe.c
index 9a84727ca..d2637f933 100644
--- a/src/common/kernel-probe.c
+++ b/src/common/kernel-probe.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 <fcntl.h>
 #include <lttng/constant.h>
 #include <lttng/kernel-probe.h>
@@ -39,6 +41,14 @@ bool lttng_kernel_probe_location_symbol_is_equal(
 		const struct lttng_kernel_probe_location *a,
 		const struct lttng_kernel_probe_location *b);
 
+static
+unsigned long lttng_kernel_probe_location_address_hash(
+		const struct lttng_kernel_probe_location *location);
+
+static
+unsigned long lttng_kernel_probe_location_symbol_hash(
+		const struct lttng_kernel_probe_location *location);
+
 enum lttng_kernel_probe_location_type lttng_kernel_probe_location_get_type(
 		const struct lttng_kernel_probe_location *location)
 {
@@ -109,6 +119,7 @@ lttng_kernel_probe_location_address_create(uint64_t address)
 	ret->type = LTTNG_KERNEL_PROBE_LOCATION_TYPE_ADDRESS;
 	ret->equal = lttng_kernel_probe_location_address_is_equal;
 	ret->serialize = lttng_kernel_probe_location_address_serialize;
+	ret->hash = lttng_kernel_probe_location_address_hash;
 
 end:
 	return ret;
@@ -145,6 +156,7 @@ lttng_kernel_probe_location_symbol_create(const char *symbol_name,
 	ret->type = LTTNG_KERNEL_PROBE_LOCATION_TYPE_SYMBOL_OFFSET;
 	ret->equal = lttng_kernel_probe_location_symbol_is_equal;
 	ret->serialize = lttng_kernel_probe_location_symbol_serialize;
+	ret->hash = lttng_kernel_probe_location_symbol_hash;
 	goto end;
 
 error:
@@ -433,20 +445,23 @@ ssize_t lttng_kernel_probe_location_create_from_payload(
 		struct lttng_payload_view *view,
 		struct lttng_kernel_probe_location **location)
 {
-	struct lttng_kernel_probe_location_comm *probe_location_comm;
 	enum lttng_kernel_probe_location_type type;
 	ssize_t consumed = 0;
 	ssize_t ret;
+	const struct lttng_kernel_probe_location_comm *probe_location_comm;
+	const struct lttng_payload_view probe_location_comm_view =
+			lttng_payload_view_from_view(
+					view, 0, sizeof(*probe_location_comm));
 
 	assert(view);
 	assert(location);
 
-	if (view->buffer.size <= sizeof(*probe_location_comm)) {
+	if (!lttng_payload_view_is_valid(&probe_location_comm_view)) {
 		ret = -LTTNG_ERR_INVALID;
 		goto end;
 	}
 
-	probe_location_comm = (typeof(probe_location_comm)) view->buffer.data;
+	probe_location_comm = (typeof(probe_location_comm)) probe_location_comm_view.buffer.data;
 	type = (enum lttng_kernel_probe_location_type) probe_location_comm->type;
 	consumed += sizeof(*probe_location_comm);
 
@@ -486,6 +501,22 @@ end:
 	return ret;
 }
 
+static
+unsigned long lttng_kernel_probe_location_address_hash(
+		const struct lttng_kernel_probe_location *location)
+{
+	unsigned long hash = hash_key_ulong(
+			(void *) LTTNG_KERNEL_PROBE_LOCATION_TYPE_ADDRESS,
+			lttng_ht_seed);
+	struct lttng_kernel_probe_location_address *address_location =
+			container_of(location, typeof(*address_location),
+				parent);
+
+	hash ^= hash_key_u64(&address_location->address, lttng_ht_seed);
+
+	return hash;
+}
+
 static
 bool lttng_kernel_probe_location_address_is_equal(
 		const struct lttng_kernel_probe_location *_a,
@@ -509,6 +540,23 @@ end:
 	return is_equal;
 }
 
+static
+unsigned long lttng_kernel_probe_location_symbol_hash(
+		const struct lttng_kernel_probe_location *location)
+{
+	unsigned long hash = hash_key_ulong(
+			(void *) LTTNG_KERNEL_PROBE_LOCATION_TYPE_SYMBOL_OFFSET,
+			lttng_ht_seed);
+	struct lttng_kernel_probe_location_symbol *symbol_location =
+			container_of(location, typeof(*symbol_location),
+				parent);
+
+	hash ^= hash_key_str(symbol_location->symbol_name, lttng_ht_seed);
+	hash ^= hash_key_u64(&symbol_location->offset, lttng_ht_seed);
+
+	return hash;
+}
+
 static
 bool lttng_kernel_probe_location_symbol_is_equal(
 		const struct lttng_kernel_probe_location *_a,
@@ -669,3 +717,10 @@ struct lttng_kernel_probe_location *lttng_kernel_probe_location_copy(
 err:
 	return new_location;
 }
+
+LTTNG_HIDDEN
+unsigned long lttng_kernel_probe_location_hash(
+	const struct lttng_kernel_probe_location *location)
+{
+	return location->hash(location);
+}