X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Factions%2Faction.c;h=11b3c5501dace3d515f5f4d3759a0e2acf61bc93;hp=50e1b1d84b1d1a971f2bc188adc66897b21d5d53;hb=10615eee4887bd869ac85885afcffd030da350be;hpb=3dd04a6a94950c91b0895e6da9da5f84db1e7abc

diff --git a/src/common/actions/action.c b/src/common/actions/action.c
index 50e1b1d84..11b3c5501 100644
--- a/src/common/actions/action.c
+++ b/src/common/actions/action.c
@@ -8,15 +8,31 @@
 #include <assert.h>
 #include <common/error.h>
 #include <lttng/action/action-internal.h>
+#include <lttng/action/group-internal.h>
 #include <lttng/action/notify-internal.h>
+#include <lttng/action/rotate-session-internal.h>
+#include <lttng/action/snapshot-session-internal.h>
+#include <lttng/action/start-session-internal.h>
+#include <lttng/action/stop-session-internal.h>
 
-static const char *lttng_action_type_string(enum lttng_action_type action_type)
+LTTNG_HIDDEN
+const char *lttng_action_type_string(enum lttng_action_type action_type)
 {
 	switch (action_type) {
 	case LTTNG_ACTION_TYPE_UNKNOWN:
 		return "UNKNOWN";
+	case LTTNG_ACTION_TYPE_GROUP:
+		return "GROUP";
 	case LTTNG_ACTION_TYPE_NOTIFY:
 		return "NOTIFY";
+	case LTTNG_ACTION_TYPE_ROTATE_SESSION:
+		return "ROTATE_SESSION";
+	case LTTNG_ACTION_TYPE_SNAPSHOT_SESSION:
+		return "SNAPSHOT_SESSION";
+	case LTTNG_ACTION_TYPE_START_SESSION:
+		return "START_SESSION";
+	case LTTNG_ACTION_TYPE_STOP_SESSION:
+		return "STOP_SESSION";
 	default:
 		return "???";
 	}
@@ -43,6 +59,7 @@ void lttng_action_init(
 		action_equal_cb equal,
 		action_destroy_cb destroy)
 {
+	urcu_ref_init(&action->ref);
 	action->type = type;
 	action->validate = validate;
 	action->serialize = serialize;
@@ -50,14 +67,35 @@ void lttng_action_init(
 	action->destroy = destroy;
 }
 
-void lttng_action_destroy(struct lttng_action *action)
+static
+void action_destroy_ref(struct urcu_ref *ref)
+{
+	struct lttng_action *action =
+			container_of(ref, struct lttng_action, ref);
+
+	action->destroy(action);
+}
+
+LTTNG_HIDDEN
+void lttng_action_get(struct lttng_action *action)
+{
+	urcu_ref_get(&action->ref);
+}
+
+LTTNG_HIDDEN
+void lttng_action_put(struct lttng_action *action)
 {
 	if (!action) {
 		return;
 	}
 
 	assert(action->destroy);
-	action->destroy(action);
+	urcu_ref_put(&action->ref, action_destroy_ref);
+}
+
+void lttng_action_destroy(struct lttng_action *action)
+{
+	lttng_action_put(action);
 }
 
 LTTNG_HIDDEN
@@ -83,20 +121,20 @@ end:
 
 LTTNG_HIDDEN
 int lttng_action_serialize(struct lttng_action *action,
-		struct lttng_dynamic_buffer *buf)
+		struct lttng_payload *payload)
 {
 	int ret;
 	struct lttng_action_comm action_comm = {
 		.action_type = (int8_t) action->type,
 	};
 
-	ret = lttng_dynamic_buffer_append(buf, &action_comm,
+	ret = lttng_dynamic_buffer_append(&payload->buffer, &action_comm,
 			sizeof(action_comm));
 	if (ret) {
 		goto end;
 	}
 
-	ret = action->serialize(action, buf);
+	ret = action->serialize(action, payload);
 	if (ret) {
 		goto end;
 	}
@@ -105,30 +143,48 @@ end:
 }
 
 LTTNG_HIDDEN
-ssize_t lttng_action_create_from_buffer(const struct lttng_buffer_view *view,
+ssize_t lttng_action_create_from_payload(struct lttng_payload_view *view,
 		struct lttng_action **action)
 {
 	ssize_t consumed_len, specific_action_consumed_len;
 	const struct lttng_action_comm *action_comm;
-	action_create_from_buffer_cb create_from_buffer_cb;
-	struct lttng_buffer_view specific_action_view;
+	action_create_from_payload_cb create_from_payload_cb;
 
 	if (!view || !action) {
 		consumed_len = -1;
 		goto end;
 	}
 
-	action_comm = (const struct lttng_action_comm *) view->data;
+	action_comm = (const struct lttng_action_comm *) view->buffer.data;
 
-	DBG("Create action from buffer: action-type=%s",
+	DBG("Create action from payload: action-type=%s",
 			lttng_action_type_string(action_comm->action_type));
 
 	switch (action_comm->action_type) {
 	case LTTNG_ACTION_TYPE_NOTIFY:
-		create_from_buffer_cb = lttng_action_notify_create_from_buffer;
+		create_from_payload_cb = lttng_action_notify_create_from_payload;
+		break;
+	case LTTNG_ACTION_TYPE_ROTATE_SESSION:
+		create_from_payload_cb =
+				lttng_action_rotate_session_create_from_payload;
+		break;
+	case LTTNG_ACTION_TYPE_SNAPSHOT_SESSION:
+		create_from_payload_cb =
+				lttng_action_snapshot_session_create_from_payload;
+		break;
+	case LTTNG_ACTION_TYPE_START_SESSION:
+		create_from_payload_cb =
+				lttng_action_start_session_create_from_payload;
+		break;
+	case LTTNG_ACTION_TYPE_STOP_SESSION:
+		create_from_payload_cb =
+				lttng_action_stop_session_create_from_payload;
+		break;
+	case LTTNG_ACTION_TYPE_GROUP:
+		create_from_payload_cb = lttng_action_group_create_from_payload;
 		break;
 	default:
-		ERR("Failed to create action from buffer, unhandled action type: action-type=%u (%s)",
+		ERR("Failed to create action from payload, unhandled action type: action-type=%u (%s)",
 				action_comm->action_type,
 				lttng_action_type_string(
 						action_comm->action_type));
@@ -136,13 +192,16 @@ ssize_t lttng_action_create_from_buffer(const struct lttng_buffer_view *view,
 		goto end;
 	}
 
-	/* Create buffer view for the action-type-specific data. */
-	specific_action_view = lttng_buffer_view_from_view(view,
-			sizeof(struct lttng_action_comm),
-			view->size - sizeof(struct lttng_action_comm));
+	{
+		/* Create buffer view for the action-type-specific data. */
+		struct lttng_payload_view specific_action_view =
+				lttng_payload_view_from_view(view,
+						sizeof(struct lttng_action_comm),
+						-1);
 
-	specific_action_consumed_len =
-			create_from_buffer_cb(&specific_action_view, action);
+		specific_action_consumed_len = create_from_payload_cb(
+				&specific_action_view, action);
+	}
 	if (specific_action_consumed_len < 0) {
 		ERR("Failed to create specific action from buffer.");
 		consumed_len = -1;