X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fsession-descriptor.c;h=93c7dfa47795f5a5e31fe8d2a8b792c1e9298b52;hb=3afa94aeca5a0daae40fd7b6cc96b7e4c150c7d8;hp=b5fdb0677f8153d00e1c8517f16816e9e02dbb69;hpb=6fa5fe7cc78bea0b0bba154a0f911d3df530e18f;p=lttng-tools.git diff --git a/src/common/session-descriptor.c b/src/common/session-descriptor.c index b5fdb0677..93c7dfa47 100644 --- a/src/common/session-descriptor.c +++ b/src/common/session-descriptor.c @@ -1,18 +1,7 @@ /* - * Copyright (C) 2019 - Jérémie Galarneau + * Copyright (C) 2019 Jérémie Galarneau * - * 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. - * - * 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 + * SPDX-License-Identifier: GPL-2.0-only */ #include @@ -21,7 +10,6 @@ #include #include #include -#include #include struct lttng_session_descriptor_network_location { @@ -522,6 +510,10 @@ _lttng_session_descriptor_live_network_create( descriptor = _lttng_session_descriptor_live_create(name, live_timer_interval_us); + if (!descriptor) { + goto error; + } + descriptor->base.output_type = LTTNG_SESSION_DESCRIPTOR_OUTPUT_TYPE_NETWORK; @@ -550,14 +542,8 @@ lttng_session_descriptor_live_create( struct lttng_session_descriptor_live *descriptor; descriptor = _lttng_session_descriptor_live_create(name, live_timer_us); - if (!descriptor) { - goto error; - } return descriptor ? &descriptor->base : NULL; -error: - lttng_session_descriptor_destroy(descriptor ? &descriptor->base : NULL); - return NULL; } struct lttng_session_descriptor * @@ -611,7 +597,6 @@ void lttng_session_descriptor_destroy( free(descriptor); } -LTTNG_HIDDEN ssize_t lttng_session_descriptor_create_from_buffer( const struct lttng_buffer_view *payload, struct lttng_session_descriptor **descriptor) @@ -629,12 +614,12 @@ ssize_t lttng_session_descriptor_create_from_buffer( current_view = lttng_buffer_view_from_view(payload, offset, sizeof(*base_header)); - base_header = (typeof(base_header)) current_view.data; - if (!base_header) { + if (!lttng_buffer_view_is_valid(¤t_view)) { ret = -1; goto end; } + base_header = (typeof(base_header)) current_view.data; switch (base_header->type) { case LTTNG_SESSION_DESCRIPTOR_TYPE_REGULAR: case LTTNG_SESSION_DESCRIPTOR_TYPE_SNAPSHOT: @@ -645,12 +630,12 @@ ssize_t lttng_session_descriptor_create_from_buffer( current_view = lttng_buffer_view_from_view(payload, offset, sizeof(*live_header)); - live_header = (typeof(live_header)) current_view.data; - if (!live_header) { + if (!lttng_buffer_view_is_valid(¤t_view)) { ret = -1; goto end; } + live_header = (typeof(live_header)) current_view.data; live_timer_us = live_header->live_timer_us; break; } @@ -687,12 +672,12 @@ ssize_t lttng_session_descriptor_create_from_buffer( /* Map the name. */ current_view = lttng_buffer_view_from_view(payload, offset, base_header->name_len); - name = current_view.data; - if (!name) { + if (!lttng_buffer_view_is_valid(¤t_view)) { ret = -1; goto end; } + name = current_view.data; if (base_header->name_len == 1 || name[base_header->name_len - 1] || strlen(name) != base_header->name_len - 1) { @@ -718,11 +703,12 @@ skip_name: /* Map a URI. */ current_view = lttng_buffer_view_from_view(payload, offset, sizeof(*uri)); - uri = (typeof(uri)) current_view.data; - if (!uri) { + if (!lttng_buffer_view_is_valid(¤t_view)) { ret = -1; goto end; } + + uri = (typeof(uri)) current_view.data; uris[i] = zmalloc(sizeof(*uri)); if (!uris[i]) { ret = -1; @@ -815,7 +801,6 @@ end: return ret; } -LTTNG_HIDDEN int lttng_session_descriptor_serialize( const struct lttng_session_descriptor *descriptor, struct lttng_dynamic_buffer *buffer) @@ -888,7 +873,6 @@ end: return ret; } -LTTNG_HIDDEN enum lttng_session_descriptor_type lttng_session_descriptor_get_type( const struct lttng_session_descriptor *descriptor) @@ -896,7 +880,6 @@ lttng_session_descriptor_get_type( return descriptor->type; } -LTTNG_HIDDEN enum lttng_session_descriptor_output_type lttng_session_descriptor_get_output_type( const struct lttng_session_descriptor *descriptor) @@ -904,7 +887,6 @@ lttng_session_descriptor_get_output_type( return descriptor->output_type; } -LTTNG_HIDDEN void lttng_session_descriptor_get_local_output_uri( const struct lttng_session_descriptor *descriptor, struct lttng_uri *local_uri) @@ -912,7 +894,6 @@ void lttng_session_descriptor_get_local_output_uri( memcpy(local_uri, descriptor->output.local, sizeof(*local_uri)); } -LTTNG_HIDDEN void lttng_session_descriptor_get_network_output_uris( const struct lttng_session_descriptor *descriptor, struct lttng_uri *control, @@ -922,7 +903,6 @@ void lttng_session_descriptor_get_network_output_uris( memcpy(data, descriptor->output.network.data, sizeof(*data)); } -LTTNG_HIDDEN unsigned long long lttng_session_descriptor_live_get_timer_interval( const struct lttng_session_descriptor *descriptor) @@ -953,7 +933,6 @@ end: return status; } -LTTNG_HIDDEN int lttng_session_descriptor_set_session_name( struct lttng_session_descriptor *descriptor, const char *name) @@ -979,7 +958,6 @@ end: return ret; } -LTTNG_HIDDEN bool lttng_session_descriptor_is_output_destination_initialized( const struct lttng_session_descriptor *descriptor) { @@ -995,7 +973,6 @@ bool lttng_session_descriptor_is_output_destination_initialized( } } -LTTNG_HIDDEN bool lttng_session_descriptor_has_output_directory( const struct lttng_session_descriptor *descriptor) { @@ -1018,7 +995,6 @@ bool lttng_session_descriptor_has_output_directory( return false; } -LTTNG_HIDDEN enum lttng_error_code lttng_session_descriptor_set_default_output( struct lttng_session_descriptor *descriptor, time_t *session_creation_time, @@ -1055,7 +1031,7 @@ enum lttng_error_code lttng_session_descriptor_set_default_output( goto end; } } - assert(descriptor->name); + LTTNG_ASSERT(descriptor->name); ret = snprintf(local_uri, sizeof(local_uri), "file://%s/%s/%s%s", absolute_home_path, @@ -1125,7 +1101,6 @@ end: * Note that only properties that can be populated by the session daemon * (output destination and name) are assigned. */ -LTTNG_HIDDEN int lttng_session_descriptor_assign( struct lttng_session_descriptor *dst, const struct lttng_session_descriptor *src) @@ -1178,22 +1153,3 @@ int lttng_session_descriptor_assign( end: return ret; } - -LTTNG_HIDDEN -int lttng_session_descriptor_get_base_path(struct lttng_session_descriptor *dst, - const char **_base_path) -{ - switch (dst->output_type) { - case LTTNG_SESSION_DESCRIPTOR_OUTPUT_TYPE_NETWORK: - { - *_base_path = dst->output.network.control->subdir[0] ? - dst->output.network.control->subdir : NULL; - break; - } - case LTTNG_SESSION_DESCRIPTOR_OUTPUT_TYPE_LOCAL: - case LTTNG_SESSION_DESCRIPTOR_OUTPUT_TYPE_NONE: - *_base_path = NULL; - break; - } - return 0; -}