X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Ftrace-chunk.c;h=908bdf9fee148836202af6738167a58dec28f20b;hp=172bd3df88e1d32247a93f06786f8c639de5225b;hb=65eefd4c79ec8ba20a0ff2356b053c321de224aa;hpb=c35f9726a22f1d93e14589688d830efccda196f3

diff --git a/src/common/trace-chunk.c b/src/common/trace-chunk.c
index 172bd3df8..908bdf9fe 100644
--- a/src/common/trace-chunk.c
+++ b/src/common/trace-chunk.c
@@ -77,7 +77,7 @@ struct lttng_trace_chunk {
 	struct lttng_dynamic_pointer_array top_level_directories;
 	/* Is contained within an lttng_trace_chunk_registry_element? */
 	bool in_registry_element;
-	bool name_overriden;
+	bool name_overridden;
 	char *name;
 	/* An unset id means the chunk is anonymous. */
 	LTTNG_OPTIONAL(uint64_t) id;
@@ -91,8 +91,8 @@ struct lttng_trace_chunk {
 
 /* A trace chunk is uniquely identified by its (session id, chunk id) tuple. */
 struct lttng_trace_chunk_registry_element {
-	uint64_t session_id;
 	struct lttng_trace_chunk chunk;
+	uint64_t session_id;
 	/* Weak and only set when added. */
 	struct lttng_trace_chunk_registry *registry;
 	struct cds_lfht_node trace_chunk_registry_ht_node;
@@ -165,8 +165,9 @@ char *generate_chunk_name(uint64_t chunk_id, time_t creation_timestamp,
 {
 	int ret = 0;
 	char *new_name= NULL;
-	char start_datetime[sizeof("YYYYmmddTHHMMSS+HHMM")] = {};
-	char end_datetime_suffix[sizeof("-YYYYmmddTHHMMSS+HHMM")] = {};
+	char start_datetime[ISO8601_STR_LEN] = {};
+	/* Add 1 for a '-' prefix. */
+	char end_datetime_suffix[ISO8601_STR_LEN + 1] = {};
 
 	ret = time_to_iso8601_str(
 			creation_timestamp,
@@ -180,7 +181,7 @@ char *generate_chunk_name(uint64_t chunk_id, time_t creation_timestamp,
 		ret = time_to_iso8601_str(
 				*close_timestamp,
 				end_datetime_suffix + 1,
-				sizeof(end_datetime_suffix));
+				sizeof(end_datetime_suffix) - 1);
 		if (ret) {
 			ERR("Failed to format trace chunk end date time");
 			goto error;
@@ -366,12 +367,14 @@ enum lttng_trace_chunk_status lttng_trace_chunk_set_close_timestamp(
 		goto end;
 	}
 	LTTNG_OPTIONAL_SET(&chunk->timestamp_close, close_ts);
-	free(chunk->name);
-	chunk->name = generate_chunk_name(LTTNG_OPTIONAL_GET(chunk->id),
-			LTTNG_OPTIONAL_GET(chunk->timestamp_creation),
-			&close_ts);
-	if (!chunk->name) {
-		status = LTTNG_TRACE_CHUNK_STATUS_ERROR;
+	if (!chunk->name_overridden) {
+		free(chunk->name);
+		chunk->name = generate_chunk_name(LTTNG_OPTIONAL_GET(chunk->id),
+				LTTNG_OPTIONAL_GET(chunk->timestamp_creation),
+				&close_ts);
+		if (!chunk->name) {
+			status = LTTNG_TRACE_CHUNK_STATUS_ERROR;
+		}
 	}
 end:
 	pthread_mutex_unlock(&chunk->lock);
@@ -381,13 +384,13 @@ end:
 LTTNG_HIDDEN
 enum lttng_trace_chunk_status lttng_trace_chunk_get_name(
 		struct lttng_trace_chunk *chunk, const char **name,
-		bool *name_overriden)
+		bool *name_overridden)
 {
 	enum lttng_trace_chunk_status status = LTTNG_TRACE_CHUNK_STATUS_OK;
 
 	pthread_mutex_lock(&chunk->lock);
-        if (name_overriden) {
-		*name_overriden = chunk->name_overriden;
+        if (name_overridden) {
+		*name_overridden = chunk->name_overridden;
         }
         if (!chunk->name) {
 		status = LTTNG_TRACE_CHUNK_STATUS_NONE;
@@ -408,7 +411,7 @@ bool is_valid_chunk_name(const char *name)
 		return false;
 	}
 
-	len = strnlen(name, LTTNG_NAME_MAX);
+	len = lttng_strnlen(name, LTTNG_NAME_MAX);
 	if (len == 0 || len == LTTNG_NAME_MAX) {
 		return false;
 	}
@@ -450,7 +453,7 @@ enum lttng_trace_chunk_status lttng_trace_chunk_override_name(
 	}
 	free(chunk->name);
 	chunk->name = new_name;
-	chunk->name_overriden = true;
+	chunk->name_overridden = true;
 end_unlock:	
 	pthread_mutex_unlock(&chunk->lock);
 end:
@@ -654,7 +657,7 @@ int add_top_level_directory_unique(struct lttng_trace_chunk *chunk,
 	}
 
 	if (!found) {
-		char *copy = strndup(new_path, new_path_top_level_len);
+		char *copy = lttng_strndup(new_path, new_path_top_level_len);
 
 		DBG("Adding new top-level directory \"%s\" to trace chunk \"%s\"",
 				new_path, chunk->name ? : "(unnamed)");
@@ -840,7 +843,7 @@ void lttng_trace_chunk_move_to_completed(struct lttng_trace_chunk *trace_chunk)
 	}
 
 	assert(trace_chunk->mode.value == TRACE_CHUNK_MODE_OWNER);
-	assert(!trace_chunk->name_overriden);
+	assert(!trace_chunk->name_overridden);
 
 	/*
 	 * The fist trace chunk of a session is directly output to the
@@ -1094,7 +1097,7 @@ end:
 	return registry;
 error:
 	lttng_trace_chunk_registry_destroy(registry);
-	goto end;
+	return NULL;
 }
 
 LTTNG_HIDDEN
@@ -1293,3 +1296,49 @@ lttng_trace_chunk_registry_find_anonymous_chunk(
         return _lttng_trace_chunk_registry_find_chunk(registry,
 			session_id, NULL);
 }
+
+unsigned int lttng_trace_chunk_registry_put_each_chunk(
+		struct lttng_trace_chunk_registry *registry)
+{
+	struct cds_lfht_iter iter;
+	struct lttng_trace_chunk_registry_element *chunk_element;
+	unsigned int trace_chunks_left = 0;
+
+	DBG("Releasing trace chunk registry to all trace chunks");
+	rcu_read_lock();
+	cds_lfht_for_each_entry(registry->ht,
+			&iter, chunk_element, trace_chunk_registry_ht_node) {
+		const char *chunk_id_str = "none";
+		char chunk_id_buf[MAX_INT_DEC_LEN(uint64_t)];
+
+		pthread_mutex_lock(&chunk_element->chunk.lock);
+		if (chunk_element->chunk.id.is_set) {
+			int fmt_ret;
+
+			fmt_ret = snprintf(chunk_id_buf, sizeof(chunk_id_buf),
+					"%" PRIu64,
+					chunk_element->chunk.id.value);
+			if (fmt_ret < 0 || fmt_ret >= sizeof(chunk_id_buf)) {
+				chunk_id_str = "formatting error";
+			} else {
+				chunk_id_str = chunk_id_buf;
+			}
+		}
+
+		DBG("Releasing reference to trace chunk: session_id = %" PRIu64
+				"chunk_id = %s, name = \"%s\", status = %s",
+				chunk_element->session_id,
+				chunk_id_str,
+				chunk_element->chunk.name ? : "none",
+				chunk_element->chunk.close_command.is_set ?
+						"open" : "closed");
+		pthread_mutex_unlock(&chunk_element->chunk.lock);
+		lttng_trace_chunk_put(&chunk_element->chunk);
+		trace_chunks_left++;
+	}
+	rcu_read_unlock();
+	DBG("Released reference to %u trace chunks in %s()", trace_chunks_left,
+			__FUNCTION__);
+
+	return trace_chunks_left;
+}