#include <babeltrace/ctf-ir/event.h>
#include <babeltrace/ctf-ir/event-class.h>
#include <babeltrace/object-internal.h>
-#include <babeltrace/compat/stdlib.h>
+#include <babeltrace/compat/stdlib-internal.h>
#include <assert.h>
+#include "common.h"
#define NR_TESTS 41
struct bt_ctf_event_class *event = NULL;
struct bt_ctf_field_type *payload = NULL;
- assert(name);
+ assert(name);
event = bt_ctf_event_class_create(name);
if (!event) {
diag("Failed to create simple event");
struct bt_ctf_event_class *event = NULL;
struct bt_ctf_field_type *inner = NULL, *outer = NULL;
- assert(name);
+ assert(name);
event = bt_ctf_event_class_create(name);
if (!event) {
diag("Failed to create complex event");
goto error;
}
- outer = create_integer_struct();
+ outer = create_integer_struct();
if (!outer) {
diag("Failed to initialize integer structure");
goto error;
}
- inner = create_integer_struct();
+ inner = create_integer_struct();
if (!inner) {
diag("Failed to initialize integer structure");
goto error;
}
ret = bt_ctf_field_type_structure_add_field(outer, inner,
- "payload_struct");
+ "payload_struct");
if (ret) {
diag("Failed to add inner structure to outer structure");
goto error;
goto end;;
}
+static void set_stream_class_field_types(
+ struct bt_ctf_stream_class *stream_class)
+{
+ struct bt_ctf_field_type *packet_context_type;
+ struct bt_ctf_field_type *event_header_type;
+ struct bt_ctf_field_type *ft;
+ int ret;
+
+ packet_context_type = bt_ctf_field_type_structure_create();
+ assert(packet_context_type);
+ ft = bt_ctf_field_type_integer_create(32);
+ assert(ft);
+ ret = bt_ctf_field_type_structure_add_field(packet_context_type,
+ ft, "packet_size");
+ assert(ret == 0);
+ bt_put(ft);
+ ft = bt_ctf_field_type_integer_create(32);
+ assert(ft);
+ ret = bt_ctf_field_type_structure_add_field(packet_context_type,
+ ft, "content_size");
+ assert(ret == 0);
+ bt_put(ft);
+
+ event_header_type = bt_ctf_field_type_structure_create();
+ assert(event_header_type);
+ ft = bt_ctf_field_type_integer_create(32);
+ assert(ft);
+ ret = bt_ctf_field_type_structure_add_field(event_header_type,
+ ft, "id");
+ assert(ret == 0);
+ bt_put(ft);
+
+ ret = bt_ctf_stream_class_set_packet_context_type(stream_class,
+ packet_context_type);
+ assert(ret == 0);
+ ret = bt_ctf_stream_class_set_event_header_type(stream_class,
+ event_header_type);
+ assert(ret == 0);
+
+ bt_put(packet_context_type);
+ bt_put(event_header_type);
+}
+
static struct bt_ctf_stream_class *create_sc1(void)
{
int ret;
struct bt_ctf_event_class *ec1 = NULL, *ec2 = NULL;
struct bt_ctf_stream_class *sc1 = NULL, *ret_stream = NULL;
- sc1 = bt_ctf_stream_class_create("sc1");
+ sc1 = bt_ctf_stream_class_create_empty("sc1");
if (!sc1) {
diag("Failed to create Stream Class");
goto error;
}
+ set_stream_class_field_types(sc1);
ec1 = create_complex_event("ec1");
if (!ec1) {
diag("Failed to create complex event EC1");
return sc1;
error:
BT_PUT(sc1);
- goto end;
+ goto end;
}
static struct bt_ctf_stream_class *create_sc2(void)
struct bt_ctf_event_class *ec3 = NULL;
struct bt_ctf_stream_class *sc2 = NULL, *ret_stream = NULL;
- sc2 = bt_ctf_stream_class_create("sc2");
+ sc2 = bt_ctf_stream_class_create_empty("sc2");
if (!sc2) {
diag("Failed to create Stream Class");
goto error;
}
+ set_stream_class_field_types(sc2);
ec3 = create_simple_event("ec3");
if (!ec3) {
diag("Failed to create simple event EC3");
return sc2;
error:
BT_PUT(sc2);
- goto end;
+ goto end;
+}
+
+static void set_trace_packet_header(struct bt_ctf_trace *trace)
+{
+ struct bt_ctf_field_type *packet_header_type;
+ struct bt_ctf_field_type *ft;
+ int ret;
+
+ packet_header_type = bt_ctf_field_type_structure_create();
+ assert(packet_header_type);
+ ft = bt_ctf_field_type_integer_create(32);
+ assert(ft);
+ ret = bt_ctf_field_type_structure_add_field(packet_header_type,
+ ft, "stream_id");
+ assert(ret == 0);
+ bt_put(ft);
+
+ ret = bt_ctf_trace_set_packet_header_type(trace,
+ packet_header_type);
+ assert(ret == 0);
+
+ bt_put(packet_header_type);
}
static struct bt_ctf_trace *create_tc1(void)
struct bt_ctf_trace *tc1 = NULL;
struct bt_ctf_stream_class *sc1 = NULL, *sc2 = NULL;
- tc1 = bt_ctf_trace_create();
+ tc1 = bt_ctf_trace_create();
if (!tc1) {
diag("bt_ctf_trace_create returned NULL");
goto error;
}
+ set_trace_packet_header(tc1);
sc1 = create_sc1();
ok(sc1, "Create SC1");
if (!sc1) {
return tc1;
error:
BT_PUT(tc1);
- goto end;
+ goto end;
}
static void init_weak_refs(struct bt_ctf_trace *tc,
struct bt_ctf_event_class **ec3)
{
*tc1 = tc;
- *sc1 = bt_ctf_trace_get_stream_class(tc, 0);
- *sc2 = bt_ctf_trace_get_stream_class(tc, 1);
- *ec1 = bt_ctf_stream_class_get_event_class(*sc1, 0);
- *ec2 = bt_ctf_stream_class_get_event_class(*sc1, 1);
- *ec3 = bt_ctf_stream_class_get_event_class(*sc2, 0);
+ *sc1 = bt_ctf_trace_get_stream_class_by_index(tc, 0);
+ *sc2 = bt_ctf_trace_get_stream_class_by_index(tc, 1);
+ *ec1 = bt_ctf_stream_class_get_event_class_by_index(*sc1, 0);
+ *ec2 = bt_ctf_stream_class_get_event_class_by_index(*sc1, 1);
+ *ec3 = bt_ctf_stream_class_get_event_class_by_index(*sc2, 0);
bt_put(*sc1);
bt_put(*sc2);
bt_put(*ec1);
/* The only reference which exists at this point is on TC1. */
tc1 = create_tc1();
- ok(tc1, "Initialize trace");
+ ok(tc1, "Initialize trace");
if (!tc1) {
return;
}
"TC1 reference count is 1");
/* User A acquires a reference to SC2 from TC1. */
- user_a.sc = bt_ctf_trace_get_stream_class(user_a.tc, 1);
+ user_a.sc = bt_ctf_trace_get_stream_class_by_index(user_a.tc, 1);
ok(user_a.sc, "User A acquires SC2 from TC1");
ok(bt_object_get_ref_count(weak_tc1) == 2,
"TC1 reference count is 2");
"SC2 reference count is 1");
/* User A acquires a reference to EC3 from SC2. */
- user_a.ec = bt_ctf_stream_class_get_event_class(user_a.sc, 0);
+ user_a.ec = bt_ctf_stream_class_get_event_class_by_index(user_a.sc, 0);
ok(user_a.ec, "User A acquires EC3 from SC2");
ok(bt_object_get_ref_count(weak_tc1) == 2,
"TC1 reference count is 2");
/* User A releases its reference to TC1. */
diag("User A releases TC1");
- BT_PUT(user_a.tc);
+ BT_PUT(user_a.tc);
/*
* We keep the pointer to TC1 around to validate its reference
* count.
/* User C acquires a reference to EC1. */
diag("User C acquires a reference to EC1");
- user_c.ec = bt_ctf_stream_class_get_event_class(user_b.sc, 0);
+ user_c.ec = bt_ctf_stream_class_get_event_class_by_index(user_b.sc, 0);
ok(bt_object_get_ref_count(weak_ec1) == 1,
"EC1 reference count is 1");
ok(bt_object_get_ref_count(weak_sc1) == 2,
static void create_user_full(struct user *user)
{
- char trace_path[] = "/tmp/ctfwriter_XXXXXX";
+ gchar *trace_path;
struct bt_ctf_field_type *ft;
struct bt_ctf_field *field;
struct bt_ctf_clock *clock;
int ret;
+ trace_path = g_build_filename(g_get_tmp_dir(), "ctfwriter_XXXXXX", NULL);
if (!bt_mkdtemp(trace_path)) {
perror("# perror");
}
user->writer = bt_ctf_writer_create(trace_path);
assert(user->writer);
+ ret = bt_ctf_writer_set_byte_order(user->writer,
+ BT_CTF_BYTE_ORDER_LITTLE_ENDIAN);
+ assert(ret == 0);
user->tc = bt_ctf_writer_get_trace(user->writer);
assert(user->tc);
user->sc = bt_ctf_stream_class_create("sc");
assert(user->sc);
clock = bt_ctf_clock_create("the_clock");
assert(clock);
- ret = bt_ctf_stream_class_set_clock(user->sc, clock);
+ ret = bt_ctf_writer_add_clock(user->writer, clock);
assert(!ret);
- ret = bt_ctf_clock_set_value(clock, 23);
+ ret = bt_ctf_stream_class_set_clock(user->sc, clock);
assert(!ret);
BT_PUT(clock);
user->stream = bt_ctf_writer_create_stream(user->writer, user->sc);
BT_PUT(field);
ret = bt_ctf_stream_append_event(user->stream, user->event);
assert(!ret);
+ recursive_rmdir(trace_path);
+ g_free(trace_path);
}
static void test_put_order_swap(size_t *array, size_t a, size_t b)
{
size_t i;
struct user user = { 0 };
- void** objects = (void *) &user;
+ void **objects = (void *) &user;
create_user_full(&user);
printf("# ");
for (i = 0; i < size; ++i) {
- void* obj = objects[array[i]];
+ void *obj = objects[array[i]];
printf("%s", user_names[array[i]]);
BT_PUT(obj);
*/
int main(int argc, char **argv)
{
- /* Initialize tap harness before any tests */
+ /* Initialize tap harness before any tests */
plan_tests(NR_TESTS);
test_example_scenario();