X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Ftrigger.c;h=ead0fc259a0eb09af3211df7038aeda00fb28f72;hp=1de1b3b490328c05dc4d7e1f5bc2acc4d88ba692;hb=3da864a94ccc39239fea82c4803b58b6b56a1003;hpb=3647288fe42b25340f905046f3bd9aef21e12aaa diff --git a/src/common/trigger.c b/src/common/trigger.c index 1de1b3b49..ead0fc259 100644 --- a/src/common/trigger.c +++ b/src/common/trigger.c @@ -1,24 +1,18 @@ /* - * Copyright (C) 2017 - Jérémie Galarneau + * Copyright (C) 2017 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. + * 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 #include #include +#include +#include +#include #include +#include #include LTTNG_HIDDEN @@ -54,6 +48,7 @@ struct lttng_trigger *lttng_trigger_create( trigger->condition = condition; trigger->action = action; + end: return trigger; } @@ -64,12 +59,26 @@ struct lttng_condition *lttng_trigger_get_condition( return trigger ? trigger->condition : NULL; } +LTTNG_HIDDEN +const struct lttng_condition *lttng_trigger_get_const_condition( + const struct lttng_trigger *trigger) +{ + return trigger->condition; +} + struct lttng_action *lttng_trigger_get_action( struct lttng_trigger *trigger) { return trigger ? trigger->action : NULL; } +LTTNG_HIDDEN +const struct lttng_action *lttng_trigger_get_const_action( + const struct lttng_trigger *trigger) +{ + return trigger->action; +} + void lttng_trigger_destroy(struct lttng_trigger *trigger) { if (!trigger) { @@ -80,16 +89,14 @@ void lttng_trigger_destroy(struct lttng_trigger *trigger) } 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; @@ -97,23 +104,33 @@ ssize_t lttng_trigger_create_from_buffer( } /* 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; @@ -131,6 +148,7 @@ ssize_t lttng_trigger_create_from_buffer( ret = -1; goto error; } + ret = offset; end: return ret; @@ -146,34 +164,50 @@ error: */ 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; } + +LTTNG_HIDDEN +const struct lttng_credentials *lttng_trigger_get_credentials( + const struct lttng_trigger *trigger) +{ + return LTTNG_OPTIONAL_GET_PTR(trigger->creds); +} + +LTTNG_HIDDEN +void lttng_trigger_set_credentials( + struct lttng_trigger *trigger, + const struct lttng_credentials *creds) +{ + assert(creds); + LTTNG_OPTIONAL_SET(&trigger->creds, *creds); +}