lib: rename `bt_object_{get,put}_no` -> `bt_object_{get,put}_ref_no`

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I5747bdb748d585b25e0ffbe4701b9aef5434728e
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2126
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>

diff --git a/src/lib/graph/component-descriptor-set.c b/src/lib/graph/component-descriptor-set.c
index b0668a5ae1e99b71227f020e1fd650ff4e027923..2585ccfe8698679f5e8498434c608d3ddd11b330 100644 (file)
--- a/src/lib/graph/component-descriptor-set.c
+++ b/src/lib/graph/component-descriptor-set.c
@@ -169,10 +169,10 @@ bt_component_descriptor_set_add_descriptor_with_initialize_method_data(
        }
 
        entry->comp_cls = (void *) comp_cls;
-       bt_object_get_no_null_check(entry->comp_cls);
+       bt_object_get_ref_no_null_check(entry->comp_cls);
        bt_component_class_freeze(entry->comp_cls);
        entry->params = (void *) params;
-       bt_object_get_no_null_check(entry->params);
+       bt_object_get_ref_no_null_check(entry->params);
        bt_value_freeze(entry->params);
        entry->init_method_data = init_method_data;
 

diff --git a/src/lib/graph/component.c b/src/lib/graph/component.c
index 2aed6932ffad144d9ed69b24acaeca9ba3cfb5ff..cc951e063501935489897b36a41c3a17c0ac7f15 100644 (file)
--- a/src/lib/graph/component.c
+++ b/src/lib/graph/component.c
@@ -307,7 +307,7 @@ int bt_component_create(struct bt_component_class *component_class,
 
        bt_object_init_shared_with_parent(&component->base, destroy_component);
        component->class = component_class;
-       bt_object_get_no_null_check(component->class);
+       bt_object_get_ref_no_null_check(component->class);
        component->destroy = component_destroy_funcs[type];
        component->name = g_string_new(name);
        if (!component->name) {

diff --git a/src/lib/graph/graph.c b/src/lib/graph/graph.c
index 591b65d2036feb94a4ec8cd7891d6e507947cfbf..f406a526e7d5e827779627dea99a2447417ce289 100644 (file)
--- a/src/lib/graph/graph.c
+++ b/src/lib/graph/graph.c
@@ -364,7 +364,7 @@ struct bt_graph *bt_graph_create(uint64_t mip_version)
        }
 
        graph->interrupters = g_ptr_array_new_with_free_func(
-               (GDestroyNotify) bt_object_put_no_null_check);
+               (GDestroyNotify) bt_object_put_ref_no_null_check);
        if (!graph->interrupters) {
                BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate one GPtrArray.");
                goto error;
@@ -1622,7 +1622,7 @@ enum bt_graph_add_interrupter_status bt_graph_add_interrupter(
        BT_ASSERT_PRE_NON_NULL(graph, "Graph");
        BT_ASSERT_PRE_NON_NULL(intr, "Interrupter");
        g_ptr_array_add(graph->interrupters, (void *) intr);
-       bt_object_get_no_null_check(intr);
+       bt_object_get_ref_no_null_check(intr);
        BT_LIB_LOGD("Added interrupter to graph: %![graph-]+g, %![intr-]+z",
                graph, intr);
        return BT_FUNC_STATUS_OK;

diff --git a/src/lib/graph/iterator.c b/src/lib/graph/iterator.c
index 29cf279d691d5b68f49a668743ca2d28646adb50..80de80ee543fb28512562e6f7c26bbe216347db1 100644 (file)
--- a/src/lib/graph/iterator.c
+++ b/src/lib/graph/iterator.c
@@ -137,7 +137,7 @@ void bt_self_component_port_input_message_iterator_destroy(struct bt_object *obj
 
        if (iterator->auto_seek.msgs) {
                while (!g_queue_is_empty(iterator->auto_seek.msgs)) {
-                       bt_object_put_no_null_check(
+                       bt_object_put_ref_no_null_check(
                                g_queue_pop_tail(iterator->auto_seek.msgs));
                }
 
@@ -1524,7 +1524,7 @@ skip_msg:
                break;
        }
 
-       bt_object_put_no_null_check(msg);
+       bt_object_put_ref_no_null_check(msg);
        msg = NULL;
        goto end;
 
@@ -1624,7 +1624,7 @@ int find_message_ge_ns_from_origin(
 end:
        for (i = 0; i < user_count; i++) {
                if (messages[i]) {
-                       bt_object_put_no_null_check(messages[i]);
+                       bt_object_put_ref_no_null_check(messages[i]);
                }
        }
 
@@ -1820,7 +1820,7 @@ bt_self_component_port_input_message_iterator_seek_ns_from_origin(
                 * message queue.
                 */
                while (!g_queue_is_empty(iterator->auto_seek.msgs)) {
-                       bt_object_put_no_null_check(
+                       bt_object_put_ref_no_null_check(
                                g_queue_pop_tail(iterator->auto_seek.msgs));
                }
 

diff --git a/src/lib/graph/message/discarded-items.c b/src/lib/graph/message/discarded-items.c
index 957861d1c98d92958ddeb88e951532cc8d6426fc..d83c8820d5d0aed18766bbbdbd92fe98b2692db3 100644 (file)
--- a/src/lib/graph/message/discarded-items.c
+++ b/src/lib/graph/message/discarded-items.c
@@ -121,7 +121,7 @@ struct bt_message *create_discarded_items_message(
        bt_message_init(&message->parent, type,
                destroy_discarded_items_message, NULL);
        message->stream = stream;
-       bt_object_get_no_null_check(message->stream);
+       bt_object_get_ref_no_null_check(message->stream);
 
        if (with_cs) {
                BT_ASSERT(stream_class->default_clock_class);

diff --git a/src/lib/graph/message/packet.c b/src/lib/graph/message/packet.c
index 56808d0e477d5a54e5f335bf2ac2776fcb0f2d64..d8134e824dbb6e1f7ed991b7ce7301dc5a00a400 100644 (file)
--- a/src/lib/graph/message/packet.c
+++ b/src/lib/graph/message/packet.c
@@ -143,7 +143,7 @@ struct bt_message *create_packet_message(
                message->default_cs = bt_clock_snapshot_create(
                        stream_class->default_clock_class);
                if (!message->default_cs) {
-                       bt_object_put_no_null_check(message);
+                       bt_object_put_ref_no_null_check(message);
                        message = NULL;
                        goto end;
                }
@@ -153,7 +153,7 @@ struct bt_message *create_packet_message(
 
        BT_ASSERT(!message->packet);
        message->packet = packet;
-       bt_object_get_no_null_check_no_parent_check(
+       bt_object_get_ref_no_null_check_no_parent_check(
                &message->packet->base);
        bt_packet_set_is_frozen(packet, true);
        BT_LIB_LOGD("Created packet message object: "
@@ -237,7 +237,7 @@ void recycle_packet_message(struct bt_message *msg, struct bt_object_pool *pool)
 
        BT_LIB_LOGD("Recycling packet message: %!+n", msg);
        bt_message_reset(msg);
-       bt_object_put_no_null_check(&packet_msg->packet->base);
+       bt_object_put_ref_no_null_check(&packet_msg->packet->base);
 
        if (packet_msg->default_cs) {
                bt_clock_snapshot_recycle(packet_msg->default_cs);

diff --git a/src/lib/graph/message/stream.c b/src/lib/graph/message/stream.c
index 0cb1bff7280d0a04cc66a7fcf1e857dc88ce8441..8ff1937e15f94ed485b736273e689a56f310aae1 100644 (file)
--- a/src/lib/graph/message/stream.c
+++ b/src/lib/graph/message/stream.c
@@ -83,7 +83,7 @@ struct bt_message *create_stream_message(
        bt_message_init(&message->parent, type,
                destroy_stream_message, NULL);
        message->stream = stream;
-       bt_object_get_no_null_check(message->stream);
+       bt_object_get_ref_no_null_check(message->stream);
 
        if (stream_class->default_clock_class) {
                message->default_cs = bt_clock_snapshot_create(

diff --git a/src/lib/graph/query-executor.c b/src/lib/graph/query-executor.c
index efd6b51f6fefec49e64e26340e855cf41233605f..406a38c6193066fa8a6f1a16ad5a2ff2a431ed06 100644 (file)
--- a/src/lib/graph/query-executor.c
+++ b/src/lib/graph/query-executor.c
@@ -87,7 +87,7 @@ struct bt_query_executor *bt_query_executor_create_with_method_data(
        }
 
        query_exec->interrupters = g_ptr_array_new_with_free_func(
-               (GDestroyNotify) bt_object_put_no_null_check);
+               (GDestroyNotify) bt_object_put_ref_no_null_check);
        if (!query_exec->interrupters) {
                BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate one GPtrArray.");
                BT_OBJECT_PUT_REF_AND_RESET(query_exec);
@@ -110,7 +110,7 @@ struct bt_query_executor *bt_query_executor_create_with_method_data(
        }
 
        query_exec->comp_cls = comp_cls;
-       bt_object_get_no_null_check(query_exec->comp_cls);
+       bt_object_get_ref_no_null_check(query_exec->comp_cls);
 
        if (!params) {
                query_exec->params = bt_value_null;
@@ -118,7 +118,7 @@ struct bt_query_executor *bt_query_executor_create_with_method_data(
                query_exec->params = params;
        }
 
-       bt_object_get_no_null_check(query_exec->params);
+       bt_object_get_ref_no_null_check(query_exec->params);
        query_exec->method_data = method_data;
        query_exec->log_level = BT_LOGGING_LEVEL_NONE;
        bt_query_executor_add_interrupter(query_exec,
@@ -258,7 +258,7 @@ enum bt_query_executor_add_interrupter_status bt_query_executor_add_interrupter(
        BT_ASSERT_PRE_NON_NULL(query_exec, "Query executor");
        BT_ASSERT_PRE_NON_NULL(intr, "Interrupter");
        g_ptr_array_add(query_exec->interrupters, (void *) intr);
-       bt_object_get_no_null_check(intr);
+       bt_object_get_ref_no_null_check(intr);
        BT_LIB_LOGD("Added interrupter to query executor: "
                "query-exec-addr=%p, %![intr-]+z",
                query_exec, intr);

diff --git a/src/lib/object.h b/src/lib/object.h
index 75c13e1571e00e96d6056ca870329518f3d8aabc..25240b2000b2510074eaee8fcae143d4abb234ac 100644 (file)
--- a/src/lib/object.h
+++ b/src/lib/object.h
@@ -47,10 +47,10 @@ typedef void (*bt_object_parent_is_owner_listener_func)(
                struct bt_object *);
 
 static inline
-void bt_object_get_no_null_check(const void *obj);
+void bt_object_get_ref_no_null_check(const void *obj);
 
 static inline
-void bt_object_put_no_null_check(const void *obj);
+void bt_object_put_ref_no_null_check(const void *obj);
 
 /*
  * Babeltrace object base.
@@ -126,7 +126,7 @@ struct bt_object *bt_object_get_parent(const struct bt_object *c_obj)
        struct bt_object *parent = bt_object_borrow_parent(obj);
 
        if (parent) {
-               bt_object_get_no_null_check(parent);
+               bt_object_get_ref_no_null_check(parent);
        }
 
        return parent;
@@ -152,10 +152,10 @@ void bt_object_set_parent(struct bt_object *child, struct bt_object *parent)
        if (parent) {
                BT_ASSERT(!child->parent);
                child->parent = parent;
-               bt_object_get_no_null_check(parent);
+               bt_object_get_ref_no_null_check(parent);
        } else {
                if (child->parent) {
-                       bt_object_put_no_null_check(child->parent);
+                       bt_object_put_ref_no_null_check(child->parent);
                }
 
                child->parent = NULL;
@@ -203,7 +203,7 @@ void bt_object_with_parent_release_func(struct bt_object *obj)
                }
 
                /* The release function will be invoked by the parent. */
-               bt_object_put_no_null_check(parent);
+               bt_object_put_ref_no_null_check(parent);
        } else {
                bt_object_try_spec_release(obj);
        }
@@ -268,7 +268,7 @@ void bt_object_inc_ref_count(const struct bt_object *c_obj)
 }
 
 static inline
-void bt_object_get_no_null_check_no_parent_check(const struct bt_object *c_obj)
+void bt_object_get_ref_no_null_check_no_parent_check(const struct bt_object *c_obj)
 {
        struct bt_object *obj = (void *) c_obj;
 
@@ -286,7 +286,7 @@ void bt_object_get_no_null_check_no_parent_check(const struct bt_object *c_obj)
 }
 
 static inline
-void bt_object_get_no_null_check(const void *c_obj)
+void bt_object_get_ref_no_null_check(const void *c_obj)
 {
        struct bt_object *obj = (void *) c_obj;
 
@@ -299,7 +299,7 @@ void bt_object_get_no_null_check(const void *c_obj)
                        "addr=%p, parent-addr=%p", obj, obj->parent);
 #endif
 
-               bt_object_get_no_null_check(obj->parent);
+               bt_object_get_ref_no_null_check(obj->parent);
        }
 
 #ifdef _BT_OBJECT_LOGGING_ENABLED
@@ -313,7 +313,7 @@ void bt_object_get_no_null_check(const void *c_obj)
 }
 
 static inline
-void bt_object_put_no_null_check(const void *c_obj)
+void bt_object_put_ref_no_null_check(const void *c_obj)
 {
        struct bt_object *obj = (void *) c_obj;
 
@@ -349,7 +349,7 @@ void bt_object_get_ref(const void *ptr)
        BT_ASSERT_PRE_DEV(obj->is_shared, "Object is not shared: %!+O", obj);
 #endif
 
-       bt_object_get_no_null_check(obj);
+       bt_object_get_ref_no_null_check(obj);
 }
 
 static inline
@@ -367,7 +367,7 @@ void bt_object_put_ref(const void *ptr)
                "Decrementing a reference count set to 0: %!+O", ptr);
 #endif
 
-       bt_object_put_no_null_check(obj);
+       bt_object_put_ref_no_null_check(obj);
 }
 
 #define BT_OBJECT_PUT_REF_AND_RESET(_var)      \

diff --git a/src/lib/plugin/plugin-so.c b/src/lib/plugin/plugin-so.c
index b33f2053b92c583cd2885c7ef6decec202e07d58..00e51b504104c7ecb6de022323ea5fcb2345598f 100644 (file)
--- a/src/lib/plugin/plugin-so.c
+++ b/src/lib/plugin/plugin-so.c
@@ -1250,7 +1250,7 @@ struct bt_plugin *bt_plugin_so_create_empty(
 
        spec = plugin->spec_data;
        spec->shared_lib_handle = shared_lib_handle;
-       bt_object_get_no_null_check(spec->shared_lib_handle);
+       bt_object_get_ref_no_null_check(spec->shared_lib_handle);
        goto end;
 
 error:
@@ -1722,7 +1722,7 @@ void bt_plugin_so_on_add_component_class(struct bt_plugin *plugin,
 
        bt_list_add(&comp_class->node, &component_class_list);
        comp_class->so_handle = spec->shared_lib_handle;
-       bt_object_get_no_null_check(comp_class->so_handle);
+       bt_object_get_ref_no_null_check(comp_class->so_handle);
 
        /* Add our custom destroy listener */
        bt_component_class_add_destroy_listener(comp_class,

diff --git a/src/lib/plugin/plugin.c b/src/lib/plugin/plugin.c
index 8a54052740e679644da7afb063189c6d8931547e..193adcaf7255f8d637e5d5e71041078f8fc26db4 100644 (file)
--- a/src/lib/plugin/plugin.c
+++ b/src/lib/plugin/plugin.c
@@ -481,7 +481,7 @@ enum bt_plugin_find_status bt_plugin_find(const char *plugin_name,
 
                if (strcmp(plugin->info.name->str, plugin_name) == 0) {
                        *plugin_out = plugin;
-                       bt_object_get_no_null_check(*plugin_out);
+                       bt_object_get_ref_no_null_check(*plugin_out);
                        goto end;
                }
        }

diff --git a/src/lib/trace-ir/clock-class.c b/src/lib/trace-ir/clock-class.c
index e982ad7f0fafc74e48ba733db4635508f15c1d4e..c394454816039304a376d3bcf34bd27c44f1b58b 100644 (file)
--- a/src/lib/trace-ir/clock-class.c
+++ b/src/lib/trace-ir/clock-class.c
@@ -338,9 +338,9 @@ void bt_clock_class_set_user_attributes(
        BT_ASSERT_PRE(user_attributes->type == BT_VALUE_TYPE_MAP,
                "User attributes object is not a map value object.");
        BT_ASSERT_PRE_DEV_CLOCK_CLASS_HOT(clock_class);
-       bt_object_put_no_null_check(clock_class->user_attributes);
+       bt_object_put_ref_no_null_check(clock_class->user_attributes);
        clock_class->user_attributes = (void *) user_attributes;
-       bt_object_get_no_null_check(clock_class->user_attributes);
+       bt_object_get_ref_no_null_check(clock_class->user_attributes);
 }
 
 void bt_clock_class_get_ref(const struct bt_clock_class *clock_class)

diff --git a/src/lib/trace-ir/clock-snapshot.c b/src/lib/trace-ir/clock-snapshot.c
index 29b248e95c64f53451f1fe1f9edfe517a8934bbe..2762332681acba7f0e7f3430312054334a09fbb5 100644 (file)
--- a/src/lib/trace-ir/clock-snapshot.c
+++ b/src/lib/trace-ir/clock-snapshot.c
@@ -63,7 +63,7 @@ struct bt_clock_snapshot *bt_clock_snapshot_new(
 
        bt_object_init_unique(&ret->base);
        ret->clock_class = clock_class;
-       bt_object_get_no_null_check(clock_class);
+       bt_object_get_ref_no_null_check(clock_class);
        bt_clock_class_freeze(clock_class);
        BT_LIB_LOGD("Created clock snapshot object: %!+k", ret);
 
@@ -88,7 +88,7 @@ struct bt_clock_snapshot *bt_clock_snapshot_create(
 
        if (G_LIKELY(!clock_snapshot->clock_class)) {
                clock_snapshot->clock_class = clock_class;
-               bt_object_get_no_null_check(clock_class);
+               bt_object_get_ref_no_null_check(clock_class);
        }
 
 end:

diff --git a/src/lib/trace-ir/event-class.c b/src/lib/trace-ir/event-class.c
index ae7653e93a7679e662fe4e4c08b0dff69d6c7fcd..464dd00f3d26416da025407b497c929e5d6b8328 100644 (file)
--- a/src/lib/trace-ir/event-class.c
+++ b/src/lib/trace-ir/event-class.c
@@ -330,7 +330,7 @@ bt_event_class_set_specific_context_field_class(
        bt_field_class_make_part_of_trace_class(field_class);
        bt_object_put_ref(event_class->specific_context_fc);
        event_class->specific_context_fc = field_class;
-       bt_object_get_no_null_check(event_class->specific_context_fc);
+       bt_object_get_ref_no_null_check(event_class->specific_context_fc);
        bt_field_class_freeze(field_class);
        BT_LIB_LOGD("Set event class's specific context field class: %!+E",
                event_class);
@@ -395,7 +395,7 @@ bt_event_class_set_payload_field_class(
        bt_field_class_make_part_of_trace_class(field_class);
        bt_object_put_ref(event_class->payload_fc);
        event_class->payload_fc = field_class;
-       bt_object_get_no_null_check(event_class->payload_fc);
+       bt_object_get_ref_no_null_check(event_class->payload_fc);
        bt_field_class_freeze(field_class);
        BT_LIB_LOGD("Set event class's payload field class: %!+E", event_class);
 
@@ -438,9 +438,9 @@ void bt_event_class_set_user_attributes(
        BT_ASSERT_PRE(user_attributes->type == BT_VALUE_TYPE_MAP,
                "User attributes object is not a map value object.");
        BT_ASSERT_PRE_DEV_EVENT_CLASS_HOT(event_class);
-       bt_object_put_no_null_check(event_class->user_attributes);
+       bt_object_put_ref_no_null_check(event_class->user_attributes);
        event_class->user_attributes = (void *) user_attributes;
-       bt_object_get_no_null_check(event_class->user_attributes);
+       bt_object_get_ref_no_null_check(event_class->user_attributes);
 }
 
 void bt_event_class_get_ref(const struct bt_event_class *event_class)

diff --git a/src/lib/trace-ir/event.h b/src/lib/trace-ir/event.h
index fff20d762c0bb7a6f1820bc33b52b98b3379e4be..55cdd0072dcb63ef54de6ccb389c3c84375aca34 100644 (file)
--- a/src/lib/trace-ir/event.h
+++ b/src/lib/trace-ir/event.h
@@ -121,11 +121,11 @@ void bt_event_reset(struct bt_event *event)
        BT_ASSERT(event);
        BT_LIB_LOGD("Resetting event: %!+e", event);
        bt_event_set_is_frozen(event, false);
-       bt_object_put_no_null_check(&event->stream->base);
+       bt_object_put_ref_no_null_check(&event->stream->base);
        event->stream = NULL;
 
        if (event->packet) {
-               bt_object_put_no_null_check(&event->packet->base);
+               bt_object_put_ref_no_null_check(&event->packet->base);
                event->packet = NULL;
        }
 }
@@ -165,7 +165,7 @@ void bt_event_recycle(struct bt_event *event)
        BT_ASSERT(event_class);
        event->class = NULL;
        bt_object_pool_recycle_object(&event_class->event_pool, event);
-       bt_object_put_no_null_check(&event_class->base);
+       bt_object_put_ref_no_null_check(&event_class->base);
 }
 
 static inline
@@ -181,7 +181,7 @@ void bt_event_set_packet(struct bt_event *event, struct bt_packet *packet)
        BT_ASSERT(event->stream->class->supports_packets);
        BT_ASSERT(!event->packet);
        event->packet = packet;
-       bt_object_get_no_null_check_no_parent_check(&event->packet->base);
+       bt_object_get_ref_no_null_check_no_parent_check(&event->packet->base);
        BT_LIB_LOGD("Set event's packet: %![event-]+e, %![packet-]+a",
                event, packet);
 }
@@ -198,7 +198,7 @@ void bt_event_set_stream(struct bt_event *event, struct bt_stream *stream)
                "%![event-]+e, %![stream-]+s", event, stream);
        BT_ASSERT(!event->stream);
        event->stream = stream;
-       bt_object_get_no_null_check_no_parent_check(&event->stream->base);
+       bt_object_get_ref_no_null_check_no_parent_check(&event->stream->base);
        BT_LIB_LOGD("Set event's stream: %![event-]+e, %![stream-]+s",
                event, stream);
 }
@@ -221,7 +221,7 @@ struct bt_event *bt_event_create(struct bt_event_class *event_class,
 
        if (G_LIKELY(!event->class)) {
                event->class = event_class;
-               bt_object_get_no_null_check(&event_class->base);
+               bt_object_get_ref_no_null_check(&event_class->base);
        }
 
        bt_event_set_stream(event, stream);

diff --git a/src/lib/trace-ir/field-class.c b/src/lib/trace-ir/field-class.c
index 293687509e17b419ebd37b5eceb9d34b25195c8a..f02ce45c45f2b98bc273ab84e2cd638772003a55 100644 (file)
--- a/src/lib/trace-ir/field-class.c
+++ b/src/lib/trace-ir/field-class.c
@@ -898,7 +898,7 @@ int init_named_field_class(struct bt_named_field_class *named_fc,
        }
 
        named_fc->fc = fc;
-       bt_object_get_no_null_check(named_fc->fc);
+       bt_object_get_ref_no_null_check(named_fc->fc);
 
 end:
        return status;
@@ -954,7 +954,7 @@ create_variant_with_selector_option(
        }
 
        opt->range_set = range_set;
-       bt_object_get_no_null_check(opt->range_set);
+       bt_object_get_ref_no_null_check(opt->range_set);
        bt_integer_range_set_freeze(range_set);
        goto end;
 
@@ -1216,7 +1216,7 @@ struct bt_field_class *create_option_field_class(
                }
 
                opt_with_sel_fc->selector_fc = selector_fc;
-               bt_object_get_no_null_check(opt_with_sel_fc->selector_fc);
+               bt_object_get_ref_no_null_check(opt_with_sel_fc->selector_fc);
                opt_fc = (void *) opt_with_sel_fc;
        } else {
                opt_fc = g_new0(struct bt_field_class_option, 1);
@@ -1235,7 +1235,7 @@ struct bt_field_class *create_option_field_class(
        }
 
        opt_fc->content_fc = content_fc;
-       bt_object_get_no_null_check(opt_fc->content_fc);
+       bt_object_get_ref_no_null_check(opt_fc->content_fc);
        bt_field_class_freeze(opt_fc->content_fc);
 
        if (selector_fc) {
@@ -1303,7 +1303,7 @@ bt_field_class_option_with_selector_integer_unsigned_create(
        }
 
        fc->range_set = range_set;
-       bt_object_get_no_null_check(fc->range_set);
+       bt_object_get_ref_no_null_check(fc->range_set);
        bt_integer_range_set_freeze(range_set);
 
 end:
@@ -1333,7 +1333,7 @@ bt_field_class_option_with_selector_integer_signed_create(
        }
 
        fc->range_set = range_set;
-       bt_object_get_no_null_check(fc->range_set);
+       bt_object_get_ref_no_null_check(fc->range_set);
        bt_integer_range_set_freeze(range_set);
 
 end:
@@ -1495,7 +1495,7 @@ struct bt_field_class *bt_field_class_variant_create(
                }
 
                var_with_sel_fc->selector_fc = selector_fc;
-               bt_object_get_no_null_check(var_with_sel_fc->selector_fc);
+               bt_object_get_ref_no_null_check(var_with_sel_fc->selector_fc);
                bt_field_class_freeze(selector_fc);
                var_fc = (void *) var_with_sel_fc;
        } else {
@@ -1902,7 +1902,7 @@ int init_array_field_class(struct bt_field_class_array *fc,
        }
 
        fc->element_fc = element_fc;
-       bt_object_get_no_null_check(fc->element_fc);
+       bt_object_get_ref_no_null_check(fc->element_fc);
        bt_field_class_freeze(element_fc);
 
 end:
@@ -2033,7 +2033,7 @@ struct bt_field_class *bt_field_class_array_dynamic_create(
                BT_ASSERT_PRE_FC_IS_UNSIGNED_INT(length_fc,
                        "Length field class");
                array_fc->length_fc = length_fc;
-               bt_object_get_no_null_check(array_fc->length_fc);
+               bt_object_get_ref_no_null_check(array_fc->length_fc);
                bt_field_class_freeze(length_fc);
        }
 
@@ -2208,9 +2208,9 @@ void bt_field_class_set_user_attributes(
        BT_ASSERT_PRE(user_attributes->type == BT_VALUE_TYPE_MAP,
                "User attributes object is not a map value object.");
        BT_ASSERT_PRE_DEV_FC_HOT(fc, "Field class");
-       bt_object_put_no_null_check(fc->user_attributes);
+       bt_object_put_ref_no_null_check(fc->user_attributes);
        fc->user_attributes = (void *) user_attributes;
-       bt_object_get_no_null_check(fc->user_attributes);
+       bt_object_get_ref_no_null_check(fc->user_attributes);
 }
 
 static
@@ -2231,9 +2231,9 @@ void bt_named_field_class_set_user_attributes(
        BT_ASSERT_PRE_DEV_HOT(named_fc,
                "Structure field class member or variant field class option",
                ".");
-       bt_object_put_no_null_check(named_fc->user_attributes);
+       bt_object_put_ref_no_null_check(named_fc->user_attributes);
        named_fc->user_attributes = (void *) user_attributes;
-       bt_object_get_no_null_check(named_fc->user_attributes);
+       bt_object_get_ref_no_null_check(named_fc->user_attributes);
 }
 
 const struct bt_value *

diff --git a/src/lib/trace-ir/field.c b/src/lib/trace-ir/field.c
index f1d31ea9327761725b934d532542dce3323beb9e..7f2225ddef8496d4e64da8ad2231e21a12273e87 100644 (file)
--- a/src/lib/trace-ir/field.c
+++ b/src/lib/trace-ir/field.c
@@ -293,7 +293,7 @@ void init_field(struct bt_field *field, struct bt_field_class *fc,
        bt_object_init_unique(&field->base);
        field->methods = methods;
        field->class = fc;
-       bt_object_get_no_null_check(fc);
+       bt_object_get_ref_no_null_check(fc);
 }
 
 static

diff --git a/src/lib/trace-ir/packet.c b/src/lib/trace-ir/packet.c
index 78fb18a2a80f321f2b65c2b7a83181c81c09d930..e3fdf5bbb62e4b5154402add3ee90fa652dc36c0 100644 (file)
--- a/src/lib/trace-ir/packet.c
+++ b/src/lib/trace-ir/packet.c
@@ -144,7 +144,7 @@ void bt_packet_recycle(struct bt_packet *packet)
        BT_ASSERT(stream);
        packet->stream = NULL;
        bt_object_pool_recycle_object(&stream->packet_pool, packet);
-       bt_object_put_no_null_check(&stream->base);
+       bt_object_put_ref_no_null_check(&stream->base);
 }
 
 BT_HIDDEN
@@ -187,7 +187,7 @@ struct bt_packet *bt_packet_new(struct bt_stream *stream)
        bt_object_init_shared(&packet->base,
                (bt_object_release_func) bt_packet_recycle);
        packet->stream = stream;
-       bt_object_get_no_null_check(stream);
+       bt_object_get_ref_no_null_check(stream);
        trace_class = bt_stream_class_borrow_trace_class_inline(stream->class);
        BT_ASSERT(trace_class);
 
@@ -232,7 +232,7 @@ struct bt_packet *bt_packet_create(const struct bt_stream *c_stream)
 
        if (G_LIKELY(!packet->stream)) {
                packet->stream = stream;
-               bt_object_get_no_null_check_no_parent_check(
+               bt_object_get_ref_no_null_check_no_parent_check(
                        &packet->stream->base);
        }
 

diff --git a/src/lib/trace-ir/stream-class.c b/src/lib/trace-ir/stream-class.c
index 1afd6e8b7a2702bb6e1618b914346a32007c125a..c87978b5a19e5c92ad1287ad99161fb2571f1f72 100644 (file)
--- a/src/lib/trace-ir/stream-class.c
+++ b/src/lib/trace-ir/stream-class.c
@@ -339,7 +339,7 @@ bt_stream_class_set_packet_context_field_class(
        bt_field_class_make_part_of_trace_class(field_class);
        bt_object_put_ref(stream_class->packet_context_fc);
        stream_class->packet_context_fc = field_class;
-       bt_object_get_no_null_check(stream_class->packet_context_fc);
+       bt_object_get_ref_no_null_check(stream_class->packet_context_fc);
        bt_field_class_freeze(field_class);
        BT_LIB_LOGD("Set stream class's packet context field class: %!+S",
                stream_class);
@@ -399,7 +399,7 @@ bt_stream_class_set_event_common_context_field_class(
        bt_field_class_make_part_of_trace_class(field_class);
        bt_object_put_ref(stream_class->event_common_context_fc);
        stream_class->event_common_context_fc = field_class;
-       bt_object_get_no_null_check(stream_class->event_common_context_fc);
+       bt_object_get_ref_no_null_check(stream_class->event_common_context_fc);
        bt_field_class_freeze(field_class);
        BT_LIB_LOGD("Set stream class's event common context field class: %!+S",
                stream_class);
@@ -430,7 +430,7 @@ bt_stream_class_set_default_clock_class(
        BT_ASSERT_PRE_DEV_STREAM_CLASS_HOT(stream_class);
        bt_object_put_ref(stream_class->default_clock_class);
        stream_class->default_clock_class = clock_class;
-       bt_object_get_no_null_check(stream_class->default_clock_class);
+       bt_object_get_ref_no_null_check(stream_class->default_clock_class);
        bt_clock_class_freeze(clock_class);
        BT_LIB_LOGD("Set stream class's default clock class: %!+S",
                stream_class);
@@ -641,9 +641,9 @@ void bt_stream_class_set_user_attributes(
        BT_ASSERT_PRE(user_attributes->type == BT_VALUE_TYPE_MAP,
                "User attributes object is not a map value object.");
        BT_ASSERT_PRE_DEV_STREAM_CLASS_HOT(stream_class);
-       bt_object_put_no_null_check(stream_class->user_attributes);
+       bt_object_put_ref_no_null_check(stream_class->user_attributes);
        stream_class->user_attributes = (void *) user_attributes;
-       bt_object_get_no_null_check(stream_class->user_attributes);
+       bt_object_get_ref_no_null_check(stream_class->user_attributes);
 }
 
 void bt_stream_class_get_ref(const struct bt_stream_class *stream_class)

diff --git a/src/lib/trace-ir/stream.c b/src/lib/trace-ir/stream.c
index c567768fe03f47669ba15781e251f5cf9752cc14..74bbc933777907c0c6cede908195f0a301c7a8e0 100644 (file)
--- a/src/lib/trace-ir/stream.c
+++ b/src/lib/trace-ir/stream.c
@@ -145,7 +145,7 @@ 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_object_get_ref_no_null_check(stream_class);
 
        /* bt_trace_add_stream() sets the parent trace, and freezes the trace */
        bt_trace_add_stream(trace, stream);
@@ -265,9 +265,9 @@ void bt_stream_set_user_attributes(struct bt_stream *stream,
        BT_ASSERT_PRE(user_attributes->type == BT_VALUE_TYPE_MAP,
                "User attributes object is not a map value object.");
        BT_ASSERT_PRE_DEV_STREAM_HOT(stream);
-       bt_object_put_no_null_check(stream->user_attributes);
+       bt_object_put_ref_no_null_check(stream->user_attributes);
        stream->user_attributes = (void *) user_attributes;
-       bt_object_get_no_null_check(stream->user_attributes);
+       bt_object_get_ref_no_null_check(stream->user_attributes);
 }
 
 void bt_stream_get_ref(const struct bt_stream *stream)

diff --git a/src/lib/trace-ir/trace-class.c b/src/lib/trace-ir/trace-class.c
index cd5d6f829563a77dfe947950afe5e90b7aabe680..fb9f8a5a4557c98dd539b7e24d180cae879421b5 100644 (file)
--- a/src/lib/trace-ir/trace-class.c
+++ b/src/lib/trace-ir/trace-class.c
@@ -336,9 +336,9 @@ void bt_trace_class_set_user_attributes(struct bt_trace_class *trace_class,
        BT_ASSERT_PRE(user_attributes->type == BT_VALUE_TYPE_MAP,
                "User attributes object is not a map value object.");
        BT_ASSERT_PRE_DEV_TRACE_CLASS_HOT(trace_class);
-       bt_object_put_no_null_check(trace_class->user_attributes);
+       bt_object_put_ref_no_null_check(trace_class->user_attributes);
        trace_class->user_attributes = (void *) user_attributes;
-       bt_object_get_no_null_check(trace_class->user_attributes);
+       bt_object_get_ref_no_null_check(trace_class->user_attributes);
 }
 
 void bt_trace_class_get_ref(const struct bt_trace_class *trace_class)

diff --git a/src/lib/trace-ir/trace.c b/src/lib/trace-ir/trace.c
index 9891d12b224dc53131fc94f0f863b11e0802dd11..72493a48589441a641955a7d2da9d0011f86ba1e 100644 (file)
--- a/src/lib/trace-ir/trace.c
+++ b/src/lib/trace-ir/trace.c
@@ -196,7 +196,7 @@ struct bt_trace *bt_trace_create(struct bt_trace_class *tc)
        }
 
        trace->class = tc;
-       bt_object_get_no_null_check(trace->class);
+       bt_object_get_ref_no_null_check(trace->class);
        BT_LIB_LOGD("Created trace object: %!+t", trace);
        goto end;
 
@@ -568,9 +568,9 @@ void bt_trace_set_user_attributes(
        BT_ASSERT_PRE(user_attributes->type == BT_VALUE_TYPE_MAP,
                "User attributes object is not a map value object.");
        BT_ASSERT_PRE_DEV_TRACE_HOT(trace);
-       bt_object_put_no_null_check(trace->user_attributes);
+       bt_object_put_ref_no_null_check(trace->user_attributes);
        trace->user_attributes = (void *) user_attributes;
-       bt_object_get_no_null_check(trace->user_attributes);
+       bt_object_get_ref_no_null_check(trace->user_attributes);
 }
 
 void bt_trace_get_ref(const struct bt_trace *trace)

diff --git a/src/lib/value.c b/src/lib/value.c
index 4009def73f9f90b13d1b7864e679ccbdf92e72b9..c8865ebc05c2d37eb451a3ccbb6bf1acdd920073 100644 (file)
--- a/src/lib/value.c
+++ b/src/lib/value.c
@@ -138,7 +138,7 @@ struct bt_value *bt_value_null_copy(const struct bt_value *null_obj)
 {
        BT_ASSERT(null_obj == bt_value_null);
 
-       bt_object_get_no_null_check(bt_value_null);
+       bt_object_get_ref_no_null_check(bt_value_null);
        return (void *) bt_value_null;
 }