X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fkernel-probe.c;h=27ca02c99d09ea03212bd7d1489221d17270f50c;hb=6808ef55e;hp=1934a76b1e261ffb44505fe8d02da21c5c74119a;hpb=808cb744a46310d2e5fbbe9ab025cd427bcfc0a8;p=lttng-tools.git

diff --git a/src/common/kernel-probe.c b/src/common/kernel-probe.c
index 1934a76b1..27ca02c99 100644
--- a/src/common/kernel-probe.c
+++ b/src/common/kernel-probe.c
@@ -99,7 +99,7 @@ lttng_kernel_probe_location_address_create(uint64_t address)
 
 	location = zmalloc(sizeof(*location));
 	if (!location) {
-		PERROR("Error allocating userspace probe location");
+		PERROR("Error allocating userspace probe location.");
 		goto end;
 	}
 
@@ -433,20 +433,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);
 
@@ -562,3 +565,110 @@ bool lttng_kernel_probe_location_is_equal(
 end:
 	return is_equal;
 }
+
+static struct lttng_kernel_probe_location *
+lttng_kernel_probe_location_symbol_copy(
+		const struct lttng_kernel_probe_location *location)
+{
+	struct lttng_kernel_probe_location *new_location = NULL;
+	struct lttng_kernel_probe_location_symbol *symbol_location;
+	enum lttng_kernel_probe_location_status status;
+	const char *symbol_name = NULL;
+	uint64_t offset;
+
+	assert(location);
+	assert(location->type == LTTNG_KERNEL_PROBE_LOCATION_TYPE_SYMBOL_OFFSET);
+	symbol_location = container_of(
+			location, typeof(*symbol_location), parent);
+
+	 /* Get probe location offset */
+	status = lttng_kernel_probe_location_symbol_get_offset(location, &offset);
+	if (status != LTTNG_KERNEL_PROBE_LOCATION_STATUS_OK) {
+		ERR("Get kernel probe location offset failed.");
+		goto error;
+	}
+
+	symbol_name = lttng_kernel_probe_location_symbol_get_name(location);
+	if (!symbol_name) {
+		ERR("Kernel probe symbol name is NULL.");
+		goto error;
+	}
+
+	/* Create the probe_location */
+	new_location = lttng_kernel_probe_location_symbol_create(
+			symbol_name, offset);
+
+	goto end;
+
+error:
+	new_location = NULL;
+end:
+	return new_location;
+}
+static struct lttng_kernel_probe_location *
+lttng_kernel_probe_location_address_copy(
+		const struct lttng_kernel_probe_location *location)
+{
+	struct lttng_kernel_probe_location *new_location = NULL;
+	struct lttng_kernel_probe_location_address *address_location;
+	enum lttng_kernel_probe_location_status status;
+	uint64_t address;
+
+	assert(location);
+	assert(location->type == LTTNG_KERNEL_PROBE_LOCATION_TYPE_ADDRESS);
+	address_location = container_of(
+			location, typeof(*address_location), parent);
+
+
+	 /* Get probe location fields */
+	status = lttng_kernel_probe_location_address_get_address(location, &address);
+	if (status != LTTNG_KERNEL_PROBE_LOCATION_STATUS_OK) {
+		ERR("Get kernel probe address failed.");
+		goto error;
+	}
+
+	/* Create the probe_location */
+	new_location = lttng_kernel_probe_location_address_create(address);
+
+	goto end;
+
+error:
+	new_location = NULL;
+end:
+	return new_location;
+}
+
+LTTNG_HIDDEN
+struct lttng_kernel_probe_location *lttng_kernel_probe_location_copy(
+		const struct lttng_kernel_probe_location *location)
+{
+	struct lttng_kernel_probe_location *new_location = NULL;
+	enum lttng_kernel_probe_location_type type;
+
+	if (!location) {
+		goto err;
+	}
+
+	type = lttng_kernel_probe_location_get_type(location);
+	switch (type) {
+	case LTTNG_KERNEL_PROBE_LOCATION_TYPE_ADDRESS:
+		new_location =
+			lttng_kernel_probe_location_address_copy(location);
+		if (!new_location) {
+			goto err;
+		}
+		break;
+	case LTTNG_KERNEL_PROBE_LOCATION_TYPE_SYMBOL_OFFSET:
+		new_location =
+			lttng_kernel_probe_location_symbol_copy(location);
+		if (!new_location) {
+			goto err;
+		}
+		break;
+	default:
+		new_location = NULL;
+		goto err;
+	}
+err:
+	return new_location;
+}