/*
+ * SPDX-License-Identifier: MIT
+ *
* Copyright 2017-2018 Philippe Proulx <pproulx@efficios.com>
* Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
*/
#define BT_LOG_TAG "LIB/MSG-PACKET"
#include "lib/logging.h"
-#include "lib/assert-pre.h"
-#include "lib/assert-post.h"
+#include <stdbool.h>
+
+#include "lib/assert-cond.h"
#include "compat/compiler.h"
#include <babeltrace2/trace-ir/packet.h>
#include "lib/trace-ir/packet.h"
#include "lib/trace-ir/stream.h"
#include "lib/trace-ir/stream-class.h"
#include "lib/graph/graph.h"
-#include <babeltrace2/graph/message-packet-beginning-const.h>
-#include <babeltrace2/graph/message-packet-end-const.h>
-#include <babeltrace2/graph/message-packet-beginning.h>
-#include <babeltrace2/graph/message-packet-end.h>
+#include <babeltrace2/graph/message.h>
#include "common/assert.h"
#include "lib/object.h"
#include <inttypes.h>
static inline
struct bt_message *create_packet_message(
- struct bt_self_component_port_input_message_iterator *msg_iter,
+ struct bt_message_iterator *msg_iter,
struct bt_packet *packet, struct bt_object_pool *pool,
bool with_cs, uint64_t raw_value)
{
message->default_cs = bt_clock_snapshot_create(
stream_class->default_clock_class);
if (!message->default_cs) {
- bt_object_put_no_null_check(message);
+ bt_object_put_ref_no_null_check(message);
message = NULL;
goto end;
}
BT_ASSERT(!message->packet);
message->packet = packet;
- bt_object_get_no_null_check_no_parent_check(
+ bt_object_get_ref_no_null_check_no_parent_check(
&message->packet->base);
bt_packet_set_is_frozen(packet, true);
BT_LIB_LOGD("Created packet message object: "
struct bt_self_message_iterator *self_msg_iter,
const struct bt_packet *packet)
{
- struct bt_self_component_port_input_message_iterator *msg_iter =
+ struct bt_message_iterator *msg_iter =
(void *) self_msg_iter;
+ BT_ASSERT_PRE_DEV_NO_ERROR();
BT_ASSERT_PRE_NON_NULL(msg_iter, "Message iterator");
return create_packet_message(msg_iter, (void *) packet,
&msg_iter->graph->packet_begin_msg_pool, false, 0);
struct bt_self_message_iterator *self_msg_iter,
const struct bt_packet *packet, uint64_t raw_value)
{
- struct bt_self_component_port_input_message_iterator *msg_iter =
+ struct bt_message_iterator *msg_iter =
(void *) self_msg_iter;
+ BT_ASSERT_PRE_DEV_NO_ERROR();
BT_ASSERT_PRE_NON_NULL(msg_iter, "Message iterator");
return create_packet_message(msg_iter, (void *) packet,
&msg_iter->graph->packet_begin_msg_pool, true, raw_value);
struct bt_self_message_iterator *self_msg_iter,
const struct bt_packet *packet)
{
- struct bt_self_component_port_input_message_iterator *msg_iter =
+ struct bt_message_iterator *msg_iter =
(void *) self_msg_iter;
+ BT_ASSERT_PRE_DEV_NO_ERROR();
BT_ASSERT_PRE_NON_NULL(msg_iter, "Message iterator");
return create_packet_message(msg_iter, (void *) packet,
&msg_iter->graph->packet_end_msg_pool, false, 0);
struct bt_self_message_iterator *self_msg_iter,
const struct bt_packet *packet, uint64_t raw_value)
{
- struct bt_self_component_port_input_message_iterator *msg_iter =
+ struct bt_message_iterator *msg_iter =
(void *) self_msg_iter;
+ BT_ASSERT_PRE_DEV_NO_ERROR();
BT_ASSERT_PRE_NON_NULL(msg_iter, "Message iterator");
return create_packet_message(msg_iter, (void *) packet,
&msg_iter->graph->packet_end_msg_pool, true, raw_value);
BT_LIB_LOGD("Recycling packet message: %!+n", msg);
bt_message_reset(msg);
- bt_object_put_no_null_check(&packet_msg->packet->base);
+ bt_object_put_ref_no_null_check(&packet_msg->packet->base);
if (packet_msg->default_cs) {
bt_clock_snapshot_recycle(packet_msg->default_cs);
struct bt_message_packet *packet_msg = (void *) message;
BT_ASSERT_PRE_DEV_NON_NULL(message, "Message");
- BT_ASSERT_PRE_DEV_MSG_IS_TYPE(message,
+ BT_ASSERT_PRE_DEV_MSG_HAS_TYPE(message,
BT_MESSAGE_TYPE_PACKET_BEGINNING);
return packet_msg->packet;
}
struct bt_message_packet *packet_msg = (void *) message;
BT_ASSERT_PRE_DEV_NON_NULL(message, "Message");
- BT_ASSERT_PRE_DEV_MSG_IS_TYPE(message,
+ BT_ASSERT_PRE_DEV_MSG_HAS_TYPE(message,
BT_MESSAGE_TYPE_PACKET_END);
return packet_msg->packet;
}
{
struct bt_message_packet *packet_msg = (void *) message;
- BT_ASSERT(message);
+ BT_ASSERT_DBG(message);
BT_ASSERT_PRE_DEV(
packet_msg->packet->stream->class->default_clock_class,
"Message's stream's class has no default clock class: "
const struct bt_message *msg)
{
BT_ASSERT_PRE_DEV_NON_NULL(msg, "Message");
- BT_ASSERT_PRE_DEV_MSG_IS_TYPE(msg, BT_MESSAGE_TYPE_PACKET_BEGINNING);
+ BT_ASSERT_PRE_DEV_MSG_HAS_TYPE(msg, BT_MESSAGE_TYPE_PACKET_BEGINNING);
return borrow_packet_message_default_clock_snapshot_const(msg);
}
const struct bt_message *msg)
{
BT_ASSERT_PRE_DEV_NON_NULL(msg, "Message");
- BT_ASSERT_PRE_DEV_MSG_IS_TYPE(msg, BT_MESSAGE_TYPE_PACKET_END);
+ BT_ASSERT_PRE_DEV_MSG_HAS_TYPE(msg, BT_MESSAGE_TYPE_PACKET_END);
return borrow_packet_message_default_clock_snapshot_const(msg);
}
{
struct bt_message_packet *packet_msg = (void *) msg;
- BT_ASSERT(msg);
+ BT_ASSERT_DBG(msg);
return packet_msg->packet->stream->class->default_clock_class;
}
const struct bt_message *msg)
{
BT_ASSERT_PRE_DEV_NON_NULL(msg, "Message");
- BT_ASSERT_PRE_DEV_MSG_IS_TYPE(msg, BT_MESSAGE_TYPE_PACKET_BEGINNING);
+ BT_ASSERT_PRE_DEV_MSG_HAS_TYPE(msg, BT_MESSAGE_TYPE_PACKET_BEGINNING);
return borrow_packet_message_stream_class_default_clock_class(msg);
}
const struct bt_message *msg)
{
BT_ASSERT_PRE_DEV_NON_NULL(msg, "Message");
- BT_ASSERT_PRE_DEV_MSG_IS_TYPE(msg, BT_MESSAGE_TYPE_PACKET_END);
+ BT_ASSERT_PRE_DEV_MSG_HAS_TYPE(msg, BT_MESSAGE_TYPE_PACKET_END);
return borrow_packet_message_stream_class_default_clock_class(msg);
}
projects / babeltrace.git / blobdiff