* - uint16_t payload_16;
* - uint32_t payload_32;
*/
-static struct bt_field_type *create_integer_struct(void)
+static struct bt_field_class *create_integer_struct(void)
{
int ret;
- struct bt_field_type *structure = NULL;
- struct bt_field_type *ui8 = NULL, *ui16 = NULL, *ui32 = NULL;
+ struct bt_field_class *structure = NULL;
+ struct bt_field_class *ui8 = NULL, *ui16 = NULL, *ui32 = NULL;
- structure = bt_field_type_structure_create();
+ structure = bt_field_class_structure_create();
BT_ASSERT(structure);
- ui8 = bt_field_type_unsigned_integer_create();
+ ui8 = bt_field_class_unsigned_integer_create();
BT_ASSERT(ui8);
- ret = bt_field_type_integer_set_field_value_range(ui8, 8);
+ ret = bt_field_class_integer_set_field_value_range(ui8, 8);
BT_ASSERT(ret == 0);
- ret = bt_field_type_structure_append_member(structure,
+ ret = bt_field_class_structure_append_member(structure,
"payload_8", ui8);
BT_ASSERT(ret == 0);
- ui16 = bt_field_type_unsigned_integer_create();
+ ui16 = bt_field_class_unsigned_integer_create();
BT_ASSERT(ui16);
- ret = bt_field_type_integer_set_field_value_range(ui16, 16);
+ ret = bt_field_class_integer_set_field_value_range(ui16, 16);
BT_ASSERT(ret == 0);
- ret = bt_field_type_structure_append_member(structure,
+ ret = bt_field_class_structure_append_member(structure,
"payload_16", ui16);
BT_ASSERT(ret == 0);
- ui32 = bt_field_type_unsigned_integer_create();
+ ui32 = bt_field_class_unsigned_integer_create();
BT_ASSERT(ui32);
- ret = bt_field_type_integer_set_field_value_range(ui32, 32);
+ ret = bt_field_class_integer_set_field_value_range(ui32, 32);
BT_ASSERT(ret == 0);
- ret = bt_field_type_structure_append_member(structure,
+ ret = bt_field_class_structure_append_member(structure,
"payload_32", ui32);
BT_ASSERT(ret == 0);
- BT_PUT(ui8);
- BT_PUT(ui16);
- BT_PUT(ui32);
+ BT_OBJECT_PUT_REF_AND_RESET(ui8);
+ BT_OBJECT_PUT_REF_AND_RESET(ui16);
+ BT_OBJECT_PUT_REF_AND_RESET(ui32);
return structure;
}
ret = bt_ctf_field_type_structure_add_field(structure, ui32,
"payload_32");
BT_ASSERT(ret == 0);
- BT_PUT(ui8);
- BT_PUT(ui16);
- BT_PUT(ui32);
+ BT_OBJECT_PUT_REF_AND_RESET(ui8);
+ BT_OBJECT_PUT_REF_AND_RESET(ui16);
+ BT_OBJECT_PUT_REF_AND_RESET(ui32);
return structure;
}
{
int ret;
struct bt_event_class *event = NULL;
- struct bt_field_type *payload = NULL;
+ struct bt_field_class *payload = NULL;
BT_ASSERT(name);
event = bt_event_class_create(sc);
BT_ASSERT(ret == 0);
payload = create_integer_struct();
BT_ASSERT(payload);
- ret = bt_event_class_set_payload_field_type(event, payload);
+ ret = bt_event_class_set_payload_field_class(event, payload);
BT_ASSERT(ret == 0);
- BT_PUT(payload);
+ BT_OBJECT_PUT_REF_AND_RESET(payload);
return event;
}
{
int ret;
struct bt_event_class *event = NULL;
- struct bt_field_type *inner = NULL, *outer = NULL;
+ struct bt_field_class *inner = NULL, *outer = NULL;
BT_ASSERT(name);
event = bt_event_class_create(sc);
BT_ASSERT(outer);
inner = create_integer_struct();
BT_ASSERT(inner);
- ret = bt_field_type_structure_append_member(outer,
+ ret = bt_field_class_structure_append_member(outer,
"payload_struct", inner);
BT_ASSERT(ret == 0);
- ret = bt_event_class_set_payload_field_type(event, outer);
+ ret = bt_event_class_set_payload_field_class(event, outer);
BT_ASSERT(ret == 0);
- BT_PUT(inner);
- BT_PUT(outer);
+ BT_OBJECT_PUT_REF_AND_RESET(inner);
+ BT_OBJECT_PUT_REF_AND_RESET(outer);
return event;
}
-static void set_stream_class_field_types(
+static void set_stream_class_field_classes(
struct bt_stream_class *stream_class)
{
- struct bt_field_type *packet_context_type;
- struct bt_field_type *event_header_type;
- struct bt_field_type *ft;
+ struct bt_field_class *packet_context_type;
+ struct bt_field_class *event_header_type;
+ struct bt_field_class *fc;
int ret;
- packet_context_type = bt_field_type_structure_create();
+ packet_context_type = bt_field_class_structure_create();
BT_ASSERT(packet_context_type);
- ft = bt_field_type_unsigned_integer_create();
- BT_ASSERT(ft);
- ret = bt_field_type_integer_set_field_value_range(ft, 32);
+ fc = bt_field_class_unsigned_integer_create();
+ BT_ASSERT(fc);
+ ret = bt_field_class_integer_set_field_value_range(fc, 32);
BT_ASSERT(ret == 0);
- ret = bt_field_type_structure_append_member(packet_context_type,
- "packet_size", ft);
+ ret = bt_field_class_structure_append_member(packet_context_type,
+ "packet_size", fc);
BT_ASSERT(ret == 0);
- bt_put(ft);
- ft = bt_field_type_unsigned_integer_create();
- BT_ASSERT(ft);
- ret = bt_field_type_integer_set_field_value_range(ft, 32);
+ bt_object_put_ref(fc);
+ fc = bt_field_class_unsigned_integer_create();
+ BT_ASSERT(fc);
+ ret = bt_field_class_integer_set_field_value_range(fc, 32);
BT_ASSERT(ret == 0);
- ret = bt_field_type_structure_append_member(packet_context_type,
- "content_size", ft);
+ ret = bt_field_class_structure_append_member(packet_context_type,
+ "content_size", fc);
BT_ASSERT(ret == 0);
- bt_put(ft);
- event_header_type = bt_field_type_structure_create();
+ bt_object_put_ref(fc);
+ event_header_type = bt_field_class_structure_create();
BT_ASSERT(event_header_type);
- ft = bt_field_type_unsigned_integer_create();
- BT_ASSERT(ft);
- ret = bt_field_type_integer_set_field_value_range(ft, 32);
+ fc = bt_field_class_unsigned_integer_create();
+ BT_ASSERT(fc);
+ ret = bt_field_class_integer_set_field_value_range(fc, 32);
BT_ASSERT(ret == 0);
- ret = bt_field_type_structure_append_member(event_header_type,
- "id", ft);
+ ret = bt_field_class_structure_append_member(event_header_type,
+ "id", fc);
BT_ASSERT(ret == 0);
- bt_put(ft);
- ret = bt_stream_class_set_packet_context_field_type(stream_class,
+ bt_object_put_ref(fc);
+ ret = bt_stream_class_set_packet_context_field_class(stream_class,
packet_context_type);
BT_ASSERT(ret == 0);
- ret = bt_stream_class_set_event_header_field_type(stream_class,
+ ret = bt_stream_class_set_event_header_field_class(stream_class,
event_header_type);
BT_ASSERT(ret == 0);
- bt_put(packet_context_type);
- bt_put(event_header_type);
+ bt_object_put_ref(packet_context_type);
+ bt_object_put_ref(event_header_type);
}
static void create_sc1(struct bt_trace *trace)
BT_ASSERT(sc1);
ret = bt_stream_class_set_name(sc1, "sc1");
BT_ASSERT(ret == 0);
- set_stream_class_field_types(sc1);
+ set_stream_class_field_classes(sc1);
ec1 = create_complex_event(sc1, "ec1");
BT_ASSERT(ec1);
ec2 = create_simple_event(sc1, "ec2");
ok(ret_stream == sc1, "Borrow parent stream SC1 from EC1");
ret_stream = bt_event_class_borrow_stream_class(ec2);
ok(ret_stream == sc1, "Borrow parent stream SC1 from EC2");
- BT_PUT(ec1);
- BT_PUT(ec2);
- BT_PUT(sc1);
+ BT_OBJECT_PUT_REF_AND_RESET(ec1);
+ BT_OBJECT_PUT_REF_AND_RESET(ec2);
+ BT_OBJECT_PUT_REF_AND_RESET(sc1);
}
static void create_sc2(struct bt_trace *trace)
BT_ASSERT(sc2);
ret = bt_stream_class_set_name(sc2, "sc2");
BT_ASSERT(ret == 0);
- set_stream_class_field_types(sc2);
+ set_stream_class_field_classes(sc2);
ec3 = create_simple_event(sc2, "ec3");
ret_stream = bt_event_class_borrow_stream_class(ec3);
ok(ret_stream == sc2, "Borrow parent stream SC2 from EC3");
- BT_PUT(ec3);
- BT_PUT(sc2);
+ BT_OBJECT_PUT_REF_AND_RESET(ec3);
+ BT_OBJECT_PUT_REF_AND_RESET(sc2);
}
static void set_trace_packet_header(struct bt_trace *trace)
{
- struct bt_field_type *packet_header_type;
- struct bt_field_type *ft;
+ struct bt_field_class *packet_header_type;
+ struct bt_field_class *fc;
int ret;
- packet_header_type = bt_field_type_structure_create();
+ packet_header_type = bt_field_class_structure_create();
BT_ASSERT(packet_header_type);
- ft = bt_field_type_unsigned_integer_create();
- BT_ASSERT(ft);
- ret = bt_field_type_integer_set_field_value_range(ft, 32);
+ fc = bt_field_class_unsigned_integer_create();
+ BT_ASSERT(fc);
+ ret = bt_field_class_integer_set_field_value_range(fc, 32);
BT_ASSERT(ret == 0);
- ret = bt_field_type_structure_append_member(packet_header_type,
- "stream_id", ft);
+ ret = bt_field_class_structure_append_member(packet_header_type,
+ "stream_id", fc);
BT_ASSERT(ret == 0);
- bt_put(ft);
- ret = bt_trace_set_packet_header_field_type(trace,
+ bt_object_put_ref(fc);
+ ret = bt_trace_set_packet_header_field_class(trace,
packet_header_type);
BT_ASSERT(ret == 0);
- bt_put(packet_header_type);
+ bt_object_put_ref(packet_header_type);
}
static struct bt_trace *create_tc1(void)
"Initial EC3 reference count is 0");
/* User A has ownership of the trace. */
- BT_MOVE(user_a.tc, tc1);
+ BT_OBJECT_MOVE_REF(user_a.tc, tc1);
ok(bt_object_get_ref_count((void *) user_a.tc) == 1,
"TC1 reference count is 1");
/* User A acquires a reference to SC2 from TC1. */
- user_a.sc = bt_get(bt_trace_borrow_stream_class_by_index(user_a.tc, 1));
+ user_a.sc = bt_object_get_ref(bt_trace_borrow_stream_class_by_index(user_a.tc, 1));
ok(user_a.sc, "User A acquires SC2 from TC1");
ok(bt_object_get_ref_count((void *) 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_get(
+ user_a.ec = bt_object_get_ref(
bt_stream_class_borrow_event_class_by_index(user_a.sc, 0));
ok(user_a.ec, "User A acquires EC3 from SC2");
ok(bt_object_get_ref_count((void *) weak_tc1) == 2,
/* User A releases its reference to SC2. */
diag("User A releases SC2");
- BT_PUT(user_a.sc);
+ BT_OBJECT_PUT_REF_AND_RESET(user_a.sc);
/*
* We keep the pointer to SC2 around to validate its reference
* count.
/* User A releases its reference to TC1. */
diag("User A releases TC1");
- BT_PUT(user_a.tc);
+ BT_OBJECT_PUT_REF_AND_RESET(user_a.tc);
/*
* We keep the pointer to TC1 around to validate its reference
* count.
/* User B acquires a reference to SC1. */
diag("User B acquires a reference to SC1");
- user_b.sc = bt_get(weak_sc1);
+ user_b.sc = bt_object_get_ref(weak_sc1);
ok(bt_object_get_ref_count((void *) weak_tc1) == 2,
"TC1 reference count is 2");
ok(bt_object_get_ref_count((void *) weak_sc1) == 1,
/* User C acquires a reference to EC1. */
diag("User C acquires a reference to EC1");
- user_c.ec = bt_get(
+ user_c.ec = bt_object_get_ref(
bt_stream_class_borrow_event_class_by_index(user_b.sc, 0));
ok(bt_object_get_ref_count((void *) weak_ec1) == 1,
"EC1 reference count is 1");
/* User A releases its reference on EC3. */
diag("User A releases its reference on EC3");
- BT_PUT(user_a.ec);
+ BT_OBJECT_PUT_REF_AND_RESET(user_a.ec);
ok(bt_object_get_ref_count((void *) weak_ec3) == 0,
"EC3 reference count is 1");
ok(bt_object_get_ref_count((void *) weak_sc2) == 0,
/* User B releases its reference on SC1. */
diag("User B releases its reference on SC1");
- BT_PUT(user_b.sc);
+ BT_OBJECT_PUT_REF_AND_RESET(user_b.sc);
ok(bt_object_get_ref_count((void *) weak_sc1) == 1,
"SC1 reference count is 1");
"EC3 reference count is 0");
/* Reclaim last reference held by User C. */
- BT_PUT(user_c.ec);
+ BT_OBJECT_PUT_REF_AND_RESET(user_c.ec);
}
static void create_writer_user_full(struct writer_user *user)
BT_ASSERT(!ret);
ret = bt_ctf_stream_class_set_clock(user->sc, clock);
BT_ASSERT(!ret);
- BT_PUT(clock);
+ BT_OBJECT_PUT_REF_AND_RESET(clock);
user->stream = bt_ctf_writer_create_stream(user->writer, user->sc);
BT_ASSERT(user->stream);
user->ec = bt_ctf_event_class_create("ec");
ft = create_writer_integer_struct();
BT_ASSERT(ft);
ret = bt_ctf_event_class_set_payload_field_type(user->ec, ft);
- BT_PUT(ft);
+ BT_OBJECT_PUT_REF_AND_RESET(ft);
BT_ASSERT(!ret);
ret = bt_ctf_stream_class_add_event_class(user->sc, user->ec);
BT_ASSERT(!ret);
BT_ASSERT(field);
ret = bt_ctf_field_integer_unsigned_set_value(field, 10);
BT_ASSERT(!ret);
- BT_PUT(field);
+ BT_OBJECT_PUT_REF_AND_RESET(field);
field = bt_ctf_event_get_payload(user->event, "payload_16");
BT_ASSERT(field);
ret = bt_ctf_field_integer_unsigned_set_value(field, 20);
BT_ASSERT(!ret);
- BT_PUT(field);
+ BT_OBJECT_PUT_REF_AND_RESET(field);
field = bt_ctf_event_get_payload(user->event, "payload_32");
BT_ASSERT(field);
ret = bt_ctf_field_integer_unsigned_set_value(field, 30);
BT_ASSERT(!ret);
- BT_PUT(field);
+ BT_OBJECT_PUT_REF_AND_RESET(field);
ret = bt_ctf_stream_append_event(user->stream, user->event);
BT_ASSERT(!ret);
recursive_rmdir(trace_path);
void *obj = objects[array[i]];
printf("%s", writer_user_names[array[i]]);
- BT_PUT(obj);
+ BT_OBJECT_PUT_REF_AND_RESET(obj);
if (i < size - 1) {
printf(" -> ");