projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implement CTF-IR event getters
[babeltrace.git]
/
formats
/
ctf
/
writer
/
writer.c
diff --git
a/formats/ctf/writer/writer.c
b/formats/ctf/writer/writer.c
index 3630b36b177abb9c253451419b5b10f8a9e90f3a..57236bd94186baa0c3e562cb1a49834191b39971 100644
(file)
--- a/
formats/ctf/writer/writer.c
+++ b/
formats/ctf/writer/writer.c
@@
-3,7
+3,7
@@
*
* Babeltrace CTF Writer
*
*
* Babeltrace CTF Writer
*
- * Copyright 2013
EfficiOS Inc.
+ * Copyright 2013
, 2014 Jérémie Galarneau <jeremie.galarneau@efficios.com>
*
* Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
*
*
* Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
*
@@
-28,11
+28,12
@@
#include <babeltrace/ctf-writer/writer.h>
#include <babeltrace/ctf-writer/clock.h>
#include <babeltrace/ctf-writer/writer.h>
#include <babeltrace/ctf-writer/clock.h>
-#include <babeltrace/ctf-
write
r/clock-internal.h>
+#include <babeltrace/ctf-
i
r/clock-internal.h>
#include <babeltrace/ctf-writer/writer-internal.h>
#include <babeltrace/ctf-writer/writer-internal.h>
-#include <babeltrace/ctf-
write
r/event-types-internal.h>
-#include <babeltrace/ctf-
write
r/event-fields-internal.h>
+#include <babeltrace/ctf-
i
r/event-types-internal.h>
+#include <babeltrace/ctf-
i
r/event-fields-internal.h>
#include <babeltrace/ctf-writer/functor-internal.h>
#include <babeltrace/ctf-writer/functor-internal.h>
+#include <babeltrace/ctf-ir/stream-class-internal.h>
#include <babeltrace/ctf-writer/stream-internal.h>
#include <babeltrace/ctf-writer/stream.h>
#include <babeltrace/compiler.h>
#include <babeltrace/ctf-writer/stream-internal.h>
#include <babeltrace/ctf-writer/stream.h>
#include <babeltrace/compiler.h>
@@
-233,6
+234,7
@@
struct bt_ctf_stream *bt_ctf_writer_create_stream(struct bt_ctf_writer *writer,
goto error;
}
goto error;
}
+
for (i = 0; i < writer->stream_classes->len; i++) {
if (writer->stream_classes->pdata[i] == stream->stream_class) {
stream_class_found = 1;
for (i = 0; i < writer->stream_classes->len; i++) {
if (writer->stream_classes->pdata[i] == stream->stream_class) {
stream_class_found = 1;
@@
-240,11
+242,21
@@
struct bt_ctf_stream *bt_ctf_writer_create_stream(struct bt_ctf_writer *writer,
}
if (!stream_class_found) {
}
if (!stream_class_found) {
- if (bt_ctf_stream_class_set_id(stream->stream_class,
- writer->next_stream_id++)) {
- goto error;
+ int64_t stream_id = bt_ctf_stream_class_get_id(stream_class);
+ if (stream_id < 0) {
+ if (bt_ctf_stream_class_set_id(stream->stream_class,
+ writer->next_stream_id++)) {
+ goto error;
+ }
}
}
+ for (i = 0; i < writer->stream_classes->len; i++) {
+ if (stream_id == bt_ctf_stream_class_get_id(
+ writer->stream_classes->pdata[i])) {
+ /* Duplicate stream id found */
+ goto error;
+ }
+ }
bt_ctf_stream_class_get(stream->stream_class);
g_ptr_array_add(writer->stream_classes, stream->stream_class);
}
bt_ctf_stream_class_get(stream->stream_class);
g_ptr_array_add(writer->stream_classes, stream->stream_class);
}
@@
-723,7
+735,7
@@
void stream_flush_cb(struct bt_ctf_stream *stream, struct bt_ctf_writer *writer)
stream_id = bt_ctf_field_structure_get_field(
writer->trace_packet_header, "stream_id");
stream_id = bt_ctf_field_structure_get_field(
writer->trace_packet_header, "stream_id");
- bt_ctf_field_unsigned_integer_set_value(stream_id, stream->id);
+ bt_ctf_field_unsigned_integer_set_value(stream_id, stream->
stream_class->
id);
bt_ctf_field_put(stream_id);
/* Write the trace_packet_header */
bt_ctf_field_put(stream_id);
/* Write the trace_packet_header */
This page took
0.024718 seconds
and
4
git commands to generate.