Some objects used in the sessiond <-> liblttng-ctl communication (e.g.
such as userspace probe event rule) contain file descriptors that
must be carried accross process boundaries (fd passing).
Since those objects are often nested within a higher-level object
hierarchy, it makes sense to adapt the existing
serialize/create_from_buffer interface to use an lttng_payload.
An lttng_payload contains a dynamic buffer and an array of file
descriptors. Objects are expected to push their file descriptors in the
payload in the same way they currently push the bytes of their binary
representation in a dynamic buffer.
Conversely, an lttng_payload_view interface is added and contains a
buffer_view and an iterator which allows objects to ̀ pop` a file
descriptors when appropriate.
Tests are added to validate the FD consumption behaviour depending
on the origin of payload views (root view or descendant view).
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: Id378d8b5a3376a074ab138a60733377e39a24133
#include <common/macros.h>
#include <common/buffer-view.h>
#include <common/dynamic-buffer.h>
+#include <common/sessiond-comm/payload-view.h>
+#include <common/sessiond-comm/payload.h>
#include <stdbool.h>
#include <sys/types.h>
typedef bool (*action_validate_cb)(struct lttng_action *action);
typedef void (*action_destroy_cb)(struct lttng_action *action);
typedef int (*action_serialize_cb)(struct lttng_action *action,
- struct lttng_dynamic_buffer *buf);
+ struct lttng_payload *payload);
typedef bool (*action_equal_cb)(const struct lttng_action *a,
const struct lttng_action *b);
-typedef ssize_t (*action_create_from_buffer_cb)(
- const struct lttng_buffer_view *view,
+typedef ssize_t (*action_create_from_payload_cb)(
+ struct lttng_payload_view *view,
struct lttng_action **action);
struct lttng_action {
LTTNG_HIDDEN
int lttng_action_serialize(struct lttng_action *action,
- struct lttng_dynamic_buffer *buf);
+ struct lttng_payload *buf);
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);
LTTNG_HIDDEN
};
LTTNG_HIDDEN
-ssize_t lttng_action_notify_create_from_buffer(
- const struct lttng_buffer_view *view,
+ssize_t lttng_action_notify_create_from_payload(
+ struct lttng_payload_view *view,
struct lttng_action **action);
#endif /* LTTNG_ACTION_NOTIFY_INTERNAL_H */
#ifndef LTTNG_ACTION_ROTATE_SESSION_INTERNAL_H
#define LTTNG_ACTION_ROTATE_SESSION_INTERNAL_H
-#include <sys/types.h>
-
#include <common/macros.h>
struct lttng_action;
-struct lttng_buffer_view;
+struct lttng_payload_view;
/*
- * Create a "rotate session" action from a buffer view.
+ * Create a "rotate session" action from a payload view.
*
* On success, return the number of bytes consumed from `view`, and the created
* action in `*action`. On failure, return -1.
*/
LTTNG_HIDDEN
-extern ssize_t lttng_action_rotate_session_create_from_buffer(
- const struct lttng_buffer_view *view,
+extern ssize_t lttng_action_rotate_session_create_from_payload(
+ struct lttng_payload_view *view,
struct lttng_action **action);
#endif /* LTTNG_ACTION_ROTATE_SESSION_INTERNAL_H */
#ifndef LTTNG_ACTION_START_SESSION_INTERNAL_H
#define LTTNG_ACTION_START_SESSION_INTERNAL_H
-#include <sys/types.h>
-
#include <common/macros.h>
struct lttng_action;
-struct lttng_buffer_view;
+struct lttng_payload_view;
/*
- * Create a "start session" action from a buffer view.
+ * Create a "start session" action from a payload view.
*
* On success, return the number of bytes consumed from `view`, and the created
* action in `*action`. On failure, return -1.
*/
LTTNG_HIDDEN
-extern ssize_t lttng_action_start_session_create_from_buffer(
- const struct lttng_buffer_view *view,
+extern ssize_t lttng_action_start_session_create_from_payload(
+ struct lttng_payload_view *view,
struct lttng_action **action);
#endif /* LTTNG_ACTION_START_SESSION_INTERNAL_H */
#ifndef LTTNG_ACTION_STOP_SESSION_INTERNAL_H
#define LTTNG_ACTION_STOP_SESSION_INTERNAL_H
-#include <sys/types.h>
-
#include <common/macros.h>
struct lttng_action;
-struct lttng_buffer_view;
+struct lttng_payload_view;
/*
- * Create a "stop session" action from a buffer view.
+ * Create a "stop session" action from a payload view.
*
* On success, return the number of bytes consumed from `view`, and the created
* action in `*action`. On failure, return -1.
*/
LTTNG_HIDDEN
-extern ssize_t lttng_action_stop_session_create_from_buffer(
- const struct lttng_buffer_view *view,
+extern ssize_t lttng_action_stop_session_create_from_payload(
+ struct lttng_payload_view *view,
struct lttng_action **action);
#endif /* LTTNG_ACTION_STOP_SESSION_INTERNAL_H */
uint64_t capacity);
LTTNG_HIDDEN
-ssize_t lttng_condition_buffer_usage_low_create_from_buffer(
- const struct lttng_buffer_view *view,
+ssize_t lttng_condition_buffer_usage_low_create_from_payload(
+ struct lttng_payload_view *view,
struct lttng_condition **condition);
LTTNG_HIDDEN
-ssize_t lttng_condition_buffer_usage_high_create_from_buffer(
- const struct lttng_buffer_view *view,
+ssize_t lttng_condition_buffer_usage_high_create_from_payload(
+ struct lttng_payload_view *view,
struct lttng_condition **condition);
LTTNG_HIDDEN
-ssize_t lttng_evaluation_buffer_usage_low_create_from_buffer(
- const struct lttng_buffer_view *view,
+ssize_t lttng_evaluation_buffer_usage_low_create_from_payload(
+ struct lttng_payload_view *view,
struct lttng_evaluation **evaluation);
LTTNG_HIDDEN
-ssize_t lttng_evaluation_buffer_usage_high_create_from_buffer(
- const struct lttng_buffer_view *view,
+ssize_t lttng_evaluation_buffer_usage_high_create_from_payload(
+ struct lttng_payload_view *view,
struct lttng_evaluation **evaluation);
#endif /* LTTNG_CONDITION_BUFFER_USAGE_INTERNAL_H */
#include <lttng/condition/condition.h>
#include <common/macros.h>
-#include <common/buffer-view.h>
-#include <common/dynamic-buffer.h>
+#include <common/sessiond-comm/payload-view.h>
+#include <common/sessiond-comm/payload.h>
#include <stdbool.h>
#include <urcu/list.h>
#include <stdint.h>
typedef bool (*condition_validate_cb)(const struct lttng_condition *condition);
typedef int (*condition_serialize_cb)(
const struct lttng_condition *condition,
- struct lttng_dynamic_buffer *buf);
+ struct lttng_payload *payload);
typedef bool (*condition_equal_cb)(const struct lttng_condition *a,
const struct lttng_condition *b);
-typedef ssize_t (*condition_create_from_buffer_cb)(
- const struct lttng_buffer_view *view,
+typedef ssize_t (*condition_create_from_payload_cb)(
+ struct lttng_payload_view *view,
struct lttng_condition **condition);
struct lttng_condition {
bool lttng_condition_validate(const struct lttng_condition *condition);
LTTNG_HIDDEN
-ssize_t lttng_condition_create_from_buffer(
- const struct lttng_buffer_view *buffer,
+ssize_t lttng_condition_create_from_payload(
+ struct lttng_payload_view *view,
struct lttng_condition **condition);
LTTNG_HIDDEN
int lttng_condition_serialize(const struct lttng_condition *condition,
- struct lttng_dynamic_buffer *buf);
+ struct lttng_payload *payload);
LTTNG_HIDDEN
bool lttng_condition_is_equal(const struct lttng_condition *a,
#include <lttng/condition/evaluation.h>
#include <common/macros.h>
-#include <common/buffer-view.h>
-#include <common/dynamic-buffer.h>
#include <stdbool.h>
#include <sys/types.h>
+struct lttng_payload;
+struct lttng_payload_view;
+
typedef void (*evaluation_destroy_cb)(struct lttng_evaluation *evaluation);
typedef int (*evaluation_serialize_cb)(
const struct lttng_evaluation *evaluation,
- struct lttng_dynamic_buffer *buf);
+ struct lttng_payload *payload);
struct lttng_evaluation_comm {
/* enum lttng_condition_type type */
enum lttng_condition_type type);
LTTNG_HIDDEN
-ssize_t lttng_evaluation_create_from_buffer(const struct lttng_buffer_view *view,
+ssize_t lttng_evaluation_create_from_payload(struct lttng_payload_view *view,
struct lttng_evaluation **evaluation);
LTTNG_HIDDEN
int lttng_evaluation_serialize(const struct lttng_evaluation *evaluation,
- struct lttng_dynamic_buffer *buf);
+ struct lttng_payload *payload);
#endif /* LTTNG_EVALUATION_INTERNAL_H */
#include <common/buffer-view.h>
#include <common/macros.h>
+struct lttng_payload;
+struct lttng_payload_view;
+
struct lttng_condition_session_consumed_size {
struct lttng_condition parent;
struct {
uint64_t consumed);
LTTNG_HIDDEN
-ssize_t lttng_condition_session_consumed_size_create_from_buffer(
- const struct lttng_buffer_view *view,
+ssize_t lttng_condition_session_consumed_size_create_from_payload(
+ struct lttng_payload_view *view,
struct lttng_condition **condition);
LTTNG_HIDDEN
-ssize_t lttng_evaluation_session_consumed_size_create_from_buffer(
- const struct lttng_buffer_view *view,
+ssize_t lttng_evaluation_session_consumed_size_create_from_payload(
+ struct lttng_payload_view *view,
struct lttng_evaluation **evaluation);
#endif /* LTTNG_CONDITION_SESSION_CONSUMED_SIZE_INTERNAL_H */
} LTTNG_PACKED;
LTTNG_HIDDEN
-ssize_t lttng_condition_session_rotation_ongoing_create_from_buffer(
- const struct lttng_buffer_view *view,
+ssize_t lttng_condition_session_rotation_ongoing_create_from_payload(
+ struct lttng_payload_view *view,
struct lttng_condition **condition);
LTTNG_HIDDEN
-ssize_t lttng_condition_session_rotation_completed_create_from_buffer(
- const struct lttng_buffer_view *view,
+ssize_t lttng_condition_session_rotation_completed_create_from_payload(
+ struct lttng_payload_view *view,
struct lttng_condition **condition);
LTTNG_HIDDEN
struct lttng_trace_archive_location *location);
LTTNG_HIDDEN
-ssize_t lttng_evaluation_session_rotation_ongoing_create_from_buffer(
- const struct lttng_buffer_view *view,
+ssize_t lttng_evaluation_session_rotation_ongoing_create_from_payload(
+ struct lttng_payload_view *view,
struct lttng_evaluation **evaluation);
LTTNG_HIDDEN
-ssize_t lttng_evaluation_session_rotation_completed_create_from_buffer(
- const struct lttng_buffer_view *view,
+ssize_t lttng_evaluation_session_rotation_completed_create_from_payload(
+ struct lttng_payload_view *view,
struct lttng_evaluation **evaluation);
#endif /* LTTNG_CONDITION_SESSION_ROTATION_INTERNAL_H */
#include <lttng/notification/notification.h>
#include <common/macros.h>
-#include <common/buffer-view.h>
-#include <common/dynamic-buffer.h>
#include <stdint.h>
#include <stdbool.h>
#include <sys/types.h>
+struct lttng_payload;
+struct lttng_payload_view;
+
struct lttng_notification {
struct lttng_condition *condition;
struct lttng_evaluation *evaluation;
LTTNG_HIDDEN
int lttng_notification_serialize(const struct lttng_notification *notification,
- struct lttng_dynamic_buffer *buf);
+ struct lttng_payload *payload);
LTTNG_HIDDEN
-ssize_t lttng_notification_create_from_buffer(
- const struct lttng_buffer_view *view,
+ssize_t lttng_notification_create_from_payload(
+ struct lttng_payload_view *view,
struct lttng_notification **notification);
#endif /* LTTNG_NOTIFICATION_INTERNAL_H */
#include <lttng/trigger/trigger.h>
#include <common/macros.h>
-#include <common/buffer-view.h>
-#include <common/dynamic-buffer.h>
#include <stdint.h>
#include <stdbool.h>
#include <sys/types.h>
+struct lttng_payload;
+struct lttng_payload_view;
+
struct lttng_trigger {
struct lttng_condition *condition;
struct lttng_action *action;
} LTTNG_PACKED;
LTTNG_HIDDEN
-ssize_t lttng_trigger_create_from_buffer(const struct lttng_buffer_view *view,
+ssize_t lttng_trigger_create_from_payload(struct lttng_payload_view *view,
struct lttng_trigger **trigger);
LTTNG_HIDDEN
int lttng_trigger_serialize(struct lttng_trigger *trigger,
- struct lttng_dynamic_buffer *buf);
+ struct lttng_payload *payload);
LTTNG_HIDDEN
const struct lttng_condition *lttng_trigger_get_const_condition(
*/
#include "bin/lttng-sessiond/tracker.h"
+#include "common/sessiond-comm/payload.h"
#include "lttng/lttng-error.h"
#include "lttng/tracker.h"
#define _LGPL_SOURCE
#include <common/kernel-ctl/kernel-ctl.h>
#include <common/dynamic-buffer.h>
#include <common/buffer-view.h>
+#include <common/sessiond-comm/payload.h>
+#include <common/sessiond-comm/payload-view.h>
#include <common/trace-chunk.h>
#include <lttng/location-internal.h>
#include <lttng/trigger/trigger-internal.h>
size_t trigger_len;
ssize_t sock_recv_len;
struct lttng_trigger *trigger = NULL;
- struct lttng_buffer_view view;
- struct lttng_dynamic_buffer trigger_buffer;
+ struct lttng_payload trigger_payload;
- lttng_dynamic_buffer_init(&trigger_buffer);
+ lttng_payload_init(&trigger_payload);
trigger_len = (size_t) cmd_ctx->lsm->u.trigger.length;
- ret = lttng_dynamic_buffer_set_size(&trigger_buffer, trigger_len);
+ ret = lttng_dynamic_buffer_set_size(
+ &trigger_payload.buffer, trigger_len);
if (ret) {
ret = LTTNG_ERR_NOMEM;
goto end;
}
- sock_recv_len = lttcomm_recv_unix_sock(sock, trigger_buffer.data,
- trigger_len);
+ sock_recv_len = lttcomm_recv_unix_sock(
+ sock, trigger_payload.buffer.data, trigger_len);
if (sock_recv_len < 0 || sock_recv_len != trigger_len) {
ERR("Failed to receive \"register trigger\" command payload");
/* TODO: should this be a new error enum ? */
goto end;
}
- view = lttng_buffer_view_from_dynamic_buffer(&trigger_buffer, 0, -1);
- if (lttng_trigger_create_from_buffer(&view, &trigger) !=
- trigger_len) {
- ERR("Invalid trigger payload received in \"register trigger\" command");
- ret = LTTNG_ERR_INVALID_TRIGGER;
- goto end;
+ {
+ struct lttng_payload_view view =
+ lttng_payload_view_from_payload(
+ &trigger_payload, 0, -1);
+
+ if (lttng_trigger_create_from_payload(&view, &trigger) !=
+ trigger_len) {
+ ERR("Invalid trigger payload received in \"register trigger\" command");
+ ret = LTTNG_ERR_INVALID_TRIGGER;
+ goto end;
+ }
}
ret = notification_thread_command_register_trigger(notification_thread,
trigger = NULL;
end:
lttng_trigger_destroy(trigger);
- lttng_dynamic_buffer_reset(&trigger_buffer);
+ lttng_payload_reset(&trigger_payload);
return ret;
}
size_t trigger_len;
ssize_t sock_recv_len;
struct lttng_trigger *trigger = NULL;
- struct lttng_buffer_view view;
- struct lttng_dynamic_buffer trigger_buffer;
+ struct lttng_payload trigger_payload;
- lttng_dynamic_buffer_init(&trigger_buffer);
+ lttng_payload_init(&trigger_payload);
trigger_len = (size_t) cmd_ctx->lsm->u.trigger.length;
- ret = lttng_dynamic_buffer_set_size(&trigger_buffer, trigger_len);
+ ret = lttng_dynamic_buffer_set_size(
+ &trigger_payload.buffer, trigger_len);
if (ret) {
ret = LTTNG_ERR_NOMEM;
goto end;
}
- sock_recv_len = lttcomm_recv_unix_sock(sock, trigger_buffer.data,
- trigger_len);
+ sock_recv_len = lttcomm_recv_unix_sock(
+ sock, trigger_payload.buffer.data, trigger_len);
if (sock_recv_len < 0 || sock_recv_len != trigger_len) {
ERR("Failed to receive \"unregister trigger\" command payload");
/* TODO: should this be a new error enum ? */
goto end;
}
- view = lttng_buffer_view_from_dynamic_buffer(&trigger_buffer, 0, -1);
- if (lttng_trigger_create_from_buffer(&view, &trigger) !=
- trigger_len) {
- ERR("Invalid trigger payload received in \"unregister trigger\" command");
- ret = LTTNG_ERR_INVALID_TRIGGER;
- goto end;
+ {
+ struct lttng_payload_view view =
+ lttng_payload_view_from_payload(
+ &trigger_payload, 0, -1);
+
+ if (lttng_trigger_create_from_payload(&view, &trigger) !=
+ trigger_len) {
+ ERR("Invalid trigger payload received in \"unregister trigger\" command");
+ ret = LTTNG_ERR_INVALID_TRIGGER;
+ goto end;
+ }
}
ret = notification_thread_command_unregister_trigger(notification_thread,
trigger);
end:
lttng_trigger_destroy(trigger);
- lttng_dynamic_buffer_reset(&trigger_buffer);
+ lttng_payload_reset(&trigger_payload);
return ret;
}
struct lttng_condition *condition;
enum lttng_notification_channel_status status =
LTTNG_NOTIFICATION_CHANNEL_STATUS_OK;
- const struct lttng_buffer_view condition_view =
- lttng_buffer_view_from_dynamic_buffer(
+ struct lttng_payload_view condition_view =
+ lttng_payload_view_from_dynamic_buffer(
&client->communication.inbound.buffer,
0, -1);
size_t expected_condition_size =
client->communication.inbound.buffer.size;
- ret = lttng_condition_create_from_buffer(&condition_view,
+ ret = lttng_condition_create_from_payload(&condition_view,
&condition);
if (ret != expected_condition_size) {
ERR("[notification-thread] Malformed condition received from client");
uid_t channel_uid, gid_t channel_gid)
{
int ret = 0;
- struct lttng_dynamic_buffer msg_buffer;
+ struct lttng_payload msg_payload;
struct notification_client_list_element *client_list_element, *tmp;
const struct lttng_notification notification = {
.condition = (struct lttng_condition *) lttng_trigger_get_const_condition(trigger),
.type = (int8_t) LTTNG_NOTIFICATION_CHANNEL_MESSAGE_TYPE_NOTIFICATION,
};
- lttng_dynamic_buffer_init(&msg_buffer);
+ lttng_payload_init(&msg_payload);
- ret = lttng_dynamic_buffer_append(&msg_buffer, &msg_header,
+ ret = lttng_dynamic_buffer_append(&msg_payload.buffer, &msg_header,
sizeof(msg_header));
if (ret) {
goto end;
}
- ret = lttng_notification_serialize(¬ification, &msg_buffer);
+ ret = lttng_notification_serialize(¬ification, &msg_payload);
if (ret) {
ERR("[notification-thread] Failed to serialize notification");
ret = -1;
}
/* Update payload size. */
- ((struct lttng_notification_channel_message * ) msg_buffer.data)->size =
- (uint32_t) (msg_buffer.size - sizeof(msg_header));
+ ((struct lttng_notification_channel_message * ) msg_payload.buffer.data)->size =
+ (uint32_t) (msg_payload.buffer.size - sizeof(msg_header));
cds_list_for_each_entry_safe(client_list_element, tmp,
&client_list->list, node) {
}
DBG("[notification-thread] Sending notification to client (fd = %i, %zu bytes)",
- client->socket, msg_buffer.size);
+ client->socket, msg_payload.buffer.size);
if (client->communication.outbound.buffer.size) {
/*
* Outgoing data is already buffered for this client;
ret = lttng_dynamic_buffer_append_buffer(
&client->communication.outbound.buffer,
- &msg_buffer);
+ &msg_payload.buffer);
if (ret) {
goto end;
}
}
ret = 0;
end:
- lttng_dynamic_buffer_reset(&msg_buffer);
+ lttng_payload_reset(&msg_payload);
return ret;
}
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;
}
}
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_buffer_cb =
- lttng_action_rotate_session_create_from_buffer;
+ create_from_payload_cb =
+ lttng_action_rotate_session_create_from_payload;
break;
case LTTNG_ACTION_TYPE_START_SESSION:
- create_from_buffer_cb =
- lttng_action_start_session_create_from_buffer;
+ create_from_payload_cb =
+ lttng_action_start_session_create_from_payload;
break;
case LTTNG_ACTION_TYPE_STOP_SESSION:
- create_from_buffer_cb =
- lttng_action_stop_session_create_from_buffer;
+ create_from_payload_cb =
+ lttng_action_stop_session_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));
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;
static
int lttng_action_notify_serialize(struct lttng_action *action,
- struct lttng_dynamic_buffer *buf)
+ struct lttng_payload *payload)
{
return 0;
}
return ¬ify->parent;
}
-ssize_t lttng_action_notify_create_from_buffer(
- const struct lttng_buffer_view *view,
+ssize_t lttng_action_notify_create_from_payload(
+ struct lttng_payload_view *view,
struct lttng_action **action)
{
ssize_t consumed_length;
return is_equal;
}
static int lttng_action_rotate_session_serialize(
- struct lttng_action *action, struct lttng_dynamic_buffer *buf)
+ struct lttng_action *action, struct lttng_payload *payload)
{
struct lttng_action_rotate_session *action_rotate_session;
struct lttng_action_rotate_session_comm comm;
int ret;
assert(action);
- assert(buf);
+ assert(payload);
action_rotate_session = action_rotate_session_from_action(action);
session_name_len = strlen(action_rotate_session->session_name) + 1;
comm.session_name_len = session_name_len;
- ret = lttng_dynamic_buffer_append(buf, &comm, sizeof(comm));
+ ret = lttng_dynamic_buffer_append(
+ &payload->buffer, &comm, sizeof(comm));
if (ret) {
ret = -1;
goto end;
}
- ret = lttng_dynamic_buffer_append(buf,
+ ret = lttng_dynamic_buffer_append(&payload->buffer,
action_rotate_session->session_name, session_name_len);
if (ret) {
ret = -1;
return;
}
-ssize_t lttng_action_rotate_session_create_from_buffer(
- const struct lttng_buffer_view *view,
+ssize_t lttng_action_rotate_session_create_from_payload(
+ struct lttng_payload_view *view,
struct lttng_action **p_action)
{
ssize_t consumed_len;
goto end;
}
- comm = (const struct lttng_action_rotate_session_comm *) view->data;
+ comm = (typeof(comm)) view->buffer.data;
session_name = (const char *) &comm->data;
if (!lttng_buffer_view_contains_string(
- view, session_name, comm->session_name_len)) {
+ &view->buffer, session_name, comm->session_name_len)) {
consumed_len = -1;
goto end;
}
goto end;
}
- consumed_len = sizeof(struct lttng_action_rotate_session_comm) +
- comm->session_name_len;
+ consumed_len = sizeof(*comm) + comm->session_name_len;
*p_action = action;
action = NULL;
}
static int lttng_action_start_session_serialize(
- struct lttng_action *action, struct lttng_dynamic_buffer *buf)
+ struct lttng_action *action, struct lttng_payload *payload)
{
struct lttng_action_start_session *action_start_session;
struct lttng_action_start_session_comm comm;
int ret;
assert(action);
- assert(buf);
+ assert(payload);
action_start_session = action_start_session_from_action(action);
session_name_len = strlen(action_start_session->session_name) + 1;
comm.session_name_len = session_name_len;
- ret = lttng_dynamic_buffer_append(buf, &comm, sizeof(comm));
+ ret = lttng_dynamic_buffer_append(&payload->buffer, &comm, sizeof(comm));
if (ret) {
ret = -1;
goto end;
}
- ret = lttng_dynamic_buffer_append(buf,
+ ret = lttng_dynamic_buffer_append(&payload->buffer,
action_start_session->session_name, session_name_len);
if (ret) {
ret = -1;
return;
}
-ssize_t lttng_action_start_session_create_from_buffer(
- const struct lttng_buffer_view *view,
+ssize_t lttng_action_start_session_create_from_payload(
+ struct lttng_payload_view *view,
struct lttng_action **p_action)
{
ssize_t consumed_len;
goto end;
}
- comm = (const struct lttng_action_start_session_comm *) view->data;
+ comm = (typeof(comm)) view->buffer.data;
session_name = (const char *) &comm->data;
- if (!lttng_buffer_view_contains_string(
- view, session_name, comm->session_name_len)) {
+ if (!lttng_buffer_view_contains_string(&view->buffer, session_name,
+ comm->session_name_len)) {
consumed_len = -1;
goto end;
}
goto end;
}
- consumed_len = sizeof(struct lttng_action_start_session_comm) +
- comm->session_name_len;
+ consumed_len = sizeof(*comm) + comm->session_name_len;
*p_action = action;
action = NULL;
}
static int lttng_action_stop_session_serialize(
- struct lttng_action *action, struct lttng_dynamic_buffer *buf)
+ struct lttng_action *action, struct lttng_payload *payload)
{
struct lttng_action_stop_session *action_stop_session;
struct lttng_action_stop_session_comm comm;
int ret;
assert(action);
- assert(buf);
+ assert(payload);
action_stop_session = action_stop_session_from_action(action);
session_name_len = strlen(action_stop_session->session_name) + 1;
comm.session_name_len = session_name_len;
- ret = lttng_dynamic_buffer_append(buf, &comm, sizeof(comm));
+ ret = lttng_dynamic_buffer_append(
+ &payload->buffer, &comm, sizeof(comm));
if (ret) {
ret = -1;
goto end;
}
- ret = lttng_dynamic_buffer_append(buf,
+ ret = lttng_dynamic_buffer_append(&payload->buffer,
action_stop_session->session_name, session_name_len);
if (ret) {
ret = -1;
return;
}
-ssize_t lttng_action_stop_session_create_from_buffer(
- const struct lttng_buffer_view *view,
+ssize_t lttng_action_stop_session_create_from_payload(
+ struct lttng_payload_view *view,
struct lttng_action **p_action)
{
ssize_t consumed_len;
goto end;
}
- comm = (const struct lttng_action_stop_session_comm *) view->data;
+ comm = (typeof(comm)) view->buffer.data;
session_name = (const char *) &comm->data;
if (!lttng_buffer_view_contains_string(
- view, session_name, comm->session_name_len)) {
+ &view->buffer, session_name, comm->session_name_len)) {
consumed_len = -1;
goto end;
}
goto end;
}
- consumed_len = sizeof(struct lttng_action_stop_session_comm) +
- comm->session_name_len;
+ consumed_len = sizeof(*comm) + comm->session_name_len;
*p_action = action;
action = NULL;
static
int lttng_condition_buffer_usage_serialize(
const struct lttng_condition *condition,
- struct lttng_dynamic_buffer *buf)
+ struct lttng_payload *payload)
{
int ret;
struct lttng_condition_buffer_usage *usage;
usage_comm.threshold = val;
}
- ret = lttng_dynamic_buffer_append(buf, &usage_comm,
+ ret = lttng_dynamic_buffer_append(&payload->buffer, &usage_comm,
sizeof(usage_comm));
if (ret) {
goto end;
}
- ret = lttng_dynamic_buffer_append(buf, usage->session_name,
+
+ ret = lttng_dynamic_buffer_append(&payload->buffer, usage->session_name,
session_name_len);
if (ret) {
goto end;
}
- ret = lttng_dynamic_buffer_append(buf, usage->channel_name,
+
+ ret = lttng_dynamic_buffer_append(&payload->buffer, usage->channel_name,
channel_name_len);
if (ret) {
goto end;
}
static
-ssize_t init_condition_from_buffer(struct lttng_condition *condition,
- const struct lttng_buffer_view *src_view)
+ssize_t init_condition_from_payload(struct lttng_condition *condition,
+ struct lttng_payload_view *src_view)
{
ssize_t ret, condition_size;
enum lttng_condition_status status;
const char *session_name, *channel_name;
struct lttng_buffer_view names_view;
- if (src_view->size < sizeof(*condition_comm)) {
+ if (src_view->buffer.size < sizeof(*condition_comm)) {
ERR("Failed to initialize from malformed condition buffer: buffer too short to contain header");
ret = -1;
goto end;
}
- condition_comm = (const struct lttng_condition_buffer_usage_comm *) src_view->data;
- names_view = lttng_buffer_view_from_view(src_view,
+ condition_comm = (typeof(condition_comm)) src_view->buffer.data;
+ names_view = lttng_buffer_view_from_view(&src_view->buffer,
sizeof(*condition_comm), -1);
if (condition_comm->session_name_len > LTTNG_NAME_MAX ||
condition,
fixed_to_double(condition_comm->threshold));
}
+
if (status != LTTNG_CONDITION_STATUS_OK) {
ERR("Failed to initialize buffer usage condition threshold");
ret = -1;
}
LTTNG_HIDDEN
-ssize_t lttng_condition_buffer_usage_low_create_from_buffer(
- const struct lttng_buffer_view *view,
+ssize_t lttng_condition_buffer_usage_low_create_from_payload(
+ struct lttng_payload_view *view,
struct lttng_condition **_condition)
{
ssize_t ret;
goto error;
}
- ret = init_condition_from_buffer(condition, view);
+ ret = init_condition_from_payload(condition, view);
if (ret < 0) {
goto error;
}
}
LTTNG_HIDDEN
-ssize_t lttng_condition_buffer_usage_high_create_from_buffer(
- const struct lttng_buffer_view *view,
+ssize_t lttng_condition_buffer_usage_high_create_from_payload(
+ struct lttng_payload_view *view,
struct lttng_condition **_condition)
{
ssize_t ret;
goto error;
}
- ret = init_condition_from_buffer(condition, view);
+ ret = init_condition_from_payload(condition, view);
if (ret < 0) {
goto error;
}
}
static
-struct lttng_evaluation *create_evaluation_from_buffer(
+struct lttng_evaluation *create_evaluation_from_payload(
enum lttng_condition_type type,
- const struct lttng_buffer_view *view)
+ struct lttng_payload_view *view)
{
const struct lttng_evaluation_buffer_usage_comm *comm =
- (const struct lttng_evaluation_buffer_usage_comm *) view->data;
+ (typeof(comm)) view->buffer.data;
struct lttng_evaluation *evaluation = NULL;
- if (view->size < sizeof(*comm)) {
+ if (view->buffer.size < sizeof(*comm)) {
goto end;
}
}
LTTNG_HIDDEN
-ssize_t lttng_evaluation_buffer_usage_low_create_from_buffer(
- const struct lttng_buffer_view *view,
+ssize_t lttng_evaluation_buffer_usage_low_create_from_payload(
+ struct lttng_payload_view *view,
struct lttng_evaluation **_evaluation)
{
ssize_t ret;
goto error;
}
- evaluation = create_evaluation_from_buffer(
+ evaluation = create_evaluation_from_payload(
LTTNG_CONDITION_TYPE_BUFFER_USAGE_LOW, view);
if (!evaluation) {
ret = -1;
}
LTTNG_HIDDEN
-ssize_t lttng_evaluation_buffer_usage_high_create_from_buffer(
- const struct lttng_buffer_view *view,
+ssize_t lttng_evaluation_buffer_usage_high_create_from_payload(
+ struct lttng_payload_view *view,
struct lttng_evaluation **_evaluation)
{
ssize_t ret;
goto error;
}
- evaluation = create_evaluation_from_buffer(
+ evaluation = create_evaluation_from_payload(
LTTNG_CONDITION_TYPE_BUFFER_USAGE_HIGH, view);
if (!evaluation) {
ret = -1;
static
int lttng_evaluation_buffer_usage_serialize(
const struct lttng_evaluation *evaluation,
- struct lttng_dynamic_buffer *buf)
+ struct lttng_payload *payload)
{
struct lttng_evaluation_buffer_usage *usage;
struct lttng_evaluation_buffer_usage_comm comm;
comm.buffer_use = usage->buffer_use;
comm.buffer_capacity = usage->buffer_capacity;
- return lttng_dynamic_buffer_append(buf, &comm, sizeof(comm));
+ return lttng_dynamic_buffer_append(
+ &payload->buffer, &comm, sizeof(comm));
}
static
LTTNG_HIDDEN
int lttng_condition_serialize(const struct lttng_condition *condition,
- struct lttng_dynamic_buffer *buf)
+ struct lttng_payload *payload)
{
int ret;
- struct lttng_condition_comm condition_comm = { 0 };
+ struct lttng_condition_comm condition_comm = {};
if (!condition) {
ret = -1;
condition_comm.condition_type = (int8_t) condition->type;
- ret = lttng_dynamic_buffer_append(buf, &condition_comm,
+ ret = lttng_dynamic_buffer_append(&payload->buffer, &condition_comm,
sizeof(condition_comm));
if (ret) {
goto end;
}
- ret = condition->serialize(condition, buf);
+ ret = condition->serialize(condition, payload);
if (ret) {
goto end;
}
}
LTTNG_HIDDEN
-ssize_t lttng_condition_create_from_buffer(
- const struct lttng_buffer_view *buffer,
+ssize_t lttng_condition_create_from_payload(
+ struct lttng_payload_view *view,
struct lttng_condition **condition)
{
ssize_t ret, condition_size = 0;
const struct lttng_condition_comm *condition_comm;
- condition_create_from_buffer_cb create_from_buffer = NULL;
+ condition_create_from_payload_cb create_from_payload = NULL;
- if (!buffer || !condition) {
+ if (!view || !condition) {
ret = -1;
goto end;
}
DBG("Deserializing condition from buffer");
- condition_comm = (const struct lttng_condition_comm *) buffer->data;
+ condition_comm = (typeof(condition_comm)) view->buffer.data;
condition_size += sizeof(*condition_comm);
switch ((enum lttng_condition_type) condition_comm->condition_type) {
case LTTNG_CONDITION_TYPE_BUFFER_USAGE_LOW:
- create_from_buffer = lttng_condition_buffer_usage_low_create_from_buffer;
+ create_from_payload = lttng_condition_buffer_usage_low_create_from_payload;
break;
case LTTNG_CONDITION_TYPE_BUFFER_USAGE_HIGH:
- create_from_buffer = lttng_condition_buffer_usage_high_create_from_buffer;
+ create_from_payload = lttng_condition_buffer_usage_high_create_from_payload;
break;
case LTTNG_CONDITION_TYPE_SESSION_CONSUMED_SIZE:
- create_from_buffer = lttng_condition_session_consumed_size_create_from_buffer;
+ create_from_payload = lttng_condition_session_consumed_size_create_from_payload;
break;
case LTTNG_CONDITION_TYPE_SESSION_ROTATION_ONGOING:
- create_from_buffer = lttng_condition_session_rotation_ongoing_create_from_buffer;
+ create_from_payload = lttng_condition_session_rotation_ongoing_create_from_payload;
break;
case LTTNG_CONDITION_TYPE_SESSION_ROTATION_COMPLETED:
- create_from_buffer = lttng_condition_session_rotation_completed_create_from_buffer;
+ create_from_payload = lttng_condition_session_rotation_completed_create_from_payload;
break;
default:
ERR("Attempted to create condition of unknown type (%i)",
goto end;
}
- if (create_from_buffer) {
- const struct lttng_buffer_view view =
- lttng_buffer_view_from_view(buffer,
+ if (create_from_payload) {
+ struct lttng_payload_view condition_view =
+ lttng_payload_view_from_view(view,
sizeof(*condition_comm), -1);
- ret = create_from_buffer(&view, condition);
+ ret = create_from_payload(&condition_view, condition);
if (ret < 0) {
goto end;
}
LTTNG_HIDDEN
int lttng_evaluation_serialize(const struct lttng_evaluation *evaluation,
- struct lttng_dynamic_buffer *buf)
+ struct lttng_payload *payload)
{
int ret;
struct lttng_evaluation_comm evaluation_comm = {
.type = (int8_t) evaluation->type
};
- ret = lttng_dynamic_buffer_append(buf, &evaluation_comm,
+ ret = lttng_dynamic_buffer_append(&payload->buffer, &evaluation_comm,
sizeof(evaluation_comm));
if (ret) {
goto end;
}
if (evaluation->serialize) {
- ret = evaluation->serialize(evaluation, buf);
+ ret = evaluation->serialize(evaluation, payload);
if (ret) {
goto end;
}
}
LTTNG_HIDDEN
-ssize_t lttng_evaluation_create_from_buffer(
- const struct lttng_buffer_view *src_view,
+ssize_t lttng_evaluation_create_from_payload(
+ struct lttng_payload_view *src_view,
struct lttng_evaluation **evaluation)
{
ssize_t ret, evaluation_size = 0;
const struct lttng_evaluation_comm *evaluation_comm;
- const struct lttng_buffer_view evaluation_view =
- lttng_buffer_view_from_view(src_view,
- sizeof(*evaluation_comm), -1);
+ struct lttng_payload_view evaluation_view =
+ lttng_payload_view_from_view(
+ src_view, sizeof(*evaluation_comm), -1);
if (!src_view || !evaluation) {
ret = -1;
goto end;
}
- evaluation_comm = (const struct lttng_evaluation_comm *) src_view->data;
+ evaluation_comm = (typeof(evaluation_comm)) src_view->buffer.data;
evaluation_size += sizeof(*evaluation_comm);
switch ((enum lttng_condition_type) evaluation_comm->type) {
case LTTNG_CONDITION_TYPE_BUFFER_USAGE_LOW:
- ret = lttng_evaluation_buffer_usage_low_create_from_buffer(
+ ret = lttng_evaluation_buffer_usage_low_create_from_payload(
&evaluation_view, evaluation);
if (ret < 0) {
goto end;
evaluation_size += ret;
break;
case LTTNG_CONDITION_TYPE_BUFFER_USAGE_HIGH:
- ret = lttng_evaluation_buffer_usage_high_create_from_buffer(
+ ret = lttng_evaluation_buffer_usage_high_create_from_payload(
&evaluation_view, evaluation);
if (ret < 0) {
goto end;
evaluation_size += ret;
break;
case LTTNG_CONDITION_TYPE_SESSION_CONSUMED_SIZE:
- ret = lttng_evaluation_session_consumed_size_create_from_buffer(
+ ret = lttng_evaluation_session_consumed_size_create_from_payload(
&evaluation_view, evaluation);
if (ret < 0) {
goto end;
evaluation_size += ret;
break;
case LTTNG_CONDITION_TYPE_SESSION_ROTATION_ONGOING:
- ret = lttng_evaluation_session_rotation_ongoing_create_from_buffer(
+ ret = lttng_evaluation_session_rotation_ongoing_create_from_payload(
&evaluation_view, evaluation);
if (ret < 0) {
goto end;
evaluation_size += ret;
break;
case LTTNG_CONDITION_TYPE_SESSION_ROTATION_COMPLETED:
- ret = lttng_evaluation_session_rotation_completed_create_from_buffer(
+ ret = lttng_evaluation_session_rotation_completed_create_from_payload(
&evaluation_view, evaluation);
if (ret < 0) {
goto end;
ret = -1;
goto end;
}
+
ret = evaluation_size;
end:
return ret;
#include <lttng/condition/evaluation-internal.h>
#include <lttng/condition/condition.h>
#include <lttng/condition/evaluation.h>
+#include <common/sessiond-comm/payload.h>
+#include <common/sessiond-comm/payload-view.h>
#include <assert.h>
LTTNG_HIDDEN
LTTNG_HIDDEN
int lttng_notification_serialize(const struct lttng_notification *notification,
- struct lttng_dynamic_buffer *buf)
+ struct lttng_payload *payload)
{
int ret;
size_t header_offset, size_before_payload;
struct lttng_notification_comm notification_comm = { 0 };
struct lttng_notification_comm *header;
- header_offset = buf->size;
- ret = lttng_dynamic_buffer_append(buf, ¬ification_comm,
+ header_offset = payload->buffer.size;
+ ret = lttng_dynamic_buffer_append(&payload->buffer, ¬ification_comm,
sizeof(notification_comm));
if (ret) {
goto end;
}
- size_before_payload = buf->size;
+ size_before_payload = payload->buffer.size;
ret = lttng_condition_serialize(notification->condition,
- buf);
+ payload);
if (ret) {
goto end;
}
- ret = lttng_evaluation_serialize(notification->evaluation, buf);
+ ret = lttng_evaluation_serialize(notification->evaluation, payload);
if (ret) {
goto end;
}
/* Update payload size. */
- header = (struct lttng_notification_comm *) ((char *) buf->data + header_offset);
- header->length = (uint32_t) (buf->size - size_before_payload);
+ header = (typeof(header)) (payload->buffer.data + header_offset);
+ header->length = (uint32_t) (payload->buffer.size - size_before_payload);
end:
return ret;
}
LTTNG_HIDDEN
-ssize_t lttng_notification_create_from_buffer(
- const struct lttng_buffer_view *src_view,
+ssize_t lttng_notification_create_from_payload(
+ struct lttng_payload_view *src_view,
struct lttng_notification **notification)
{
ssize_t ret, notification_size = 0, condition_size, evaluation_size;
const struct lttng_notification_comm *notification_comm;
struct lttng_condition *condition;
struct lttng_evaluation *evaluation;
- struct lttng_buffer_view condition_view;
- struct lttng_buffer_view evaluation_view;
if (!src_view || !notification) {
ret = -1;
goto end;
}
- notification_comm =
- (const struct lttng_notification_comm *) src_view->data;
+ notification_comm = (typeof(notification_comm)) src_view->buffer.data;
notification_size += sizeof(*notification_comm);
+ {
+ /* struct lttng_condition */
+ struct lttng_payload_view condition_view =
+ lttng_payload_view_from_view(src_view,
+ notification_size, -1);
+
+ condition_size = lttng_condition_create_from_payload(
+ &condition_view, &condition);
+ }
- /* struct lttng_condition */
- condition_view = lttng_buffer_view_from_view(src_view,
- sizeof(*notification_comm), -1);
- condition_size = lttng_condition_create_from_buffer(&condition_view,
- &condition);
if (condition_size < 0) {
ret = condition_size;
goto end;
}
+
notification_size += condition_size;
- /* struct lttng_evaluation */
- evaluation_view = lttng_buffer_view_from_view(&condition_view,
- condition_size, -1);
- evaluation_size = lttng_evaluation_create_from_buffer(&evaluation_view,
- &evaluation);
+ {
+ /* struct lttng_evaluation */
+ struct lttng_payload_view evaluation_view =
+ lttng_payload_view_from_view(src_view,
+ notification_size, -1);
+
+ evaluation_size = lttng_evaluation_create_from_payload(
+ &evaluation_view, &evaluation);
+ }
+
if (evaluation_size < 0) {
ret = evaluation_size;
goto end;
}
+
notification_size += evaluation_size;
/* Unexpected size of inner-elements; the buffer is corrupted. */
static
int lttng_condition_session_consumed_size_serialize(
const struct lttng_condition *condition,
- struct lttng_dynamic_buffer *buf)
+ struct lttng_payload *payload)
{
int ret;
size_t session_name_len;
consumed->consumed_threshold_bytes.value;
consumed_comm.session_name_len = (uint32_t) session_name_len;
- ret = lttng_dynamic_buffer_append(buf, &consumed_comm,
+ ret = lttng_dynamic_buffer_append(&payload->buffer, &consumed_comm,
sizeof(consumed_comm));
if (ret) {
goto end;
}
- ret = lttng_dynamic_buffer_append(buf, consumed->session_name,
+
+ ret = lttng_dynamic_buffer_append(&payload->buffer, consumed->session_name,
session_name_len);
if (ret) {
goto end;
}
static
-ssize_t init_condition_from_buffer(struct lttng_condition *condition,
- const struct lttng_buffer_view *src_view)
+ssize_t init_condition_from_payload(struct lttng_condition *condition,
+ struct lttng_payload_view *src_view)
{
ssize_t ret, condition_size;
enum lttng_condition_status status;
const char *session_name;
struct lttng_buffer_view names_view;
- if (src_view->size < sizeof(*condition_comm)) {
+ if (src_view->buffer.size < sizeof(*condition_comm)) {
ERR("Failed to initialize from malformed condition buffer: buffer too short to contain header");
ret = -1;
goto end;
}
- condition_comm = (const struct lttng_condition_session_consumed_size_comm *) src_view->data;
- names_view = lttng_buffer_view_from_view(src_view,
+ condition_comm = (typeof(condition_comm)) src_view->buffer.data;
+ names_view = lttng_buffer_view_from_view(&src_view->buffer,
sizeof(*condition_comm), -1);
if (condition_comm->session_name_len > LTTNG_NAME_MAX) {
}
LTTNG_HIDDEN
-ssize_t lttng_condition_session_consumed_size_create_from_buffer(
- const struct lttng_buffer_view *view,
+ssize_t lttng_condition_session_consumed_size_create_from_payload(
+ struct lttng_payload_view *view,
struct lttng_condition **_condition)
{
ssize_t ret;
goto error;
}
- ret = init_condition_from_buffer(condition, view);
+ ret = init_condition_from_payload(condition, view);
if (ret < 0) {
goto error;
}
}
static
-struct lttng_evaluation *create_evaluation_from_buffer(
- const struct lttng_buffer_view *view)
+struct lttng_evaluation *create_evaluation_from_payload(
+ const struct lttng_payload_view *view)
{
const struct lttng_evaluation_session_consumed_size_comm *comm =
- (const struct lttng_evaluation_session_consumed_size_comm *) view->data;
+ (typeof(comm)) view->buffer.data;
struct lttng_evaluation *evaluation = NULL;
- if (view->size < sizeof(*comm)) {
+ if (view->buffer.size < sizeof(*comm)) {
goto end;
}
}
LTTNG_HIDDEN
-ssize_t lttng_evaluation_session_consumed_size_create_from_buffer(
- const struct lttng_buffer_view *view,
+ssize_t lttng_evaluation_session_consumed_size_create_from_payload(
+ struct lttng_payload_view *view,
struct lttng_evaluation **_evaluation)
{
ssize_t ret;
goto error;
}
- evaluation = create_evaluation_from_buffer(view);
+ evaluation = create_evaluation_from_payload(view);
if (!evaluation) {
ret = -1;
goto error;
static
int lttng_evaluation_session_consumed_size_serialize(
const struct lttng_evaluation *evaluation,
- struct lttng_dynamic_buffer *buf)
+ struct lttng_payload *payload)
{
struct lttng_evaluation_session_consumed_size *consumed;
struct lttng_evaluation_session_consumed_size_comm comm;
- consumed = container_of(evaluation, struct lttng_evaluation_session_consumed_size,
- parent);
+ consumed = container_of(evaluation,
+ struct lttng_evaluation_session_consumed_size, parent);
comm.session_consumed = consumed->session_consumed;
- return lttng_dynamic_buffer_append(buf, &comm, sizeof(comm));
+ return lttng_dynamic_buffer_append(
+ &payload->buffer, &comm, sizeof(comm));
}
static
static
int lttng_condition_session_rotation_serialize(
const struct lttng_condition *condition,
- struct lttng_dynamic_buffer *buf);
+ struct lttng_payload *payload);
static
bool lttng_condition_session_rotation_is_equal(const struct lttng_condition *_a,
const struct lttng_condition *_b);
static
int lttng_evaluation_session_rotation_serialize(
const struct lttng_evaluation *evaluation,
- struct lttng_dynamic_buffer *buf);
+ struct lttng_payload *payload);
static
void lttng_evaluation_session_rotation_destroy(
struct lttng_evaluation *evaluation);
static
int lttng_condition_session_rotation_serialize(
const struct lttng_condition *condition,
- struct lttng_dynamic_buffer *buf)
+ struct lttng_payload *payload)
{
int ret;
size_t session_name_len;
}
rotation_comm.session_name_len = session_name_len;
- ret = lttng_dynamic_buffer_append(buf, &rotation_comm,
+ ret = lttng_dynamic_buffer_append(&payload->buffer, &rotation_comm,
sizeof(rotation_comm));
if (ret) {
goto end;
}
- ret = lttng_dynamic_buffer_append(buf, rotation->session_name,
- session_name_len);
+ ret = lttng_dynamic_buffer_append(&payload->buffer,
+ rotation->session_name, session_name_len);
if (ret) {
goto end;
}
}
static
-ssize_t init_condition_from_buffer(struct lttng_condition *condition,
- const struct lttng_buffer_view *src_view)
+ssize_t init_condition_from_payload(struct lttng_condition *condition,
+ struct lttng_payload_view *src_view)
{
ssize_t ret, condition_size;
enum lttng_condition_status status;
const char *session_name;
struct lttng_buffer_view name_view;
- if (src_view->size < sizeof(*condition_comm)) {
+ if (src_view->buffer.size < sizeof(*condition_comm)) {
ERR("Failed to initialize from malformed condition buffer: buffer too short to contain header");
ret = -1;
goto end;
}
- condition_comm = (const struct lttng_condition_session_rotation_comm *) src_view->data;
- name_view = lttng_buffer_view_from_view(src_view,
+ condition_comm = (typeof(condition_comm)) src_view->buffer.data;
+ name_view = lttng_buffer_view_from_view(&src_view->buffer,
sizeof(*condition_comm), -1);
if (condition_comm->session_name_len > LTTNG_NAME_MAX) {
}
static
-ssize_t lttng_condition_session_rotation_create_from_buffer(
- const struct lttng_buffer_view *view,
+ssize_t lttng_condition_session_rotation_create_from_payload(
+ struct lttng_payload_view *view,
struct lttng_condition **_condition,
enum lttng_condition_type type)
{
goto error;
}
- ret = init_condition_from_buffer(condition, view);
+ ret = init_condition_from_payload(condition, view);
if (ret < 0) {
goto error;
}
}
LTTNG_HIDDEN
-ssize_t lttng_condition_session_rotation_ongoing_create_from_buffer(
- const struct lttng_buffer_view *view,
+ssize_t lttng_condition_session_rotation_ongoing_create_from_payload(
+ struct lttng_payload_view *view,
struct lttng_condition **condition)
{
- return lttng_condition_session_rotation_create_from_buffer(view,
+ return lttng_condition_session_rotation_create_from_payload(view,
condition,
LTTNG_CONDITION_TYPE_SESSION_ROTATION_ONGOING);
}
LTTNG_HIDDEN
-ssize_t lttng_condition_session_rotation_completed_create_from_buffer(
- const struct lttng_buffer_view *view,
+ssize_t lttng_condition_session_rotation_completed_create_from_payload(
+ struct lttng_payload_view *view,
struct lttng_condition **condition)
{
- return lttng_condition_session_rotation_create_from_buffer(view,
+ return lttng_condition_session_rotation_create_from_payload(view,
condition,
LTTNG_CONDITION_TYPE_SESSION_ROTATION_COMPLETED);
}
}
static
-ssize_t create_evaluation_from_buffer(
+ssize_t create_evaluation_from_payload(
enum lttng_condition_type type,
- const struct lttng_buffer_view *view,
+ struct lttng_payload_view *view,
struct lttng_evaluation **_evaluation)
{
ssize_t ret, size;
struct lttng_evaluation *evaluation = NULL;
struct lttng_trace_archive_location *location = NULL;
const struct lttng_evaluation_session_rotation_comm *comm =
- (const struct lttng_evaluation_session_rotation_comm *) view->data;
- struct lttng_buffer_view location_view;
+ (typeof(comm)) view->buffer.data;
+ struct lttng_buffer_view location_view;
- if (view->size < sizeof(*comm)) {
+ if (view->buffer.size < sizeof(*comm)) {
goto error;
}
size = sizeof(*comm);
if (comm->has_location) {
- location_view = lttng_buffer_view_from_view(view, sizeof(*comm),
- -1);
+ location_view = lttng_buffer_view_from_view(
+ &view->buffer, sizeof(*comm), -1);
if (!location_view.data) {
goto error;
}
}
static
-ssize_t lttng_evaluation_session_rotation_create_from_buffer(
+ssize_t lttng_evaluation_session_rotation_create_from_payload(
enum lttng_condition_type type,
- const struct lttng_buffer_view *view,
+ struct lttng_payload_view *view,
struct lttng_evaluation **_evaluation)
{
ssize_t ret;
goto error;
}
- ret = create_evaluation_from_buffer(type, view, &evaluation);
+ ret = create_evaluation_from_payload(type, view, &evaluation);
if (ret < 0) {
goto error;
}
}
LTTNG_HIDDEN
-ssize_t lttng_evaluation_session_rotation_ongoing_create_from_buffer(
- const struct lttng_buffer_view *view,
+ssize_t lttng_evaluation_session_rotation_ongoing_create_from_payload(
+ struct lttng_payload_view *view,
struct lttng_evaluation **evaluation)
{
- return lttng_evaluation_session_rotation_create_from_buffer(
+ return lttng_evaluation_session_rotation_create_from_payload(
LTTNG_CONDITION_TYPE_SESSION_ROTATION_ONGOING,
view, evaluation);
}
LTTNG_HIDDEN
-ssize_t lttng_evaluation_session_rotation_completed_create_from_buffer(
- const struct lttng_buffer_view *view,
+ssize_t lttng_evaluation_session_rotation_completed_create_from_payload(
+ struct lttng_payload_view *view,
struct lttng_evaluation **evaluation)
{
- return lttng_evaluation_session_rotation_create_from_buffer(
+ return lttng_evaluation_session_rotation_create_from_payload(
LTTNG_CONDITION_TYPE_SESSION_ROTATION_COMPLETED,
view, evaluation);
}
static
int lttng_evaluation_session_rotation_serialize(
const struct lttng_evaluation *evaluation,
- struct lttng_dynamic_buffer *buf)
+ struct lttng_payload *payload)
{
int ret;
struct lttng_evaluation_session_rotation *rotation;
struct lttng_evaluation_session_rotation, parent);
comm.id = rotation->id;
comm.has_location = !!rotation->location;
- ret = lttng_dynamic_buffer_append(buf, &comm, sizeof(comm));
+ ret = lttng_dynamic_buffer_append(
+ &payload->buffer, &comm, sizeof(comm));
if (ret) {
goto end;
}
goto end;
}
ret = lttng_trace_archive_location_serialize(rotation->location,
- buf);
+ &payload->buffer);
end:
return ret;
}
libsessiond_comm_la_SOURCES = sessiond-comm.c sessiond-comm.h \
inet.c inet.h inet6.c inet6.h \
- relayd.h agent.h
+ relayd.h agent.h payload.h \
+ payload.c payload-view.h payload-view.c
--- /dev/null
+/*
+ * Copyright (C) 2020 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * SPDX-License-Identifier: LGPL-2.1-only
+ *
+ */
+
+#include <common/buffer-view.h>
+#include "payload-view.h"
+#include "payload.h"
+#include <stddef.h>
+
+LTTNG_HIDDEN
+struct lttng_payload_view lttng_payload_view_from_payload(
+ const struct lttng_payload *payload, size_t offset,
+ ptrdiff_t len)
+{
+ return (struct lttng_payload_view) {
+ .buffer = lttng_buffer_view_from_dynamic_buffer(
+ &payload->buffer, offset, len),
+ ._fds = payload->_fds,
+ };
+}
+
+LTTNG_HIDDEN
+struct lttng_payload_view lttng_payload_view_from_view(
+ struct lttng_payload_view *view, size_t offset,
+ ptrdiff_t len)
+{
+ return (struct lttng_payload_view) {
+ .buffer = lttng_buffer_view_from_view(
+ &view->buffer, offset, len),
+ ._fds = view->_fds,
+ ._iterator.p_fds_position = &view->_iterator.fds_position,
+ };
+}
+
+LTTNG_HIDDEN
+struct lttng_payload_view lttng_payload_view_from_dynamic_buffer(
+ const struct lttng_dynamic_buffer *buffer, size_t offset,
+ ptrdiff_t len)
+{
+ return (struct lttng_payload_view) {
+ .buffer = lttng_buffer_view_from_dynamic_buffer(
+ buffer, offset, len)
+ };
+}
+
+LTTNG_HIDDEN
+int lttng_payload_view_pop_fd(struct lttng_payload_view *view)
+{
+ int ret = 0;
+ size_t fd_count;
+ size_t *pos;
+
+ if (!view) {
+ ret = -1;
+ goto end;
+ }
+
+ fd_count = lttng_dynamic_array_get_count(&view->_fds);
+ pos = view->_iterator.p_fds_position ? view->_iterator.p_fds_position :
+ &view->_iterator.fds_position;
+
+ if (*pos >= fd_count) {
+ ret = -1;
+ goto end;
+ }
+
+ ret = *((int *) lttng_dynamic_array_get_element(
+ &view->_fds, *pos));
+ (*pos)++;
+end:
+ return ret;
+}
--- /dev/null
+/*
+ * Copyright (C) 2020 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * SPDX-License-Identifier: LGPL-2.1-only
+ *
+ */
+
+#ifndef LTTNG_PAYLOAD_VIEW_H
+#define LTTNG_PAYLOAD_VIEW_H
+
+#include <common/buffer-view.h>
+#include <common/dynamic-array.h>
+
+struct lttng_payload;
+
+/*
+ * An lttng_payload_view references a payload and allows code to share
+ * a `const` version of a subset of a payload.
+ *
+ * A payload view is invalidated whenever its source (a payload, or another
+ * payload view) is modified.
+ *
+ * While a payload view does not allow users to modify the underlying bytes
+ * of the payload, it can be used to 'pop' file descriptors using an iterator
+ * belonging to the top-level payload view.
+ *
+ * Hence, a payload view created from a payload or a dynamic buffer contains
+ * an implicit file descriptor iterator. Any payload view created from another
+ * payload view will share the same underlying file descriptor iterator.
+ *
+ * The rationale for this is that a payload is never consumed directly, it
+ * must be consumed through a payload view.
+ *
+ * Typically, a payload view will be used to rebuild a previously serialized
+ * object hierarchy. Sharing an underlying iterator allows aggregate objects
+ * to provide a restricted view of the payload to their members, which will
+ * report the number of bytes consumed and `pop` the file descriptors they
+ * should own. In return, those objects can create an even narrower view for
+ * their children, allowing them to also consume file descriptors.
+ *
+ * Note that a payload view never assumes any ownership of the underlying
+ * payload.
+ */
+struct lttng_payload_view {
+ struct lttng_buffer_view buffer;
+ /* private */
+ const struct lttng_dynamic_array _fds;
+ struct {
+ size_t *p_fds_position;
+ size_t fds_position;
+ } _iterator;
+};
+
+/**
+ * Return a payload view referencing a subset of a payload.
+ *
+ * @payload Source payload to reference
+ * @offset Offset to apply to the payload's buffer
+ * @len Length of the contents to reference. Passing -1 will
+ * cause the view to reference the whole payload from the
+ * offset provided.
+ */
+LTTNG_HIDDEN
+struct lttng_payload_view lttng_payload_view_from_payload(
+ const struct lttng_payload *payload, size_t offset,
+ ptrdiff_t len);
+
+/**
+ * Return a payload view referencing a subset of a payload referenced by
+ * another payload view.
+ *
+ * @view Source payload view to reference
+ * @offset Offset to apply to the payload view's buffer view
+ * @len Length of the contents to reference. Passing -1 will
+ * cause the payload view to reference the whole payload view's
+ * buffer view from the offset provided.
+ */
+LTTNG_HIDDEN
+struct lttng_payload_view lttng_payload_view_from_view(
+ struct lttng_payload_view *view, size_t offset,
+ ptrdiff_t len);
+
+/**
+ * Return a payload view referencing a subset of a dynamic buffer.
+ *
+ * Meant as an adapter for code paths that need to create a payload view
+ * from an existing dynamic buffer.
+ *
+ * @src Source dynamic buffer to reference
+ * @offset Offset to apply to the payload's buffer
+ * @len Length of the buffer contents to reference. Passing -1 will
+ * cause the payload view to reference the whole payload from the
+ * offset provided.
+ */
+LTTNG_HIDDEN
+struct lttng_payload_view lttng_payload_view_from_dynamic_buffer(
+ const struct lttng_dynamic_buffer *buffer, size_t offset,
+ ptrdiff_t len);
+
+/**
+ * Pop an fd from a payload view.
+ * No ownership of the file descriptor is assumed by the payload.
+ *
+ * @payload Payload instance
+ *
+ * Returns a file descriptor on success, -1 on error.
+ */
+LTTNG_HIDDEN
+int lttng_payload_view_pop_fd(struct lttng_payload_view *payload_view);
+
+#endif /* LTTNG_PAYLOAD_VIEW_H */
--- /dev/null
+/*
+ * Copyright (C) 2020 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * SPDX-License-Identifier: LGPL-2.1-only
+ *
+ */
+
+#include "payload.h"
+
+LTTNG_HIDDEN
+void lttng_payload_init(struct lttng_payload *payload)
+{
+ assert(payload);
+ lttng_dynamic_buffer_init(&payload->buffer);
+ lttng_dynamic_array_init(&payload->_fds, sizeof(int), NULL);
+}
+
+LTTNG_HIDDEN
+void lttng_payload_reset(struct lttng_payload *payload)
+{
+ if (!payload) {
+ return;
+ }
+
+ lttng_dynamic_buffer_reset(&payload->buffer);
+ lttng_dynamic_array_reset(&payload->_fds);
+}
+
+LTTNG_HIDDEN
+int lttng_payload_push_fd(struct lttng_payload *payload, int fd)
+{
+ int ret;
+
+ if (!payload) {
+ ret = -1;
+ goto end;
+ }
+
+ ret = lttng_dynamic_array_add_element(&payload->_fds, &fd);
+end:
+ return ret;
+}
--- /dev/null
+/*
+ * Copyright (C) 2020 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * SPDX-License-Identifier: LGPL-2.1-only
+ *
+ */
+
+#ifndef LTTNG_PAYLOAD_H
+#define LTTNG_PAYLOAD_H
+
+#include <common/dynamic-buffer.h>
+#include <common/dynamic-array.h>
+
+/*
+ * An lttng_payload encompasses the 'data' (bytes) and any passed file
+ * descriptors as part of a message between liblttng-ctl and the session
+ * daemon.
+ */
+struct lttng_payload {
+ struct lttng_dynamic_buffer buffer;
+ /* private */
+ struct lttng_dynamic_array _fds;
+};
+
+/*
+ * Initialize a payload. This performs no allocation and is meant
+ * to be used instead.
+ */
+LTTNG_HIDDEN
+void lttng_payload_init(struct lttng_payload *payload);
+
+/* Release any memory used by the payload. */
+LTTNG_HIDDEN
+void lttng_payload_reset(struct lttng_payload *payload);
+
+/**
+ * Add an fd to the payload.
+ * No ownership of the file descriptor is assumed by the payload.
+ *
+ * @payload Payload instance
+ * @fd File descriptor to add to the payload
+ *
+ * Returns 0 on success, -1 on allocation error.
+ */
+LTTNG_HIDDEN
+int lttng_payload_push_fd(struct lttng_payload *payload, int fd);
+
+#endif /* LTTNG_PAYLOAD_H */
#include <lttng/trigger/trigger-internal.h>
#include <lttng/condition/condition-internal.h>
#include <lttng/action/action-internal.h>
+#include <common/sessiond-comm/payload.h>
+#include <common/sessiond-comm/payload-view.h>
#include <common/error.h>
#include <assert.h>
}
LTTNG_HIDDEN
-ssize_t lttng_trigger_create_from_buffer(
- const struct lttng_buffer_view *src_view,
+ssize_t lttng_trigger_create_from_payload(
+ struct lttng_payload_view *src_view,
struct lttng_trigger **trigger)
{
ssize_t ret, offset = 0, condition_size, action_size;
struct lttng_condition *condition = NULL;
struct lttng_action *action = NULL;
const struct lttng_trigger_comm *trigger_comm;
- struct lttng_buffer_view condition_view;
- struct lttng_buffer_view action_view;
if (!src_view || !trigger) {
ret = -1;
}
/* lttng_trigger_comm header */
- trigger_comm = (const struct lttng_trigger_comm *) src_view->data;
+ trigger_comm = (typeof(trigger_comm)) src_view->buffer.data;
offset += sizeof(*trigger_comm);
+ {
+ /* struct lttng_condition */
+ struct lttng_payload_view condition_view =
+ lttng_payload_view_from_view(
+ src_view, offset, -1);
+
+ condition_size = lttng_condition_create_from_payload(&condition_view,
+ &condition);
+ }
- condition_view = lttng_buffer_view_from_view(src_view, offset, -1);
-
- /* struct lttng_condition */
- condition_size = lttng_condition_create_from_buffer(&condition_view,
- &condition);
if (condition_size < 0) {
ret = condition_size;
goto end;
}
+
offset += condition_size;
+ {
+ /* struct lttng_action */
+ struct lttng_payload_view action_view =
+ lttng_payload_view_from_view(
+ src_view, offset, -1);
+
+ action_size = lttng_action_create_from_payload(&action_view, &action);
+ }
- /* struct lttng_action */
- action_view = lttng_buffer_view_from_view(src_view, offset, -1);
- action_size = lttng_action_create_from_buffer(&action_view, &action);
if (action_size < 0) {
ret = action_size;
goto end;
ret = -1;
goto error;
}
+
ret = offset;
end:
return ret;
*/
LTTNG_HIDDEN
int lttng_trigger_serialize(struct lttng_trigger *trigger,
- struct lttng_dynamic_buffer *buf)
+ struct lttng_payload *payload)
{
int ret;
size_t header_offset, size_before_payload;
- struct lttng_trigger_comm trigger_comm = { 0 };
+ struct lttng_trigger_comm trigger_comm = {};
struct lttng_trigger_comm *header;
- header_offset = buf->size;
- ret = lttng_dynamic_buffer_append(buf, &trigger_comm,
+ header_offset = payload->buffer.size;
+ ret = lttng_dynamic_buffer_append(&payload->buffer, &trigger_comm,
sizeof(trigger_comm));
if (ret) {
goto end;
}
- size_before_payload = buf->size;
- ret = lttng_condition_serialize(trigger->condition, buf);
+ size_before_payload = payload->buffer.size;
+ ret = lttng_condition_serialize(trigger->condition, payload);
if (ret) {
goto end;
}
- ret = lttng_action_serialize(trigger->action, buf);
+ ret = lttng_action_serialize(trigger->action, payload);
if (ret) {
goto end;
}
/* Update payload size. */
- header = (struct lttng_trigger_comm *) ((char *) buf->data + header_offset);
- header->length = buf->size - size_before_payload;
+ header = (typeof(header)) (payload->buffer.data + header_offset);
+ header->length = payload->buffer.size - size_before_payload;
end:
return ret;
}
{
ssize_t ret;
struct lttng_notification *notification = NULL;
- struct lttng_buffer_view view;
if (channel->reception_buffer.size <=
sizeof(struct lttng_notification_channel_message)) {
goto end;
}
- view = lttng_buffer_view_from_dynamic_buffer(&channel->reception_buffer,
- sizeof(struct lttng_notification_channel_message), -1);
+ {
+ struct lttng_payload_view view = lttng_payload_view_from_dynamic_buffer(
+ &channel->reception_buffer,
+ sizeof(struct lttng_notification_channel_message),
+ -1);
+
+ ret = lttng_notification_create_from_payload(
+ &view, ¬ification);
+ }
- ret = lttng_notification_create_from_buffer(&view, ¬ification);
if (ret != channel->reception_buffer.size -
sizeof(struct lttng_notification_channel_message)) {
lttng_notification_destroy(notification);
ssize_t ret;
enum lttng_notification_channel_status status =
LTTNG_NOTIFICATION_CHANNEL_STATUS_OK;
- struct lttng_dynamic_buffer buffer;
+ struct lttng_payload payload;
struct lttng_notification_channel_message cmd_header = {
.type = (int8_t) type,
};
- lttng_dynamic_buffer_init(&buffer);
+ lttng_payload_init(&payload);
if (!channel) {
status = LTTNG_NOTIFICATION_CHANNEL_STATUS_INVALID;
goto end_unlock;
}
- ret = lttng_dynamic_buffer_append(&buffer, &cmd_header,
+ ret = lttng_dynamic_buffer_append(&payload.buffer, &cmd_header,
sizeof(cmd_header));
if (ret) {
status = LTTNG_NOTIFICATION_CHANNEL_STATUS_ERROR;
goto end_unlock;
}
- ret = lttng_condition_serialize(condition, &buffer);
+ ret = lttng_condition_serialize(condition, &payload);
if (ret) {
status = LTTNG_NOTIFICATION_CHANNEL_STATUS_INVALID;
goto end_unlock;
}
/* Update payload length. */
- ((struct lttng_notification_channel_message *) buffer.data)->size =
- (uint32_t) (buffer.size - sizeof(cmd_header));
+ ((struct lttng_notification_channel_message *) payload.buffer.data)->size =
+ (uint32_t) (payload.buffer.size - sizeof(cmd_header));
- ret = lttcomm_send_unix_sock(socket, buffer.data, buffer.size);
+ ret = lttcomm_send_unix_sock(
+ socket, payload.buffer.data, payload.buffer.size);
if (ret < 0) {
status = LTTNG_NOTIFICATION_CHANNEL_STATUS_ERROR;
goto end_unlock;
end_unlock:
pthread_mutex_unlock(&channel->lock);
end:
- lttng_dynamic_buffer_reset(&buffer);
+ lttng_payload_reset(&payload);
return status;
}
#include <common/compat/string.h>
#include <common/defaults.h>
#include <common/dynamic-buffer.h>
+#include <common/sessiond-comm/payload.h>
+#include <common/sessiond-comm/payload-view.h>
#include <common/sessiond-comm/sessiond-comm.h>
#include <common/tracker.h>
#include <common/uri.h>
{
int ret;
struct lttcomm_session_msg lsm;
- struct lttng_dynamic_buffer buffer;
+ struct lttng_payload payload;
- lttng_dynamic_buffer_init(&buffer);
+ lttng_payload_init(&payload);
if (!trigger) {
ret = -LTTNG_ERR_INVALID;
goto end;
goto end;
}
- ret = lttng_trigger_serialize(trigger, &buffer);
+ ret = lttng_trigger_serialize(trigger, &payload);
if (ret < 0) {
ret = -LTTNG_ERR_UNK;
goto end;
memset(&lsm, 0, sizeof(lsm));
lsm.cmd_type = LTTNG_REGISTER_TRIGGER;
- lsm.u.trigger.length = (uint32_t) buffer.size;
- ret = lttng_ctl_ask_sessiond_varlen_no_cmd_header(&lsm, buffer.data,
- buffer.size, NULL);
+ lsm.u.trigger.length = (uint32_t) payload.buffer.size;
+ ret = lttng_ctl_ask_sessiond_varlen_no_cmd_header(
+ &lsm, payload.buffer.data, payload.buffer.size, NULL);
end:
- lttng_dynamic_buffer_reset(&buffer);
+ lttng_payload_reset(&payload);
return ret;
}
{
int ret;
struct lttcomm_session_msg lsm;
- struct lttng_dynamic_buffer buffer;
+ struct lttng_payload payload;
- lttng_dynamic_buffer_init(&buffer);
+ lttng_payload_init(&payload);
if (!trigger) {
ret = -LTTNG_ERR_INVALID;
goto end;
goto end;
}
- ret = lttng_trigger_serialize(trigger, &buffer);
+ ret = lttng_trigger_serialize(trigger, &payload);
if (ret < 0) {
ret = -LTTNG_ERR_UNK;
goto end;
memset(&lsm, 0, sizeof(lsm));
lsm.cmd_type = LTTNG_UNREGISTER_TRIGGER;
- lsm.u.trigger.length = (uint32_t) buffer.size;
- ret = lttng_ctl_ask_sessiond_varlen_no_cmd_header(&lsm, buffer.data,
- buffer.size, NULL);
+ lsm.u.trigger.length = (uint32_t) payload.buffer.size;
+ ret = lttng_ctl_ask_sessiond_varlen_no_cmd_header(
+ &lsm, payload.buffer.data, payload.buffer.size, NULL);
end:
- lttng_dynamic_buffer_reset(&buffer);
+ lttng_payload_reset(&payload);
return ret;
}
libpause_consumer_la_SOURCES = consumer_testpoints.c
libpause_consumer_la_LIBADD = \
+ $(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la \
$(top_builddir)/src/common/libcommon.la \
$(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la \
$(DL_LIBS)
ini_config/test_ini_config \
test_fd_tracker \
test_uuid \
- test_buffer_view
+ test_buffer_view \
+ test_payload
LIBTAP=$(top_builddir)/tests/utils/tap/libtap.la
test_string_utils test_notification test_directory_handle \
test_relayd_backward_compat_group_by_session \
test_fd_tracker test_uuid \
- test_buffer_view
+ test_buffer_view \
+ test_payload
if HAVE_LIBLTTNG_UST_CTL
noinst_PROGRAMS += test_ust_data
# buffer view unit test
test_buffer_view_SOURCES = test_buffer_view.c
test_buffer_view_LDADD = $(LIBTAP) $(LIBCOMMON)
+
+# payload unit test
+test_payload_SOURCES = test_payload.c
+test_payload_LDADD = $(LIBTAP) $(LIBSESSIOND_COMM) $(LIBCOMMON)
--- /dev/null
+/*
+ * Copyright (C) 2020 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * SPDX-License-Identifier: LGPL-2.1-only
+ *
+ */
+
+#include <common/sessiond-comm/payload.h>
+#include <common/sessiond-comm/payload-view.h>
+#include <tap/tap.h>
+
+static const int TEST_COUNT = 5;
+
+/* For error.h */
+int lttng_opt_quiet = 1;
+int lttng_opt_verbose;
+int lttng_opt_mi;
+
+static void test_fd_push_pop_order(void)
+{
+ int ret, i;
+ struct lttng_payload payload;
+
+ lttng_payload_init(&payload);
+
+ diag("Validating fd push/pop order");
+ for (i = 0; i < 3; i++) {
+ ret = lttng_payload_push_fd(&payload, i);
+ if (ret) {
+ break;
+ }
+ }
+ ok(ret == 0, "Added three file descriptors to an lttng_payload");
+
+ {
+ bool fail_pop = false;
+ struct lttng_payload_view view =
+ lttng_payload_view_from_payload(
+ &payload, 0, -1);
+
+ for (i = 0; i < 3; i++) {
+ ret = lttng_payload_view_pop_fd(&view);
+ fail_pop |= ret != i;
+ }
+
+ ok(!fail_pop, "File descriptors are popped from a payload view in the order of insertion");
+ }
+
+ lttng_payload_reset(&payload);
+}
+
+static void test_fd_push_pop_imbalance(void)
+{
+ int ret, i;
+ struct lttng_payload payload;
+ const char * const test_description = "Error reported when popping more file descriptors than were pushed";
+
+ lttng_payload_init(&payload);
+
+ diag("Validating fd pop imbalance");
+ for (i = 0; i < 10; i++) {
+ ret = lttng_payload_push_fd(&payload, i);
+ if (ret) {
+ break;
+ }
+ }
+
+ {
+ struct lttng_payload_view view =
+ lttng_payload_view_from_payload(
+ &payload, 0, -1);
+
+ for (i = 0; i < 10; i++) {
+ ret = lttng_payload_view_pop_fd(&view);
+ if (ret == -1) {
+ goto fail;
+ }
+ }
+
+ ret = lttng_payload_view_pop_fd(&view);
+ ok(ret == -1, test_description);
+ }
+
+ lttng_payload_reset(&payload);
+ return;
+fail:
+ fail(test_description);
+ lttng_payload_reset(&payload);
+}
+
+static void test_fd_pop_fd_root_views(void)
+{
+ int ret, i;
+ const int fd = 42;
+ struct lttng_payload payload;
+ const char * const test_description = "Same file descriptor returned when popping from different top-level views";
+
+ lttng_payload_init(&payload);
+
+ diag("Validating root view fd pop behaviour");
+ ret = lttng_payload_push_fd(&payload, fd);
+ if (ret) {
+ goto fail;
+ }
+
+ for (i = 0; i < 5; i++) {
+ struct lttng_payload_view view =
+ lttng_payload_view_from_payload(
+ &payload, 0, -1);
+
+ ret = lttng_payload_view_pop_fd(&view);
+ if (ret != fd) {
+ goto fail;
+ }
+ }
+
+ lttng_payload_reset(&payload);
+ pass(test_description);
+ return;
+fail:
+ lttng_payload_reset(&payload);
+ fail(test_description);
+}
+
+static void test_fd_pop_fd_descendant_views(void)
+{
+ int ret;
+ const int fd1 = 42, fd2 = 1837;
+ struct lttng_payload payload;
+ const char * const test_description = "Different file descriptors returned when popping from descendant views";
+
+ lttng_payload_init(&payload);
+
+ diag("Validating descendant view fd pop behaviour");
+ ret = lttng_payload_push_fd(&payload, fd1);
+ if (ret) {
+ goto fail;
+ }
+
+ ret = lttng_payload_push_fd(&payload, fd2);
+ if (ret) {
+ goto fail;
+ }
+
+ {
+ struct lttng_payload_view view1 =
+ lttng_payload_view_from_payload(
+ &payload, 0, -1);
+ struct lttng_payload_view view2 =
+ lttng_payload_view_from_view(
+ &view1, 0, -1);
+
+ ret = lttng_payload_view_pop_fd(&view1);
+ if (ret != fd1) {
+ goto fail;
+ }
+
+ ret = lttng_payload_view_pop_fd(&view2);
+ if (ret != fd2) {
+ goto fail;
+ }
+ }
+
+ lttng_payload_reset(&payload);
+ pass(test_description);
+ return;
+fail:
+ lttng_payload_reset(&payload);
+ fail(test_description);
+}
+
+int main(void)
+{
+ plan_tests(TEST_COUNT);
+
+ test_fd_push_pop_order();
+ test_fd_push_pop_imbalance();
+ test_fd_pop_fd_root_views();
+ test_fd_pop_fd_descendant_views();
+
+ return exit_status();
+}
projects / lttng-tools.git / commitdiff
