X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2Flocation.c;h=97fed09b1ff380e87712c2565e96344894a8a6aa;hb=d37406195ec30adfb1bd903e3ee8dfdda79700ef;hp=241b6486ed10ca4e23ceb118cac3e23e86142723;hpb=f7daf93a18ad80c6e32096383ad0ca61ab51129f;p=lttng-tools.git

diff --git a/src/common/location.c b/src/common/location.c
index 241b6486e..97fed09b1 100644
--- a/src/common/location.c
+++ b/src/common/location.c
@@ -1,23 +1,14 @@
 /*
- * Copyright (C) 2018 - Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ * Copyright (C) 2018 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License, version 2.1 only,
- * as published by the Free Software Foundation.
+ * SPDX-License-Identifier: LGPL-2.1-only
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <lttng/location-internal.h>
 #include <common/macros.h>
 #include <stdlib.h>
+#include <common/error.h>
 
 static
 struct lttng_trace_archive_location *lttng_trace_archive_location_create(
@@ -30,18 +21,17 @@ struct lttng_trace_archive_location *lttng_trace_archive_location_create(
 		goto end;
 	}
 
+	urcu_ref_init(&location->ref);
 	location->type = type;
 end:
 	return location;
 }
 
-LTTNG_HIDDEN
-void lttng_trace_archive_location_destroy(
-		struct lttng_trace_archive_location *location)
+static
+void trace_archive_location_destroy_ref(struct urcu_ref *ref)
 {
-	if (!location) {
-		return;
-	}
+	struct lttng_trace_archive_location *location =
+			container_of(ref, struct lttng_trace_archive_location, ref);
 
 	switch (location->type) {
 	case LTTNG_TRACE_ARCHIVE_LOCATION_TYPE_LOCAL:
@@ -58,6 +48,22 @@ void lttng_trace_archive_location_destroy(
 	free(location);
 }
 
+LTTNG_HIDDEN
+void lttng_trace_archive_location_get(struct lttng_trace_archive_location *location)
+{
+	urcu_ref_get(&location->ref);
+}
+
+LTTNG_HIDDEN
+void lttng_trace_archive_location_put(struct lttng_trace_archive_location *location)
+{
+	if (!location) {
+		return;
+	}
+
+	urcu_ref_put(&location->ref, trace_archive_location_destroy_ref);
+}
+
 LTTNG_HIDDEN
 struct lttng_trace_archive_location *lttng_trace_archive_location_local_create(
 		const char *absolute_path)
@@ -82,7 +88,7 @@ struct lttng_trace_archive_location *lttng_trace_archive_location_local_create(
 end:
 	return location;
 error:
-	lttng_trace_archive_location_destroy(location);
+	lttng_trace_archive_location_put(location);
 	return NULL;
 }
 
@@ -120,7 +126,7 @@ struct lttng_trace_archive_location *lttng_trace_archive_location_relay_create(
 end:
 	return location;
 error:
-	lttng_trace_archive_location_destroy(location);
+	lttng_trace_archive_location_put(location);
 	return NULL;
 }
 
@@ -135,11 +141,12 @@ ssize_t lttng_trace_archive_location_create_from_buffer(
 
 	location_comm_view = lttng_buffer_view_from_view(view, 0,
 			sizeof(*location_comm));
-	if (!location_comm_view.data) {
+	if (!lttng_buffer_view_is_valid(&location_comm_view)) {
 		goto error;
 	}
+
 	offset += location_comm_view.size;
-	location_comm = (const struct lttng_trace_archive_location_comm *) view->data;
+	location_comm = (const struct lttng_trace_archive_location_comm *) location_comm_view.data;
 
 	switch ((enum lttng_trace_archive_location_type) location_comm->type) {
 	case LTTNG_TRACE_ARCHIVE_LOCATION_TYPE_LOCAL:
@@ -148,9 +155,10 @@ ssize_t lttng_trace_archive_location_create_from_buffer(
 				lttng_buffer_view_from_view(view, offset,
 				location_comm->types.local.absolute_path_len);
 
-		if (!absolute_path_view.data) {
+		if (!lttng_buffer_view_is_valid(&absolute_path_view)) {
 			goto error;
 		}
+
 		if (absolute_path_view.data[absolute_path_view.size - 1] != '\0') {
 			goto error;
 		}
@@ -173,9 +181,12 @@ ssize_t lttng_trace_archive_location_create_from_buffer(
 				offset + hostname_view.size,
 				location_comm->types.relay.relative_path_len);
 
-		if (!hostname_view.data || !relative_path_view.data) {
+		if (!lttng_buffer_view_is_valid(&hostname_view) ||
+				!lttng_buffer_view_is_valid(
+						&relative_path_view)) {
 			goto error;
 		}
+
 		if (hostname_view.data[hostname_view.size - 1] != '\0') {
 			goto error;
 		}