X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fsnapshot.h;h=12641860ad5c940b2e926b88fd2f121a08b3e739;hp=91215272ac83f3316348c0c10ae098c6b26b5fbf;hb=b178f53e90c376dd44b020535c32649edef8f80e;hpb=6dc3064a30b0cc7cfa9fdd22da1963525dfb7388

diff --git a/src/bin/lttng-sessiond/snapshot.h b/src/bin/lttng-sessiond/snapshot.h
index 91215272a..12641860a 100644
--- a/src/bin/lttng-sessiond/snapshot.h
+++ b/src/bin/lttng-sessiond/snapshot.h
@@ -28,14 +28,23 @@
 #include "consumer.h"
 
 struct consumer_output;
+struct ltt_session;
 
 struct snapshot_output {
 	uint32_t id;
 	uint64_t max_size;
+	/* Number of snapshot taken with that output. */
+	uint64_t nb_snapshot;
 	char name[NAME_MAX];
 	struct consumer_output *consumer;
 	int kernel_sockets_copied;
 	int ust_sockets_copied;
+	/*
+	 * Contains the string with "<date>-<time>" for when the snapshot command
+	 * is triggered. This is to make sure every streams will use the same time
+	 * for the directory output.
+	 */
+	char datetime[16];
 
 	/* Indexed by ID. */
 	struct lttng_ht_node_ulong node;
@@ -44,6 +53,11 @@ struct snapshot_output {
 struct snapshot {
 	unsigned long next_output_id;
 	size_t nb_output;
+	/*
+	 * Number of snapshot taken for that object. This value is used with a
+	 * temporary output of a snapshot record.
+	 */
+	uint64_t nb_snapshot;
 	struct lttng_ht *output_ht;
 };
 
@@ -59,11 +73,19 @@ void snapshot_add_output(struct snapshot *snapshot,
 /* Snapshot output object. */
 struct snapshot_output *snapshot_output_alloc(void);
 void snapshot_output_destroy(struct snapshot_output *obj);
-int snapshot_output_init(uint64_t max_size, const char *name,
+int snapshot_output_init(const struct ltt_session *session,
+		uint64_t max_size, const char *name,
 		const char *ctrl_url, const char *data_url,
 		struct consumer_output *consumer, struct snapshot_output *output,
 		struct snapshot *snapshot);
+int snapshot_output_init_with_uri(const struct ltt_session *session,
+		uint64_t max_size, const char *name,
+		struct lttng_uri *uris, size_t nb_uri,
+		struct consumer_output *consumer, struct snapshot_output *output,
+		struct snapshot *snapshot);
 struct snapshot_output *snapshot_find_output_by_id(uint32_t id,
 		struct snapshot *snapshot);
+struct snapshot_output *snapshot_find_output_by_name(const char *name,
+		struct snapshot *snapshot);
 
 #endif /* SNAPSHOT_H */