From 1e9f1cf8e478f969082e4719693b85523efbaca2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Fri, 17 Aug 2018 13:25:21 -0400 Subject: [PATCH] Add trace archive location serialization/deserialization methods MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérémie Galarneau --- include/lttng/location-internal.h | 47 ++++++++++ src/common/location.c | 149 ++++++++++++++++++++++++++++++ 2 files changed, 196 insertions(+) diff --git a/include/lttng/location-internal.h b/include/lttng/location-internal.h index dc7137337..568040da8 100644 --- a/include/lttng/location-internal.h +++ b/include/lttng/location-internal.h @@ -19,6 +19,8 @@ #define LTTNG_LOCATION_INTERNAL_H #include +#include +#include #include struct lttng_trace_archive_location { @@ -38,6 +40,41 @@ struct lttng_trace_archive_location { } types; }; +struct lttng_trace_archive_location_comm { + /* A value from enum lttng_trace_archive_location_type */ + int8_t type; + union { + struct { + /* Includes the trailing \0. */ + uint32_t absolute_path_len; + } LTTNG_PACKED local; + struct { + /* Includes the trailing \0. */ + uint32_t hostname_len; + /* + * A value from + * enum lttng_trace_archive_location_relay_protocol_type. + */ + int8_t protocol; + struct { + uint16_t control, data; + } ports; + /* Includes the trailing \0. */ + uint32_t relative_path_len; + } LTTNG_PACKED relay; + } LTTNG_PACKED types; + /* + * Payload is composed of: + * - LTTNG_TRACE_ARCHIVE_LOCATION_TYPE_LOCAL + * - absolute path, including \0 + * - LTTNG_TRACE_ARCHIVE_LOCATION_TYPE_RELAY + * - hostname, including \0 + * - relative path, including \0 + */ + char payload[]; +} LTTNG_PACKED; + + LTTNG_HIDDEN struct lttng_trace_archive_location *lttng_trace_archive_location_local_create( const char *path); @@ -49,6 +86,16 @@ struct lttng_trace_archive_location *lttng_trace_archive_location_relay_create( uint16_t control_port, uint16_t data_port, const char *relative_path); +LTTNG_HIDDEN +ssize_t lttng_trace_archive_location_create_from_buffer( + const struct lttng_buffer_view *buffer, + struct lttng_trace_archive_location **location); + +LTTNG_HIDDEN +ssize_t lttng_trace_archive_location_serialize( + const struct lttng_trace_archive_location *location, + struct lttng_dynamic_buffer *buffer); + LTTNG_HIDDEN void lttng_trace_archive_location_destroy( struct lttng_trace_archive_location *location); diff --git a/src/common/location.c b/src/common/location.c index d1fd538f2..0482c443d 100644 --- a/src/common/location.c +++ b/src/common/location.c @@ -124,6 +124,155 @@ error: return NULL; } +LTTNG_HIDDEN +ssize_t lttng_trace_archive_location_create_from_buffer( + const struct lttng_buffer_view *view, + struct lttng_trace_archive_location **location) +{ + size_t offset = 0; + const struct lttng_trace_archive_location_comm *location_comm; + struct lttng_buffer_view location_comm_view; + + location_comm_view = lttng_buffer_view_from_view(view, 0, + sizeof(*location_comm)); + if (!location_comm_view.data) { + goto error; + } + offset += location_comm_view.size; + location_comm = (const struct lttng_trace_archive_location_comm *) view->data; + + switch ((enum lttng_trace_archive_location_type) location_comm->type) { + case LTTNG_TRACE_ARCHIVE_LOCATION_TYPE_LOCAL: + { + const struct lttng_buffer_view absolute_path_view = + lttng_buffer_view_from_view(view, offset, + location_comm->types.local.absolute_path_len); + + if (!absolute_path_view.data) { + goto error; + } + if (absolute_path_view.data[absolute_path_view.size - 1] != '\0') { + goto error; + } + offset += absolute_path_view.size; + + *location = lttng_trace_archive_location_local_create( + absolute_path_view.data); + if (!*location) { + goto error; + } + break; + } + case LTTNG_TRACE_ARCHIVE_LOCATION_TYPE_RELAY: + { + const struct lttng_buffer_view hostname_view = + lttng_buffer_view_from_view(view, offset, + location_comm->types.relay.hostname_len); + const struct lttng_buffer_view relative_path_view = + lttng_buffer_view_from_view(view, + offset + hostname_view.size, + location_comm->types.relay.relative_path_len); + + if (!hostname_view.data || !relative_path_view.data) { + goto error; + } + if (hostname_view.data[hostname_view.size - 1] != '\0') { + goto error; + } + if (relative_path_view.data[relative_path_view.size - 1] != '\0') { + goto error; + } + offset += hostname_view.size + relative_path_view.size; + + *location = lttng_trace_archive_location_relay_create( + hostname_view.data, + (enum lttng_trace_archive_location_relay_protocol_type) location_comm->types.relay.protocol, + location_comm->types.relay.ports.control, + location_comm->types.relay.ports.data, + relative_path_view.data); + if (!*location) { + goto error; + } + break; + } + default: + goto error; + } + +error: + return -1; +} + +LTTNG_HIDDEN +ssize_t lttng_trace_archive_location_serialize( + const struct lttng_trace_archive_location *location, + struct lttng_dynamic_buffer *buffer) +{ + int ret; + struct lttng_trace_archive_location_comm location_comm; + const size_t original_buffer_size = buffer->size; + + location_comm.type = (int8_t) location->type; + + switch (location->type) { + case LTTNG_TRACE_ARCHIVE_LOCATION_TYPE_LOCAL: + location_comm.types.local.absolute_path_len = + strlen(location->types.local.absolute_path) + 1; + break; + case LTTNG_TRACE_ARCHIVE_LOCATION_TYPE_RELAY: + location_comm.types.relay.hostname_len = + strlen(location->types.relay.host) + 1; + location_comm.types.relay.protocol = + (int8_t) location->types.relay.protocol; + location_comm.types.relay.ports.control = + location->types.relay.ports.control; + location_comm.types.relay.ports.data = + location->types.relay.ports.data; + location_comm.types.relay.relative_path_len = + strlen(location->types.relay.relative_path) + 1; + break; + default: + abort(); + } + + ret = lttng_dynamic_buffer_append(buffer, &location_comm, + sizeof(location_comm)); + if (ret) { + goto error; + } + + switch (location->type) { + case LTTNG_TRACE_ARCHIVE_LOCATION_TYPE_LOCAL: + ret = lttng_dynamic_buffer_append(buffer, + location->types.local.absolute_path, + location_comm.types.local.absolute_path_len); + if (ret) { + goto error; + } + break; + case LTTNG_TRACE_ARCHIVE_LOCATION_TYPE_RELAY: + ret = lttng_dynamic_buffer_append(buffer, + location->types.relay.host, + location_comm.types.relay.hostname_len); + if (ret) { + goto error; + } + ret = lttng_dynamic_buffer_append(buffer, + location->types.relay.relative_path, + location_comm.types.relay.relative_path_len); + if (ret) { + goto error; + } + break; + default: + abort(); + } + + return buffer->size - original_buffer_size; +error: + return -1; +} + enum lttng_trace_archive_location_type lttng_trace_archive_location_get_type( const struct lttng_trace_archive_location *location) { -- 2.34.1