X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2Ftrace-chunk.c;h=ff80ae1a89f81b26815719e07fe643bf5031ed8b;hb=6283549225e210dea24e3f896d4482cb28a8e2d4;hp=8a8481b5d41e4ce77e0dbf21a53347d0fa39198a;hpb=ff588497b3dfc3138c9ce005e9270ed5568c05df;p=lttng-tools.git

diff --git a/src/common/trace-chunk.c b/src/common/trace-chunk.c
index 8a8481b5d..ff80ae1a8 100644
--- a/src/common/trace-chunk.c
+++ b/src/common/trace-chunk.c
@@ -1077,9 +1077,8 @@ enum lttng_trace_chunk_status lttng_trace_chunk_set_as_owner(
 		 * A nameless chunk does not need its own output directory.
 		 * The session's output directory will be used.
 		 */
-		const bool reference_acquired =
-				lttng_directory_handle_get(
-					session_output_directory);
+		reference_acquired = lttng_directory_handle_get(
+				session_output_directory);
 
 		assert(reference_acquired);
 		chunk_directory_handle = session_output_directory;
@@ -1871,7 +1870,6 @@ void free_lttng_trace_chunk_registry_element(struct rcu_head *node)
 	struct lttng_trace_chunk_registry_element *element =
 			container_of(node, typeof(*element), rcu_node);
 
-	lttng_trace_chunk_fini(&element->chunk);
 	free(element);
 }
 
@@ -1892,6 +1890,24 @@ void lttng_trace_chunk_release(struct urcu_ref *ref)
 	if (chunk->in_registry_element) {
 		struct lttng_trace_chunk_registry_element *element;
 
+		/*
+		 * Release internal chunk attributes immediately and
+		 * only use the deferred `call_rcu` work to reclaim the
+		 * storage.
+		 *
+		 * This ensures that file handles are released as soon as
+		 * possible which works around a problem we encounter with PRAM fs
+		 * mounts (and possibly other non-POSIX compliant file systems):
+		 * directories that contain files which are open can't be
+		 * rmdir().
+		 *
+		 * This means that the recording of a snapshot could be
+		 * completed, but that it would be impossible for the user to
+		 * delete it until the deferred clean-up released the file
+		 * handles to its contents.
+		 */
+		lttng_trace_chunk_fini(chunk);
+
 		element = container_of(chunk, typeof(*element), chunk);
 		if (element->registry) {
 			rcu_read_lock();
@@ -2001,7 +2017,20 @@ LTTNG_HIDDEN
 struct lttng_trace_chunk *
 lttng_trace_chunk_registry_publish_chunk(
 		struct lttng_trace_chunk_registry *registry,
-		uint64_t session_id, struct lttng_trace_chunk *chunk)
+		uint64_t session_id,
+		struct lttng_trace_chunk *chunk)
+{
+	bool unused;
+
+	return lttng_trace_chunk_registry_publish_chunk_published(
+			registry, session_id, chunk, &unused);
+}
+
+struct lttng_trace_chunk *
+lttng_trace_chunk_registry_publish_chunk_published(
+		struct lttng_trace_chunk_registry *registry,
+		uint64_t session_id, struct lttng_trace_chunk *chunk,
+		bool *previously_published)
 {
 	struct lttng_trace_chunk_registry_element *element;
 	unsigned long element_hash;
@@ -2036,6 +2065,7 @@ lttng_trace_chunk_registry_publish_chunk(
 			element->registry = registry;
 			/* Acquire a reference for the caller. */
 			if (lttng_trace_chunk_get(&element->chunk)) {
+				*previously_published = false;
 				break;
 			} else {
 				/*
@@ -2062,6 +2092,7 @@ lttng_trace_chunk_registry_publish_chunk(
 		if (lttng_trace_chunk_get(published_chunk)) {
 			lttng_trace_chunk_put(&element->chunk);
 			element = published_element;
+			*previously_published = true;
 			break;
 		}
 		/*