* SOFTWARE.
*/
-#define BT_LOG_TAG "PACKET"
-#include "lib/lib-logging.h"
+#define BT_LOG_TAG "LIB/PACKET"
+#include "lib/logging.h"
#include "lib/assert-pre.h"
#include <babeltrace2/trace-ir/packet-const.h>
#include "stream-class.h"
#include "stream.h"
#include "trace.h"
-
-#define BT_ASSERT_PRE_PACKET_HOT(_packet) \
- BT_ASSERT_PRE_HOT((_packet), "Packet", ": %!+a", (_packet))
+#include "lib/func-status.h"
struct bt_stream *bt_packet_borrow_stream(struct bt_packet *packet)
{
- BT_ASSERT_PRE_NON_NULL(packet, "Packet");
+ BT_ASSERT_PRE_DEV_NON_NULL(packet, "Packet");
return packet->stream;
}
struct bt_field *bt_packet_borrow_context_field(struct bt_packet *packet)
{
- BT_ASSERT_PRE_NON_NULL(packet, "Packet");
+ BT_ASSERT_PRE_DEV_NON_NULL(packet, "Packet");
return packet->context_field ? packet->context_field->field : NULL;
}
BT_LIB_LOGD("Creating packet object: %![stream-]+s", stream);
packet = g_new0(struct bt_packet, 1);
if (!packet) {
- BT_LOGE_STR("Failed to allocate one packet object.");
+ BT_LIB_LOGE_APPEND_CAUSE(
+ "Failed to allocate one packet object.");
goto error;
}
&stream->class->packet_context_field_pool,
stream->class->packet_context_fc);
if (!packet->context_field) {
- BT_LOGE_STR("Cannot create packet context field wrapper.");
+ BT_LIB_LOGE_APPEND_CAUSE(
+ "Cannot create packet context field wrapper.");
goto error;
}
}
struct bt_stream *stream = (void *) c_stream;
BT_ASSERT_PRE_NON_NULL(stream, "Stream");
+ BT_ASSERT_PRE(stream->class->supports_packets,
+ "Stream class does not support packets: %![sc-]+S",
+ stream->class);
packet = bt_object_pool_create_object(&stream->packet_pool);
- if (unlikely(!packet)) {
- BT_LIB_LOGE("Cannot allocate one packet from stream's packet pool: "
+ if (G_UNLIKELY(!packet)) {
+ BT_LIB_LOGE_APPEND_CAUSE(
+ "Cannot allocate one packet from stream's packet pool: "
"%![stream-]+s", stream);
goto end;
}
- if (likely(!packet->stream)) {
+ if (G_LIKELY(!packet->stream)) {
packet->stream = stream;
bt_object_get_no_null_check_no_parent_check(
&packet->stream->base);
return (void *) packet;
}
-enum bt_packet_status bt_packet_move_context_field(struct bt_packet *packet,
+enum bt_packet_move_context_field_status bt_packet_move_context_field(
+ struct bt_packet *packet,
struct bt_packet_context_field *context_field)
{
struct bt_stream_class *stream_class;
struct bt_field_wrapper *field_wrapper = (void *) context_field;
- BT_ASSERT_PRE_NON_NULL(packet, "Packet");
- BT_ASSERT_PRE_NON_NULL(field_wrapper, "Context field");
- BT_ASSERT_PRE_HOT(packet, "Packet", ": %!+a", packet);
+ BT_ASSERT_PRE_DEV_NON_NULL(packet, "Packet");
+ BT_ASSERT_PRE_DEV_NON_NULL(field_wrapper, "Context field");
+ BT_ASSERT_PRE_DEV_HOT(packet, "Packet", ": %!+a", packet);
stream_class = packet->stream->class;
- BT_ASSERT_PRE(stream_class->packet_context_fc,
+ BT_ASSERT_PRE_DEV(stream_class->packet_context_fc,
"Stream class has no packet context field class: %!+S",
stream_class);
- BT_ASSERT_PRE(field_wrapper->field->class ==
+ BT_ASSERT_PRE_DEV(field_wrapper->field->class ==
stream_class->packet_context_fc,
"Unexpected packet context field's class: "
"%![fc-]+F, %![expected-fc-]+F", field_wrapper->field->class,
/* Move new field */
packet->context_field = field_wrapper;
- return BT_PACKET_STATUS_OK;
+ return BT_FUNC_STATUS_OK;
}
void bt_packet_get_ref(const struct bt_packet *packet)