#include <babeltrace/compiler-internal.h>
#include <babeltrace/ctf-ir/packet.h>
#include <babeltrace/ctf-ir/packet-internal.h>
+#include <babeltrace/ctf-ir/stream-class.h>
#include <babeltrace/ctf-ir/stream.h>
#include <babeltrace/ctf-ir/stream-internal.h>
#include <babeltrace/graph/notification-packet-internal.h>
+#include <babeltrace/assert-internal.h>
+#include <babeltrace/assert-pre-internal.h>
#include <inttypes.h>
static
}
struct bt_notification *bt_notification_packet_begin_create(
- struct bt_ctf_packet *packet)
+ struct bt_packet *packet)
{
struct bt_notification_packet_begin *notification;
- struct bt_ctf_stream *stream;
- struct bt_ctf_stream_class *stream_class;
-
- if (!packet) {
- BT_LOGW_STR("Invalid parameter: packet is NULL.");
- goto error;
- }
-
- stream = bt_ctf_packet_borrow_stream(packet);
- assert(stream);
- stream_class = bt_ctf_stream_borrow_stream_class(stream);
- assert(stream_class);
+ struct bt_stream *stream;
+ struct bt_stream_class *stream_class;
+
+ BT_ASSERT_PRE_NON_NULL(packet, "Packet");
+ stream = bt_packet_borrow_stream(packet);
+ BT_ASSERT(stream);
+ stream_class = bt_stream_borrow_class(stream);
+ BT_ASSERT(stream_class);
BT_LOGD("Creating packet beginning notification object: "
"packet-addr=%p, stream-addr=%p, stream-name=\"%s\", "
"stream-class-addr=%p, stream-class-name=\"%s\", "
"stream-class-id=%" PRId64,
- packet, stream, bt_ctf_stream_get_name(stream),
+ packet, stream, bt_stream_get_name(stream),
stream_class,
- bt_ctf_stream_class_get_name(stream_class),
- bt_ctf_stream_class_get_id(stream_class));
+ bt_stream_class_get_name(stream_class),
+ bt_stream_class_get_id(stream_class));
notification = g_new0(struct bt_notification_packet_begin, 1);
if (!notification) {
BT_LOGE_STR("Failed to allocate one packet beginning notification.");
"packet-addr=%p, stream-addr=%p, stream-name=\"%s\", "
"stream-class-addr=%p, stream-class-name=\"%s\", "
"stream-class-id=%" PRId64 ", addr=%p",
- packet, stream, bt_ctf_stream_get_name(stream),
+ packet, stream, bt_stream_get_name(stream),
stream_class,
- bt_ctf_stream_class_get_name(stream_class),
- bt_ctf_stream_class_get_id(stream_class), notification);
+ bt_stream_class_get_name(stream_class),
+ bt_stream_class_get_id(stream_class), notification);
return ¬ification->parent;
error:
return NULL;
}
-struct bt_ctf_packet *bt_notification_packet_begin_get_packet(
+struct bt_packet *bt_notification_packet_begin_get_packet(
struct bt_notification *notification)
{
- struct bt_ctf_packet *ret = NULL;
struct bt_notification_packet_begin *packet_begin;
- if (!notification) {
- BT_LOGW_STR("Invalid parameter: notification is NULL.");
- goto end;
- }
-
- if (notification->type != BT_NOTIFICATION_TYPE_PACKET_BEGIN) {
- BT_LOGW("Invalid parameter: notification is not a packet beginning notification: "
- "addr%p, notif-type=%s",
- notification, bt_notification_type_string(
- bt_notification_get_type(notification)));
- goto end;
- }
-
+ BT_ASSERT_PRE_NON_NULL(notification, "Notification");
+ BT_ASSERT_PRE_NOTIF_IS_TYPE(notification,
+ BT_NOTIFICATION_TYPE_PACKET_BEGIN);
packet_begin = container_of(notification,
struct bt_notification_packet_begin, parent);
- ret = bt_get(packet_begin->packet);
-end:
- return ret;
+ return bt_get(packet_begin->packet);
}
struct bt_notification *bt_notification_packet_end_create(
- struct bt_ctf_packet *packet)
+ struct bt_packet *packet)
{
struct bt_notification_packet_end *notification;
- struct bt_ctf_stream *stream;
- struct bt_ctf_stream_class *stream_class;
-
- if (!packet) {
- BT_LOGW_STR("Invalid parameter: packet is NULL.");
- goto error;
- }
-
- stream = bt_ctf_packet_borrow_stream(packet);
- assert(stream);
- stream_class = bt_ctf_stream_borrow_stream_class(stream);
- assert(stream_class);
+ struct bt_stream *stream;
+ struct bt_stream_class *stream_class;
+
+ BT_ASSERT_PRE_NON_NULL(packet, "Packet");
+ stream = bt_packet_borrow_stream(packet);
+ BT_ASSERT(stream);
+ stream_class = bt_stream_borrow_class(stream);
+ BT_ASSERT(stream_class);
BT_LOGD("Creating packet end notification object: "
"packet-addr=%p, stream-addr=%p, stream-name=\"%s\", "
"stream-class-addr=%p, stream-class-name=\"%s\", "
"stream-class-id=%" PRId64,
- packet, stream, bt_ctf_stream_get_name(stream),
+ packet, stream, bt_stream_get_name(stream),
stream_class,
- bt_ctf_stream_class_get_name(stream_class),
- bt_ctf_stream_class_get_id(stream_class));
+ bt_stream_class_get_name(stream_class),
+ bt_stream_class_get_id(stream_class));
notification = g_new0(struct bt_notification_packet_end, 1);
if (!notification) {
BT_LOGE_STR("Failed to allocate one packet end notification.");
"packet-addr=%p, stream-addr=%p, stream-name=\"%s\", "
"stream-class-addr=%p, stream-class-name=\"%s\", "
"stream-class-id=%" PRId64 ", addr=%p",
- packet, stream, bt_ctf_stream_get_name(stream),
+ packet, stream, bt_stream_get_name(stream),
stream_class,
- bt_ctf_stream_class_get_name(stream_class),
- bt_ctf_stream_class_get_id(stream_class), notification);
+ bt_stream_class_get_name(stream_class),
+ bt_stream_class_get_id(stream_class), notification);
return ¬ification->parent;
error:
return NULL;
}
-struct bt_ctf_packet *bt_notification_packet_end_get_packet(
+struct bt_packet *bt_notification_packet_end_get_packet(
struct bt_notification *notification)
{
- struct bt_ctf_packet *ret = NULL;
struct bt_notification_packet_end *packet_end;
- if (!notification) {
- BT_LOGW_STR("Invalid parameter: notification is NULL.");
- goto end;
- }
-
- if (notification->type != BT_NOTIFICATION_TYPE_PACKET_END) {
- BT_LOGW("Invalid parameter: notification is not a packet end notification: "
- "addr%p, notif-type=%s",
- notification, bt_notification_type_string(
- bt_notification_get_type(notification)));
- goto end;
- }
-
+ BT_ASSERT_PRE_NON_NULL(notification, "Notification");
+ BT_ASSERT_PRE_NOTIF_IS_TYPE(notification,
+ BT_NOTIFICATION_TYPE_PACKET_END);
packet_end = container_of(notification,
struct bt_notification_packet_end, parent);
- ret = bt_get(packet_end->packet);
-end:
- return ret;
+ return bt_get(packet_end->packet);
}
projects / babeltrace.git / blobdiff