X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Frotate.c;h=dac0f2a1fda8145cfa8f7fdbca724a2890257f87;hb=71a3bb01e288ad6e611be0501a4444375c4124a7;hp=4264cd4bd91fadeca704f9895b4c0733610a1b9c;hpb=fc58be13f62e691645dd75d56ce26d2e121b13e0;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/rotate.c b/src/bin/lttng-sessiond/rotate.c
index 4264cd4bd..dac0f2a1f 100644
--- a/src/bin/lttng-sessiond/rotate.c
+++ b/src/bin/lttng-sessiond/rotate.c
@@ -32,6 +32,7 @@
 #include <signal.h>
 #include <inttypes.h>
 
+#include <lttng/notification/channel-internal.h>
 #include <lttng/rotate-internal.h>
 
 #include "session.h"
@@ -41,6 +42,7 @@
 #include "health-sessiond.h"
 #include "cmd.h"
 #include "utils.h"
+#include "notification-thread-commands.h"
 
 #include <urcu.h>
 #include <urcu/list.h>
@@ -230,7 +232,7 @@ int rename_complete_chunk(struct ltt_session *session, time_t ts)
 		goto end;
 	}
 
-	if (session->rotate_count == 1) {
+	if (session->current_archive_id == 1) {
 		char start_time[21];
 
 		timeinfo = localtime(&session->last_chunk_start_ts);
@@ -256,7 +258,7 @@ int rename_complete_chunk(struct ltt_session *session, time_t ts)
 		ret = snprintf(new_path, sizeof(new_path), "%s/%s-%s-%" PRIu64,
 				session->rotation_chunk.current_rotate_path,
 				start_time,
-				datetime, session->rotate_count);
+				datetime, session->current_archive_id);
 		if (ret < 0 || ret >= sizeof(new_path)) {
 			ERR("Failed to format new chunk path while renaming session \"%s\"'s first chunk",
 					session->name);
@@ -313,7 +315,7 @@ int rename_complete_chunk(struct ltt_session *session, time_t ts)
 		ret = snprintf(new_path, sizeof(new_path), "%s/%s-%s-%" PRIu64,
 				session_get_base_path(session),
 				start_datetime,
-				datetime, session->rotate_count);
+				datetime, session->current_archive_id);
 		if (ret < 0 || ret >= sizeof(new_path)) {
 			ERR("Failed to format new chunk path while renaming chunk of session \"%s\"",
 					session->name);
@@ -401,3 +403,101 @@ int relay_rotate_pending(struct ltt_session *session, uint64_t chunk_id)
 end:
 	return ret;
 }
+
+int subscribe_session_consumed_size_rotation(struct ltt_session *session, uint64_t size,
+		struct notification_thread_handle *notification_thread_handle)
+{
+	int ret;
+	enum lttng_condition_status condition_status;
+	enum lttng_notification_channel_status nc_status;
+	struct lttng_action *action;
+
+	session->rotate_condition = lttng_condition_session_consumed_size_create();
+	if (!session->rotate_condition) {
+		ERR("Failed to create session consumed size condition object");
+		ret = -1;
+		goto end;
+	}
+
+	condition_status = lttng_condition_session_consumed_size_set_threshold(
+			session->rotate_condition, size);
+	if (condition_status != LTTNG_CONDITION_STATUS_OK) {
+		ERR("Could not set session consumed size condition threshold (size = %" PRIu64 ")",
+				size);
+		ret = -1;
+		goto end;
+	}
+
+	condition_status =
+			lttng_condition_session_consumed_size_set_session_name(
+				session->rotate_condition, session->name);
+	if (condition_status != LTTNG_CONDITION_STATUS_OK) {
+		ERR("Could not set session consumed size condition session name (name = %s)",
+				session->name);
+		ret = -1;
+		goto end;
+	}
+
+	action = lttng_action_notify_create();
+	if (!action) {
+		ERR("Could not create notify action");
+		ret = -1;
+		goto end;
+	}
+
+	session->rotate_trigger = lttng_trigger_create(session->rotate_condition,
+			action);
+	if (!session->rotate_trigger) {
+		ERR("Could not create size-based rotation trigger");
+		ret = -1;
+		goto end;
+	}
+
+	nc_status = lttng_notification_channel_subscribe(
+			rotate_notification_channel, session->rotate_condition);
+	if (nc_status != LTTNG_NOTIFICATION_CHANNEL_STATUS_OK) {
+		ERR("Could not subscribe to session consumed size notification");
+		ret = -1;
+		goto end;
+	}
+
+	ret = notification_thread_command_register_trigger(
+			notification_thread_handle, session->rotate_trigger);
+	if (ret < 0 && ret != -LTTNG_ERR_TRIGGER_EXISTS) {
+		ERR("Register trigger, %s", lttng_strerror(ret));
+		ret = -1;
+		goto end;
+	}
+
+	ret = 0;
+
+end:
+	return ret;
+}
+
+int unsubscribe_session_consumed_size_rotation(struct ltt_session *session,
+		struct notification_thread_handle *notification_thread_handle)
+{
+	int ret = 0;
+	enum lttng_notification_channel_status status;
+
+	status = lttng_notification_channel_unsubscribe(
+			rotate_notification_channel,
+			session->rotate_condition);
+	if (status != LTTNG_NOTIFICATION_CHANNEL_STATUS_OK) {
+		ERR("Session unsubscribe error: %d", (int) status);
+		ret = -1;
+		goto end;
+	}
+
+	ret = notification_thread_command_unregister_trigger(
+			notification_thread_handle, session->rotate_trigger);
+	if (ret != LTTNG_OK) {
+		ERR("Session unregister trigger error: %d", ret);
+		goto end;
+	}
+
+	ret = 0;
+end:
+	return ret;
+}