* SOFTWARE.
*/
-#define BT_LOG_TAG "STREAM"
-#include "lib/lib-logging.h"
+#define BT_LOG_TAG "LIB/STREAM"
+#include "lib/logging.h"
#include "lib/assert-pre.h"
#include <babeltrace2/trace-ir/stream-const.h>
#include "stream-class.h"
#include "stream.h"
#include "trace.h"
+#include "lib/func-status.h"
-#define BT_ASSERT_PRE_STREAM_HOT(_stream) \
- BT_ASSERT_PRE_HOT((_stream), "Stream", ": %!+s", (_stream))
+#define BT_ASSERT_PRE_DEV_STREAM_HOT(_stream) \
+ BT_ASSERT_PRE_DEV_HOT((_stream), "Stream", ": %!+s", (_stream))
static
void destroy_stream(struct bt_object *obj)
bt_packet_destroy(packet);
}
-BT_ASSERT_PRE_FUNC
static inline
bool stream_id_is_unique(struct bt_trace *trace,
struct bt_stream_class *stream_class, uint64_t id)
trace, id);
stream = g_new0(struct bt_stream, 1);
if (!stream) {
- BT_LOGE_STR("Failed to allocate one stream.");
+ BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate one stream.");
goto error;
}
bt_object_init_shared_with_parent(&stream->base, destroy_stream);
stream->name.str = g_string_new(NULL);
if (!stream->name.str) {
- BT_LOGE_STR("Failed to allocate a GString.");
+ BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate a GString.");
goto error;
}
(bt_object_pool_destroy_object_func) bt_stream_free_packet,
stream);
if (ret) {
- BT_LOGE("Failed to initialize packet pool: ret=%d", ret);
+ BT_LIB_LOGE_APPEND_CAUSE(
+ "Failed to initialize packet pool: ret=%d", ret);
goto error;
}
struct bt_stream_class *bt_stream_borrow_class(struct bt_stream *stream)
{
- BT_ASSERT_PRE_NON_NULL(stream, "Stream");
+ BT_ASSERT_PRE_DEV_NON_NULL(stream, "Stream");
return stream->class;
}
struct bt_trace *bt_stream_borrow_trace(struct bt_stream *stream)
{
- BT_ASSERT_PRE_NON_NULL(stream, "Stream");
+ BT_ASSERT_PRE_DEV_NON_NULL(stream, "Stream");
return bt_stream_borrow_trace_inline(stream);
}
const char *bt_stream_get_name(const struct bt_stream *stream)
{
- BT_ASSERT_PRE_NON_NULL(stream, "Stream");
+ BT_ASSERT_PRE_DEV_NON_NULL(stream, "Stream");
return stream->name.value;
}
-enum bt_stream_status bt_stream_set_name(struct bt_stream *stream,
+enum bt_stream_set_name_status bt_stream_set_name(struct bt_stream *stream,
const char *name)
{
BT_ASSERT_PRE_NON_NULL(stream, "Stream");
BT_ASSERT_PRE_NON_NULL(name, "Name");
- BT_ASSERT_PRE_STREAM_HOT(stream);
+ BT_ASSERT_PRE_DEV_STREAM_HOT(stream);
g_string_assign(stream->name.str, name);
stream->name.value = stream->name.str->str;
- BT_LIB_LOGV("Set stream's name: %!+s", stream);
- return BT_STREAM_STATUS_OK;
+ BT_LIB_LOGD("Set stream's name: %!+s", stream);
+ return BT_FUNC_STATUS_OK;
}
uint64_t bt_stream_get_id(const struct bt_stream *stream)
{
- BT_ASSERT_PRE_NON_NULL(stream, "Stream class");
+ BT_ASSERT_PRE_DEV_NON_NULL(stream, "Stream class");
return stream->id;
}