projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Always evaluate BT_ASSERT(); add BT_ASSERT_DBG() for debug mode only
[babeltrace.git]
/
src
/
lib
/
graph
/
message
/
stream.c
diff --git
a/src/lib/graph/message/stream.c
b/src/lib/graph/message/stream.c
index ecab2c29a5acd9fd520c77e362e680e7e4a4f140..a110338aa1b5b42bfe1d0bf1d1816b70d6efa29b 100644
(file)
--- a/
src/lib/graph/message/stream.c
+++ b/
src/lib/graph/message/stream.c
@@
-45,6
+45,14
@@
void destroy_stream_message(struct bt_object *obj)
struct bt_message_stream *message = (void *) obj;
BT_LIB_LOGD("Destroying stream message: %!+n", message);
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);
BT_LIB_LOGD("Putting stream: %!+s", message->stream);
BT_OBJECT_PUT_REF_AND_RESET(message->stream);
g_free(message);
@@
-75,7
+83,7
@@
struct bt_message *create_stream_message(
bt_message_init(&message->parent, type,
destroy_stream_message, NULL);
message->stream = stream;
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(
if (stream_class->default_clock_class) {
message->default_cs = bt_clock_snapshot_create(
@@
-122,7
+130,7
@@
struct bt_stream *borrow_stream_message_stream(struct bt_message *message)
{
struct bt_message_stream *stream_msg;
{
struct bt_message_stream *stream_msg;
- BT_ASSERT(message);
+ BT_ASSERT
_DBG
(message);
stream_msg = (void *) message;
return stream_msg->stream;
}
stream_msg = (void *) message;
return stream_msg->stream;
}
@@
-130,16
+138,18
@@
struct bt_stream *borrow_stream_message_stream(struct bt_message *message)
struct bt_stream *bt_message_stream_beginning_borrow_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_NON_NULL(message, "Message");
+ BT_ASSERT_PRE_DEV_MSG_IS_TYPE(message,
+ BT_MESSAGE_TYPE_STREAM_BEGINNING);
return borrow_stream_message_stream(message);
}
struct bt_stream *bt_message_stream_end_borrow_stream(
struct bt_message *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_NON_NULL(message, "Message");
+ BT_ASSERT_PRE_DEV_MSG_IS_TYPE(message,
+ BT_MESSAGE_TYPE_STREAM_END);
return borrow_stream_message_stream(message);
}
return borrow_stream_message_stream(message);
}
@@
-165,7
+175,7
@@
void bt_message_stream_set_default_clock_snapshot(
struct bt_stream_class *sc;
BT_ASSERT(msg);
struct bt_stream_class *sc;
BT_ASSERT(msg);
- BT_ASSERT_PRE_HOT(msg, "Message", ": %!+n", msg);
+ BT_ASSERT_PRE_
DEV_
HOT(msg, "Message", ": %!+n", msg);
sc = stream_msg->stream->class;
BT_ASSERT(sc);
BT_ASSERT_PRE(sc->default_clock_class,
sc = stream_msg->stream->class;
BT_ASSERT(sc);
BT_ASSERT_PRE(sc->default_clock_class,
@@
-203,13
+213,13
@@
bt_message_stream_borrow_default_clock_snapshot_const(
struct bt_message_stream *stream_msg = (void *) msg;
struct bt_stream_class *sc;
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;
sc = stream_msg->stream->class;
- BT_ASSERT(sc);
- BT_ASSERT_PRE(sc->default_clock_class,
+ BT_ASSERT
_DBG
(sc);
+ BT_ASSERT_PRE
_DEV
(sc->default_clock_class,
"Message's stream's class has no default clock class: "
"%![msg-]+n, %![sc-]+S", msg, sc);
"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
(stream_msg->default_cs);
*snapshot = stream_msg->default_cs;
*snapshot = stream_msg->default_cs;
@@
-220,9
+230,9
@@
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_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);
-
+ BT_ASSERT_PRE_
DEV_
NON_NULL(message, "Message");
+ BT_ASSERT_PRE_
DEV_MSG_IS_TYPE(message,
+ BT_MESSAGE_TYPE_STREAM_BEGINNING);
return bt_message_stream_borrow_default_clock_snapshot_const(
message, snapshot);
}
return bt_message_stream_borrow_default_clock_snapshot_const(
message, snapshot);
}
@@
-231,9
+241,8
@@
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_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);
-
+ BT_ASSERT_PRE_DEV_NON_NULL(message, "Message");
+ BT_ASSERT_PRE_DEV_MSG_IS_TYPE(message, BT_MESSAGE_TYPE_STREAM_END);
return bt_message_stream_borrow_default_clock_snapshot_const(
message, snapshot);
}
return bt_message_stream_borrow_default_clock_snapshot_const(
message, snapshot);
}
@@
-245,7
+254,7
@@
borrow_stream_message_stream_class_default_clock_class(
{
struct bt_message_stream *stream_msg = (void *) msg;
{
struct bt_message_stream *stream_msg = (void *) msg;
- BT_ASSERT(msg);
+ BT_ASSERT
_DBG
(msg);
return stream_msg->stream->class->default_clock_class;
}
return stream_msg->stream->class->default_clock_class;
}
@@
-253,8
+262,8
@@
const struct bt_clock_class *
bt_message_stream_beginning_borrow_stream_class_default_clock_class_const(
const struct bt_message *msg)
{
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_ASSERT_PRE_
DEV_
NON_NULL(msg, "Message");
+ BT_ASSERT_PRE_
DEV_
MSG_IS_TYPE(msg,
BT_MESSAGE_TYPE_STREAM_BEGINNING);
return borrow_stream_message_stream_class_default_clock_class(msg);
}
BT_MESSAGE_TYPE_STREAM_BEGINNING);
return borrow_stream_message_stream_class_default_clock_class(msg);
}
@@
-263,7
+272,7
@@
const struct bt_clock_class *
bt_message_stream_end_borrow_stream_class_default_clock_class_const(
const struct bt_message *msg)
{
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_
NON_NULL(msg, "Message");
+ BT_ASSERT_PRE_
DEV_
MSG_IS_TYPE(msg, BT_MESSAGE_TYPE_STREAM_END);
return borrow_stream_message_stream_class_default_clock_class(msg);
}
return borrow_stream_message_stream_class_default_clock_class(msg);
}
This page took
0.03057 seconds
and
4
git commands to generate.