SoW-2020-0003: Trace Hit Counters

[lttng-tools.git] / src / common / actions / action.c

diff --git a/src/common/actions/action.c b/src/common/actions/action.c
index 86628542bc50186c32b20a0bc026530a235672d6..2bf5e4877c501f0df38e1de1e1072278d4a7b660 100644 (file)
--- a/src/common/actions/action.c
+++ b/src/common/actions/action.c
@@ -9,6 +9,7 @@
 #include <common/error.h>
 #include <lttng/action/action-internal.h>
 #include <lttng/action/group-internal.h>
+#include <lttng/action/incr-value-internal.h>
 #include <lttng/action/notify-internal.h>
 #include <lttng/action/rotate-session-internal.h>
 #include <lttng/action/snapshot-session-internal.h>
@@ -33,6 +34,8 @@ const char *lttng_action_type_string(enum lttng_action_type action_type)
                return "START_SESSION";
        case LTTNG_ACTION_TYPE_STOP_SESSION:
                return "STOP_SESSION";
+       case LTTNG_ACTION_TYPE_INCREMENT_VALUE:
+               return "INCREMENT_VALUE";
        default:
                return "???";
        }
@@ -140,15 +143,24 @@ 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_payload_cb create_from_payload_cb;
+       const struct lttng_action_comm *action_comm;
+       const struct lttng_payload_view action_comm_view =
+                       lttng_payload_view_from_view(
+                                       view, 0, sizeof(*action_comm));
 
        if (!view || !action) {
                consumed_len = -1;
                goto end;
        }
 
-       action_comm = (const struct lttng_action_comm *) view->buffer.data;
+       if (!lttng_payload_view_is_valid(&action_comm_view)) {
+               /* Payload not large enough to contain the header. */
+               consumed_len = -1;
+               goto end;
+       }
+
+       action_comm = (const struct lttng_action_comm *) action_comm_view.buffer.data;
 
        DBG("Create action from payload: action-type=%s",
                        lttng_action_type_string(action_comm->action_type));
@@ -173,6 +185,10 @@ ssize_t lttng_action_create_from_payload(struct lttng_payload_view *view,
                create_from_payload_cb =
                                lttng_action_stop_session_create_from_payload;
                break;
+       case LTTNG_ACTION_TYPE_INCREMENT_VALUE:
+               create_from_payload_cb =
+                               lttng_action_incr_value_create_from_payload;
+               break;
        case LTTNG_ACTION_TYPE_GROUP:
                create_from_payload_cb = lttng_action_group_create_from_payload;
                break;