X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Factions%2Faction.c;h=f15163818c7a622b2ea24085afa1c4219bde240a;hp=dc72d37b4a88f75e6bf0575e16bf0c8c911435d3;hb=14ec7e8774bab3e31f173438c8e8fc655ee5ee14;hpb=03bb2358875cfca96394e78357c96baaa1e91efa

diff --git a/src/common/actions/action.c b/src/common/actions/action.c
index dc72d37b4..f15163818 100644
--- a/src/common/actions/action.c
+++ b/src/common/actions/action.c
@@ -5,10 +5,22 @@
  *
  */
 
+#include <assert.h>
+#include <common/error.h>
 #include <lttng/action/action-internal.h>
 #include <lttng/action/notify-internal.h>
-#include <common/error.h>
-#include <assert.h>
+
+static 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_NOTIFY:
+		return "NOTIFY";
+	default:
+		return "???";
+	}
+}
 
 enum lttng_action_type lttng_action_get_type(struct lttng_action *action)
 {
@@ -22,6 +34,20 @@ enum lttng_action_type lttng_action_get_type_const(
 	return action->type;
 }
 
+LTTNG_HIDDEN
+void lttng_action_init(
+		struct lttng_action *action,
+		enum lttng_action_type type,
+		action_validate_cb validate,
+		action_serialize_cb serialize,
+		action_destroy_cb destroy)
+{
+	action->type = type;
+	action->validate = validate;
+	action->serialize = serialize;
+	action->destroy = destroy;
+}
+
 void lttng_action_destroy(struct lttng_action *action)
 {
 	if (!action) {
@@ -78,34 +104,54 @@ end:
 
 LTTNG_HIDDEN
 ssize_t lttng_action_create_from_buffer(const struct lttng_buffer_view *view,
-		struct lttng_action **_action)
+		struct lttng_action **action)
 {
-	ssize_t ret, action_size = sizeof(struct lttng_action_comm);
-	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;
 
-	if (!view || !_action) {
-		ret = -1;
+	if (!view || !action) {
+		consumed_len = -1;
 		goto end;
 	}
 
 	action_comm = (const struct lttng_action_comm *) view->data;
-	DBG("Deserializing action from buffer");
+
+	DBG("Create action from buffer: action-type=%s",
+			lttng_action_type_string(action_comm->action_type));
+
 	switch (action_comm->action_type) {
 	case LTTNG_ACTION_TYPE_NOTIFY:
-		action = lttng_action_notify_create();
+		create_from_buffer_cb = lttng_action_notify_create_from_buffer;
 		break;
 	default:
-		ret = -1;
+		ERR("Failed to create action from buffer, unhandled action type: action-type=%u (%s)",
+				action_comm->action_type,
+				lttng_action_type_string(
+						action_comm->action_type));
+		consumed_len = -1;
 		goto end;
 	}
 
-	if (!action) {
-		ret = -1;
+	/* 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));
+
+	specific_action_consumed_len =
+			create_from_buffer_cb(&specific_action_view, action);
+	if (specific_action_consumed_len < 0) {
+		ERR("Failed to create specific action from buffer.");
+		consumed_len = -1;
 		goto end;
 	}
-	ret = action_size;
-	*_action = action;
+
+	assert(*action);
+
+	consumed_len = sizeof(struct lttng_action_comm) +
+		       specific_action_consumed_len;
+
 end:
-	return ret;
+	return consumed_len;
 }