X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Fgraph%2Fmessage%2Fstream.c;h=a3723e4ac8f485179284d0ed7c857d7604f66850;hb=1e123ed605bf4936226d675e6725691bff249f7f;hp=ecab2c29a5acd9fd520c77e362e680e7e4a4f140;hpb=188edac1113dbbb29030681dbde2de0ada742499;p=babeltrace.git diff --git a/src/lib/graph/message/stream.c b/src/lib/graph/message/stream.c index ecab2c29..a3723e4a 100644 --- a/src/lib/graph/message/stream.c +++ b/src/lib/graph/message/stream.c @@ -1,50 +1,47 @@ /* + * SPDX-License-Identifier: MIT + * * Copyright 2017-2018 Philippe Proulx * Copyright 2016 Jérémie Galarneau - * - * 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-STREAM" #include "lib/logging.h" -#include "lib/assert-pre.h" +#include "lib/assert-cond.h" #include "compat/compiler.h" -#include +#include #include "lib/trace-ir/stream.h" #include #include "lib/trace-ir/stream-class.h" -#include -#include -#include -#include +#include #include "common/assert.h" #include #include "stream.h" +#define BT_ASSERT_PRE_DEV_MSG_IS_STREAM_BEGINNING(_msg) \ + BT_ASSERT_PRE_DEV_MSG_HAS_TYPE("message", (_msg), \ + "stream-beginning", BT_MESSAGE_TYPE_STREAM_BEGINNING) + +#define BT_ASSERT_PRE_DEV_MSG_IS_STREAM_END(_msg) \ + BT_ASSERT_PRE_DEV_MSG_HAS_TYPE("message", (_msg), \ + "stream-end", BT_MESSAGE_TYPE_STREAM_END) + static void destroy_stream_message(struct bt_object *obj) { struct bt_message_stream *message = (void *) obj; BT_LIB_LOGD("Destroying stream message: %!+n", message); + + if (message->default_cs) { + BT_LIB_LOGD("Putting default clock snapshot: %!+k", + message->default_cs); + bt_clock_snapshot_destroy(message->default_cs); + message->default_cs = NULL; + } + BT_LIB_LOGD("Putting stream: %!+s", message->stream); BT_OBJECT_PUT_REF_AND_RESET(message->stream); g_free(message); @@ -53,18 +50,19 @@ void destroy_stream_message(struct bt_object *obj) static inline struct bt_message *create_stream_message( struct bt_self_message_iterator *self_msg_iter, - struct bt_stream *stream, enum bt_message_type type) + struct bt_stream *stream, enum bt_message_type type, + const char *api_func) { struct bt_message_stream *message; struct bt_stream_class *stream_class; - BT_ASSERT_PRE_NON_NULL(self_msg_iter, "Message iterator"); - BT_ASSERT_PRE_NON_NULL(stream, "Stream"); + BT_ASSERT_PRE_MSG_ITER_NON_NULL_FROM_FUNC(api_func, self_msg_iter); + BT_ASSERT_PRE_STREAM_NON_NULL_FROM_FUNC(api_func, stream); stream_class = bt_stream_borrow_class(stream); BT_ASSERT(stream_class); BT_LIB_LOGD("Creating stream message object: " "type=%s, %![stream-]+s, %![sc-]+S", - bt_message_type_string(type), stream, stream_class); + bt_common_message_type_string(type), stream, stream_class); message = g_new0(struct bt_message_stream, 1); if (!message) { BT_LIB_LOGE_APPEND_CAUSE( @@ -75,7 +73,7 @@ struct bt_message *create_stream_message( bt_message_init(&message->parent, type, destroy_stream_message, NULL); message->stream = stream; - bt_object_get_no_null_check(message->stream); + bt_object_get_ref_no_null_check(message->stream); if (stream_class->default_clock_class) { message->default_cs = bt_clock_snapshot_create( @@ -105,16 +103,20 @@ struct bt_message *bt_message_stream_beginning_create( struct bt_self_message_iterator *self_msg_iter, const struct bt_stream *stream) { + BT_ASSERT_PRE_DEV_NO_ERROR(); + return create_stream_message(self_msg_iter, (void *) stream, - BT_MESSAGE_TYPE_STREAM_BEGINNING); + BT_MESSAGE_TYPE_STREAM_BEGINNING, __func__); } struct bt_message *bt_message_stream_end_create( struct bt_self_message_iterator *self_msg_iter, const struct bt_stream *stream) { + BT_ASSERT_PRE_DEV_NO_ERROR(); + return create_stream_message(self_msg_iter, (void *) stream, - BT_MESSAGE_TYPE_STREAM_END); + BT_MESSAGE_TYPE_STREAM_END, __func__); } static inline @@ -122,7 +124,7 @@ struct bt_stream *borrow_stream_message_stream(struct bt_message *message) { struct bt_message_stream *stream_msg; - BT_ASSERT(message); + BT_ASSERT_DBG(message); stream_msg = (void *) message; return stream_msg->stream; } @@ -130,16 +132,16 @@ struct bt_stream *borrow_stream_message_stream(struct bt_message *message) struct bt_stream *bt_message_stream_beginning_borrow_stream( struct bt_message *message) { - BT_ASSERT_PRE_NON_NULL(message, "Message"); - BT_ASSERT_PRE_MSG_IS_TYPE(message, BT_MESSAGE_TYPE_STREAM_BEGINNING); + BT_ASSERT_PRE_DEV_MSG_NON_NULL(message); + BT_ASSERT_PRE_DEV_MSG_IS_STREAM_BEGINNING(message); return borrow_stream_message_stream(message); } struct bt_stream *bt_message_stream_end_borrow_stream( struct bt_message *message) { - BT_ASSERT_PRE_NON_NULL(message, "Message"); - BT_ASSERT_PRE_MSG_IS_TYPE(message, BT_MESSAGE_TYPE_STREAM_END); + BT_ASSERT_PRE_DEV_MSG_NON_NULL(message); + BT_ASSERT_PRE_DEV_MSG_IS_STREAM_END(message); return borrow_stream_message_stream(message); } @@ -158,19 +160,19 @@ const struct bt_stream *bt_message_stream_end_borrow_stream_const( } static -void bt_message_stream_set_default_clock_snapshot( - struct bt_message *msg, uint64_t raw_value) +void set_stream_default_clock_snapshot( + struct bt_message *msg, uint64_t raw_value, + const char *api_func) { struct bt_message_stream *stream_msg = (void *) msg; struct bt_stream_class *sc; BT_ASSERT(msg); - BT_ASSERT_PRE_HOT(msg, "Message", ": %!+n", msg); + BT_ASSERT_PRE_DEV_HOT_FROM_FUNC(api_func, "message", msg, + "Message", ": %!+n", msg); sc = stream_msg->stream->class; BT_ASSERT(sc); - BT_ASSERT_PRE(sc->default_clock_class, - "Message's stream's class has no default clock class: " - "%![msg-]+n, %![sc-]+S", msg, sc); + BT_ASSERT_PRE_MSG_SC_DEF_CLK_CLS_FROM_FUNC(api_func, msg, sc); BT_ASSERT(stream_msg->default_cs); bt_clock_snapshot_set_raw_value(stream_msg->default_cs, raw_value); stream_msg->default_cs_state = BT_MESSAGE_STREAM_CLOCK_SNAPSHOT_STATE_KNOWN; @@ -181,35 +183,32 @@ void bt_message_stream_set_default_clock_snapshot( void bt_message_stream_beginning_set_default_clock_snapshot( struct bt_message *message, uint64_t raw_value) { - BT_ASSERT_PRE_NON_NULL(message, "Message"); - BT_ASSERT_PRE_MSG_IS_TYPE(message, BT_MESSAGE_TYPE_STREAM_BEGINNING); - - bt_message_stream_set_default_clock_snapshot(message, raw_value); + BT_ASSERT_PRE_MSG_NON_NULL(message); + BT_ASSERT_PRE_DEV_MSG_IS_STREAM_BEGINNING(message); + set_stream_default_clock_snapshot(message, raw_value, __func__); } void bt_message_stream_end_set_default_clock_snapshot( struct bt_message *message, uint64_t raw_value) { - BT_ASSERT_PRE_NON_NULL(message, "Message"); - BT_ASSERT_PRE_MSG_IS_TYPE(message, BT_MESSAGE_TYPE_STREAM_END); - - return bt_message_stream_set_default_clock_snapshot(message, raw_value); + BT_ASSERT_PRE_MSG_NON_NULL(message); + BT_ASSERT_PRE_DEV_MSG_IS_STREAM_END(message); + return set_stream_default_clock_snapshot(message, raw_value, __func__); } static enum bt_message_stream_clock_snapshot_state -bt_message_stream_borrow_default_clock_snapshot_const( - const bt_message *msg, const bt_clock_snapshot **snapshot) +borrow_stream_message_default_clock_snapshot_const( + const bt_message *msg, const bt_clock_snapshot **snapshot, + const char *api_func) { struct bt_message_stream *stream_msg = (void *) msg; struct bt_stream_class *sc; - BT_ASSERT(msg); + BT_ASSERT_DBG(msg); sc = stream_msg->stream->class; - BT_ASSERT(sc); - BT_ASSERT_PRE(sc->default_clock_class, - "Message's stream's class has no default clock class: " - "%![msg-]+n, %![sc-]+S", msg, sc); - BT_ASSERT(stream_msg->default_cs); + BT_ASSERT_DBG(sc); + BT_ASSERT_PRE_DEV_MSG_SC_DEF_CLK_CLS_FROM_FUNC(api_func, msg, sc); + BT_ASSERT_DBG(stream_msg->default_cs); *snapshot = stream_msg->default_cs; @@ -220,22 +219,20 @@ enum bt_message_stream_clock_snapshot_state bt_message_stream_beginning_borrow_default_clock_snapshot_const( const bt_message *message, const bt_clock_snapshot **snapshot) { - BT_ASSERT_PRE_NON_NULL(message, "Message"); - BT_ASSERT_PRE_MSG_IS_TYPE(message, BT_MESSAGE_TYPE_STREAM_BEGINNING); - - return bt_message_stream_borrow_default_clock_snapshot_const( - message, snapshot); + BT_ASSERT_PRE_DEV_MSG_NON_NULL(message); + BT_ASSERT_PRE_DEV_MSG_IS_STREAM_BEGINNING(message); + return borrow_stream_message_default_clock_snapshot_const( + message, snapshot, __func__); } enum bt_message_stream_clock_snapshot_state bt_message_stream_end_borrow_default_clock_snapshot_const( const bt_message *message, const bt_clock_snapshot **snapshot) { - BT_ASSERT_PRE_NON_NULL(message, "Message"); - BT_ASSERT_PRE_MSG_IS_TYPE(message, BT_MESSAGE_TYPE_STREAM_END); - - return bt_message_stream_borrow_default_clock_snapshot_const( - message, snapshot); + BT_ASSERT_PRE_DEV_MSG_NON_NULL(message); + BT_ASSERT_PRE_DEV_MSG_IS_STREAM_END(message); + return borrow_stream_message_default_clock_snapshot_const( + message, snapshot, __func__); } static inline @@ -245,7 +242,7 @@ borrow_stream_message_stream_class_default_clock_class( { struct bt_message_stream *stream_msg = (void *) msg; - BT_ASSERT(msg); + BT_ASSERT_DBG(msg); return stream_msg->stream->class->default_clock_class; } @@ -253,9 +250,8 @@ const struct bt_clock_class * bt_message_stream_beginning_borrow_stream_class_default_clock_class_const( const struct bt_message *msg) { - BT_ASSERT_PRE_NON_NULL(msg, "Message"); - BT_ASSERT_PRE_MSG_IS_TYPE(msg, - BT_MESSAGE_TYPE_STREAM_BEGINNING); + BT_ASSERT_PRE_DEV_MSG_NON_NULL(msg); + BT_ASSERT_PRE_DEV_MSG_IS_STREAM_BEGINNING(msg); return borrow_stream_message_stream_class_default_clock_class(msg); } @@ -263,7 +259,7 @@ const struct bt_clock_class * bt_message_stream_end_borrow_stream_class_default_clock_class_const( const struct bt_message *msg) { - BT_ASSERT_PRE_NON_NULL(msg, "Message"); - BT_ASSERT_PRE_MSG_IS_TYPE(msg, BT_MESSAGE_TYPE_STREAM_END); + BT_ASSERT_PRE_DEV_MSG_NON_NULL(msg); + BT_ASSERT_PRE_DEV_MSG_IS_STREAM_END(msg); return borrow_stream_message_stream_class_default_clock_class(msg); }