ust registry: Refactor representation of nested types

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

diff --git a/src/common/action.c b/src/common/action.c
index 3abdfaf21d5f89fff2c45a4618c29fbd1a008612..dc72d37b4a88f75e6bf0575e16bf0c8c911435d3 100644 (file)
--- a/src/common/action.c
+++ b/src/common/action.c
@@ -1,18 +1,8 @@
 /*
- * Copyright (C) 2017 - Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ * Copyright (C) 2017 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License, version 2.1 only,
- * as published by the Free Software Foundation.
+ * SPDX-License-Identifier: LGPL-2.1-only
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <lttng/action/action-internal.h>
@@ -25,6 +15,13 @@ enum lttng_action_type lttng_action_get_type(struct lttng_action *action)
        return action ? action->type : LTTNG_ACTION_TYPE_UNKNOWN;
 }
 
+LTTNG_HIDDEN
+enum lttng_action_type lttng_action_get_type_const(
+               const struct lttng_action *action)
+{
+       return action->type;
+}
+
 void lttng_action_destroy(struct lttng_action *action)
 {
        if (!action) {
@@ -57,29 +54,24 @@ end:
 }
 
 LTTNG_HIDDEN
-ssize_t lttng_action_serialize(struct lttng_action *action, char *buf)
+int lttng_action_serialize(struct lttng_action *action,
+               struct lttng_dynamic_buffer *buf)
 {
-       ssize_t ret, action_size;
-       struct lttng_action_comm action_comm;
-
-       if (!action) {
-               ret = -1;
+       int ret;
+       struct lttng_action_comm action_comm = {
+               .action_type = (int8_t) action->type,
+       };
+
+       ret = lttng_dynamic_buffer_append(buf, &action_comm,
+                       sizeof(action_comm));
+       if (ret) {
                goto end;
        }
 
-       action_comm.action_type = (int8_t) action->type;
-       ret = sizeof(struct lttng_action_comm);
-       if (buf) {
-               memcpy(buf, &action_comm, ret);
-               buf += ret;
-       }
-
-       action_size = action->serialize(action, buf);
-       if (action_size < 0) {
-               ret = action_size;
+       ret = action->serialize(action, buf);
+       if (ret) {
                goto end;
        }
-       ret += action_size;
 end:
        return ret;
 }