projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lib: make trace IR API const-correct
[babeltrace.git]
/
lib
/
trace-ir
/
stream.c
diff --git
a/lib/trace-ir/stream.c
b/lib/trace-ir/stream.c
index 445dbac6d835f52dab216a539ff213734bbe5292..c1352400b3bcfcfcb861a4756bd8ef089e046036 100644
(file)
--- a/
lib/trace-ir/stream.c
+++ b/
lib/trace-ir/stream.c
@@
-1,8
+1,4
@@
/*
/*
- * stream.c
- *
- * Babeltrace trace IR - Stream
- *
* Copyright 2013, 2014 Jérémie Galarneau <jeremie.galarneau@efficios.com>
*
* Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
* Copyright 2013, 2014 Jérémie Galarneau <jeremie.galarneau@efficios.com>
*
* Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
@@
-30,6
+26,7
@@
#include <babeltrace/lib-logging-internal.h>
#include <babeltrace/assert-pre-internal.h>
#include <babeltrace/lib-logging-internal.h>
#include <babeltrace/assert-pre-internal.h>
+#include <babeltrace/trace-ir/stream-const.h>
#include <babeltrace/trace-ir/stream.h>
#include <babeltrace/trace-ir/stream-internal.h>
#include <babeltrace/trace-ir/stream-class.h>
#include <babeltrace/trace-ir/stream.h>
#include <babeltrace/trace-ir/stream-internal.h>
#include <babeltrace/trace-ir/stream-class.h>
@@
-37,7
+34,7
@@
#include <babeltrace/trace-ir/trace.h>
#include <babeltrace/trace-ir/trace-internal.h>
#include <babeltrace/trace-ir/packet-internal.h>
#include <babeltrace/trace-ir/trace.h>
#include <babeltrace/trace-ir/trace-internal.h>
#include <babeltrace/trace-ir/packet-internal.h>
-#include <babeltrace/
ref
.h>
+#include <babeltrace/
object
.h>
#include <babeltrace/compiler-internal.h>
#include <babeltrace/align-internal.h>
#include <babeltrace/assert-internal.h>
#include <babeltrace/compiler-internal.h>
#include <babeltrace/align-internal.h>
#include <babeltrace/assert-internal.h>
@@
-57,6
+54,8
@@
void destroy_stream(struct bt_object *obj)
if (stream->name.str) {
g_string_free(stream->name.str, TRUE);
if (stream->name.str) {
g_string_free(stream->name.str, TRUE);
+ stream->name.str = NULL;
+ stream->name.value = NULL;
}
bt_object_pool_finalize(&stream->packet_pool);
}
bt_object_pool_finalize(&stream->packet_pool);
@@
-140,7
+139,7
@@
struct bt_stream *create_stream_with_id(struct bt_stream_class *stream_class,
goto end;
error:
goto end;
error:
- BT_
PU
T(stream);
+ BT_
OBJECT_PUT_REF_AND_RESE
T(stream);
end:
return stream;
end:
return stream;
@@
-175,7
+174,13
@@
struct bt_stream_class *bt_stream_borrow_class(struct bt_stream *stream)
return stream->class;
}
return stream->class;
}
-const char *bt_stream_get_name(struct bt_stream *stream)
+const struct bt_stream_class *bt_stream_borrow_class_const(
+ const struct bt_stream *stream)
+{
+ return bt_stream_borrow_class((void *) stream);
+}
+
+const char *bt_stream_get_name(const struct bt_stream *stream)
{
BT_ASSERT_PRE_NON_NULL(stream, "Stream class");
return stream->name.value;
{
BT_ASSERT_PRE_NON_NULL(stream, "Stream class");
return stream->name.value;
@@
-188,21
+193,21
@@
int bt_stream_set_name(struct bt_stream *stream, const char *name)
BT_ASSERT_PRE_STREAM_HOT(stream);
g_string_assign(stream->name.str, name);
stream->name.value = stream->name.str->str;
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);
+ BT_LIB_LOGV("Set stream class's name: %!+
s
", stream);
return 0;
}
return 0;
}
-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
{
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);
{
/* 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;
}
}
This page took
0.044621 seconds
and
4
git commands to generate.