X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2Ftrace-ir%2Fstream.c;h=5ae914ca82c45ffab6ccbf84123f08e3ed65bb7a;hb=ad5268b5815118fd5f01551b43e493214528f88d;hp=c90728daf91ac820198b2fa6706042b35f247c6b;hpb=238b7404b66983c6ba15c3a44bfbf642f20bdabe;p=babeltrace.git diff --git a/lib/trace-ir/stream.c b/lib/trace-ir/stream.c index c90728da..5ae914ca 100644 --- a/lib/trace-ir/stream.c +++ b/lib/trace-ir/stream.c @@ -1,8 +1,7 @@ /* + * Copyright 2017-2018 Philippe Proulx * Copyright 2013, 2014 Jérémie Galarneau * - * Author: 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 @@ -26,7 +25,7 @@ #include #include -#include +#include #include #include #include @@ -34,7 +33,6 @@ #include #include #include -#include #include #include #include @@ -58,6 +56,8 @@ void destroy_stream(struct bt_object *obj) stream->name.value = NULL; } + BT_LOGD_STR("Putting stream's class."); + bt_object_put_ref(stream->class); bt_object_pool_finalize(&stream->packet_pool); g_free(stream); } @@ -95,18 +95,19 @@ end: static struct bt_stream *create_stream_with_id(struct bt_stream_class *stream_class, - uint64_t id) + struct bt_trace *trace, uint64_t id) { int ret; struct bt_stream *stream; - struct bt_trace *trace; BT_ASSERT(stream_class); - trace = bt_stream_class_borrow_trace_inline(stream_class); + BT_ASSERT(trace); + BT_ASSERT_PRE(trace->class == + bt_stream_class_borrow_trace_class_inline(stream_class), + "Trace's class is different from stream class's parent trace class: " + "%![sc-]+S, %![trace-]+t", stream_class, trace); BT_ASSERT_PRE(stream_id_is_unique(trace, stream_class, id), "Duplicate stream ID: %![trace-]+t, id=%" PRIu64, trace, id); - BT_ASSERT_PRE(!trace->is_static, - "Trace is static: %![trace-]+t", trace); BT_LIB_LOGD("Creating stream object: %![trace-]+t, id=%" PRIu64, trace, id); stream = g_new0(struct bt_stream, 1); @@ -133,7 +134,11 @@ struct bt_stream *create_stream_with_id(struct bt_stream_class *stream_class, } stream->class = stream_class; + bt_object_get_no_null_check(stream_class); + + /* bt_trace_add_stream() sets the parent trace, and freezes the trace */ bt_trace_add_stream(trace, stream); + bt_stream_class_freeze(stream_class); BT_LIB_LOGD("Created stream object: %!+s", stream); goto end; @@ -145,32 +150,29 @@ end: return stream; } -struct bt_private_stream *bt_private_stream_create( - struct bt_private_stream_class *priv_stream_class) +struct bt_stream *bt_stream_create(struct bt_stream_class *stream_class, + struct bt_trace *trace) { - struct bt_stream_class *stream_class = (void *) priv_stream_class; uint64_t id; BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class"); + BT_ASSERT_PRE_NON_NULL(trace, "Trace"); BT_ASSERT_PRE(stream_class->assigns_automatic_stream_id, "Stream class does not automatically assigns stream IDs: " "%![sc-]+S", stream_class); - id = bt_trace_get_automatic_stream_id( - bt_stream_class_borrow_trace_inline(stream_class), - stream_class); - return (void *) create_stream_with_id(stream_class, id); + id = bt_trace_get_automatic_stream_id(trace, stream_class); + return create_stream_with_id(stream_class, trace, id); } -struct bt_private_stream *bt_private_stream_create_with_id( - struct bt_private_stream_class *priv_stream_class, - uint64_t id) +struct bt_stream *bt_stream_create_with_id(struct bt_stream_class *stream_class, + struct bt_trace *trace, uint64_t id) { - struct bt_stream_class *stream_class = (void *) priv_stream_class; - + BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class"); + BT_ASSERT_PRE_NON_NULL(trace, "Trace"); BT_ASSERT_PRE(!stream_class->assigns_automatic_stream_id, "Stream class automatically assigns stream IDs: " "%![sc-]+S", stream_class); - return (void *) create_stream_with_id(stream_class, id); + return create_stream_with_id(stream_class, trace, id); } struct bt_stream_class *bt_stream_borrow_class(struct bt_stream *stream) @@ -179,43 +181,62 @@ struct bt_stream_class *bt_stream_borrow_class(struct bt_stream *stream) return stream->class; } -struct bt_private_stream_class *bt_private_stream_borrow_class( - struct bt_private_stream *priv_stream) +const struct bt_stream_class *bt_stream_borrow_class_const( + const struct bt_stream *stream) { - return (void *) bt_stream_borrow_class((void *) priv_stream); + return bt_stream_borrow_class((void *) stream); } -const char *bt_stream_get_name(struct bt_stream *stream) +struct bt_trace *bt_stream_borrow_trace(struct bt_stream *stream) { - BT_ASSERT_PRE_NON_NULL(stream, "Stream class"); + BT_ASSERT_PRE_NON_NULL(stream, "Stream"); + return bt_stream_borrow_trace_inline(stream); +} + +const struct bt_trace *bt_stream_borrow_trace_const( + const struct bt_stream *stream) +{ + return bt_stream_borrow_trace((void *) stream); +} + +const char *bt_stream_get_name(const struct bt_stream *stream) +{ + BT_ASSERT_PRE_NON_NULL(stream, "Stream"); return stream->name.value; } -int bt_private_stream_set_name(struct bt_private_stream *priv_stream, +enum bt_stream_status bt_stream_set_name(struct bt_stream *stream, const char *name) { - struct bt_stream *stream = (void *) priv_stream; - - BT_ASSERT_PRE_NON_NULL(stream, "Clock class"); + BT_ASSERT_PRE_NON_NULL(stream, "Stream"); BT_ASSERT_PRE_NON_NULL(name, "Name"); BT_ASSERT_PRE_STREAM_HOT(stream); g_string_assign(stream->name.str, name); stream->name.value = stream->name.str->str; - BT_LIB_LOGV("Set stream class's name: %!+s", stream); - return 0; + BT_LIB_LOGV("Set stream's name: %!+s", stream); + return BT_STREAM_STATUS_OK; } -uint64_t bt_stream_get_id(struct bt_stream *stream) +uint64_t bt_stream_get_id(const struct bt_stream *stream) { BT_ASSERT_PRE_NON_NULL(stream, "Stream class"); return stream->id; } BT_HIDDEN -void _bt_stream_freeze(struct bt_stream *stream) +void _bt_stream_freeze(const struct bt_stream *stream) { - /* The field classes and default clock class are already frozen */ BT_ASSERT(stream); BT_LIB_LOGD("Freezing stream: %!+s", stream); - stream->frozen = true; + ((struct bt_stream *) stream)->frozen = true; +} + +void bt_stream_get_ref(const struct bt_stream *stream) +{ + bt_object_get_ref(stream); +} + +void bt_stream_put_ref(const struct bt_stream *stream) +{ + bt_object_put_ref(stream); }