X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Ftrace-ir%2Ftrace.c;h=bd20f9fbda343e48689edf140573574d02eaa8da;hb=867eb7632255f6a84234542198bd7edaac1bce12;hp=9891d12b224dc53131fc94f0f863b11e0802dd11;hpb=c6962c968f7467ce8f7e880e7de3797139314f9f;p=babeltrace.git diff --git a/src/lib/trace-ir/trace.c b/src/lib/trace-ir/trace.c index 9891d12b..bd20f9fb 100644 --- a/src/lib/trace-ir/trace.c +++ b/src/lib/trace-ir/trace.c @@ -1,38 +1,20 @@ /* + * SPDX-License-Identifier: MIT + * * Copyright 2017-2018 Philippe Proulx * Copyright 2014 Jérémie Galarneau - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. */ #define BT_LOG_TAG "LIB/TRACE" #include "lib/logging.h" -#include "lib/assert-pre.h" +#include "lib/assert-cond.h" #include -#include #include #include "ctf-writer/functor.h" #include "ctf-writer/clock.h" #include "compat/compiler.h" #include -#include #include "lib/value.h" #include #include "compat/endian.h" @@ -41,6 +23,7 @@ #include #include #include +#include #include #include "attributes.h" @@ -63,8 +46,11 @@ struct bt_trace_destruction_listener_elem { void *data; }; -#define BT_ASSERT_PRE_DEV_TRACE_HOT(_trace) \ - BT_ASSERT_PRE_DEV_HOT((_trace), "Trace", ": %!+t", (_trace)) +#define BT_ASSERT_PRE_DEV_TRACE_HOT(_trace) \ + BT_ASSERT_PRE_DEV_HOT("trace", (_trace), "Trace", ": %!+t", (_trace)) + +#define DESTRUCTION_LISTENER_FUNC_NAME \ + "bt_trace_class_destruction_listener_func" static void destroy_trace(struct bt_object *obj) @@ -80,6 +66,8 @@ void destroy_trace(struct bt_object *obj) */ if (trace->destruction_listeners) { uint64_t i; + const struct bt_error *saved_error; + BT_LIB_LOGD("Calling trace destruction listener(s): %!+t", trace); /* @@ -94,24 +82,36 @@ void destroy_trace(struct bt_object *obj) */ trace->base.ref_count++; + saved_error = bt_current_thread_take_error(); + /* Call all the trace destruction listeners */ for (i = 0; i < trace->destruction_listeners->len; i++) { struct bt_trace_destruction_listener_elem elem = g_array_index(trace->destruction_listeners, - struct bt_trace_destruction_listener_elem, i); + struct bt_trace_destruction_listener_elem, i); if (elem.func) { elem.func(trace, elem.data); + BT_ASSERT_POST_NO_ERROR( + DESTRUCTION_LISTENER_FUNC_NAME); } /* * The destruction listener should not have kept a * reference to the trace. */ - BT_ASSERT_PRE(trace->base.ref_count == 1, "Destruction listener kept a reference to the trace being destroyed: %![trace-]+t", trace); + BT_ASSERT_POST(DESTRUCTION_LISTENER_FUNC_NAME, + "trace-reference-count-not-changed", + trace->base.ref_count == 1, + "Destruction listener kept a reference to the trace being destroyed: %![trace-]+t", + trace); } g_array_free(trace->destruction_listeners, TRUE); trace->destruction_listeners = NULL; + + if (saved_error) { + BT_CURRENT_THREAD_MOVE_ERROR_AND_RESET(saved_error); + } } if (trace->name.str) { @@ -147,6 +147,8 @@ struct bt_trace *bt_trace_create(struct bt_trace_class *tc) { struct bt_trace *trace = NULL; + BT_ASSERT_PRE_NO_ERROR(); + BT_LIB_LOGD("Creating trace object: %![tc-]+T", tc); trace = g_new0(struct bt_trace, 1); if (!trace) { @@ -196,7 +198,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; @@ -209,15 +211,16 @@ end: const char *bt_trace_get_name(const struct bt_trace *trace) { - BT_ASSERT_PRE_DEV_NON_NULL(trace, "Trace"); + BT_ASSERT_PRE_DEV_TRACE_NON_NULL(trace); return trace->name.value; } enum bt_trace_set_name_status bt_trace_set_name(struct bt_trace *trace, const char *name) { - BT_ASSERT_PRE_NON_NULL(trace, "Trace"); - BT_ASSERT_PRE_NON_NULL(name, "Name"); + BT_ASSERT_PRE_NO_ERROR(); + BT_ASSERT_PRE_TRACE_NON_NULL(trace); + BT_ASSERT_PRE_NAME_NON_NULL(name); BT_ASSERT_PRE_DEV_TRACE_HOT(trace); g_string_assign(trace->name.str, name); trace->name.value = trace->name.str->str; @@ -227,21 +230,20 @@ enum bt_trace_set_name_status bt_trace_set_name(struct bt_trace *trace, bt_uuid bt_trace_get_uuid(const struct bt_trace *trace) { - BT_ASSERT_PRE_DEV_NON_NULL(trace, "Trace"); + BT_ASSERT_PRE_DEV_TRACE_NON_NULL(trace); return trace->uuid.value; } void bt_trace_set_uuid(struct bt_trace *trace, bt_uuid uuid) { - BT_ASSERT_PRE_NON_NULL(trace, "Trace"); - BT_ASSERT_PRE_NON_NULL(uuid, "UUID"); + BT_ASSERT_PRE_TRACE_NON_NULL(trace); + BT_ASSERT_PRE_UUID_NON_NULL(uuid); BT_ASSERT_PRE_DEV_TRACE_HOT(trace); bt_uuid_copy(trace->uuid.uuid, uuid); trace->uuid.value = trace->uuid.uuid; BT_LIB_LOGD("Set trace's UUID: %!+t", trace); } -BT_ASSERT_FUNC static bool trace_has_environment_entry(const struct bt_trace *trace, const char *name) { @@ -261,8 +263,9 @@ enum bt_trace_set_environment_entry_status set_environment_entry( BT_ASSERT(trace); BT_ASSERT(name); BT_ASSERT(value); - BT_ASSERT_PRE(!trace->frozen || - !trace_has_environment_entry(trace, name), + BT_ASSERT_PRE("not-frozen:trace", + !trace->frozen || + !trace_has_environment_entry(trace, name), "Trace is frozen: cannot replace environment entry: " "%![trace-]+t, entry-name=\"%s\"", trace, name); ret = bt_attributes_set_field_value(trace->environment, name, @@ -287,9 +290,12 @@ bt_trace_set_environment_entry_string( { int ret; struct bt_value *value_obj; - BT_ASSERT_PRE_NON_NULL(trace, "Trace"); - BT_ASSERT_PRE_NON_NULL(name, "Name"); - BT_ASSERT_PRE_NON_NULL(value, "Value"); + + BT_ASSERT_PRE_NO_ERROR(); + BT_ASSERT_PRE_TRACE_NON_NULL(trace); + BT_ASSERT_PRE_NAME_NON_NULL(name); + BT_ASSERT_PRE_NON_NULL("value", value, "Value"); + value_obj = bt_value_string_create_init(value); if (!value_obj) { BT_LIB_LOGE_APPEND_CAUSE( @@ -312,8 +318,11 @@ bt_trace_set_environment_entry_integer( { int ret; struct bt_value *value_obj; - BT_ASSERT_PRE_NON_NULL(trace, "Trace"); - BT_ASSERT_PRE_NON_NULL(name, "Name"); + + BT_ASSERT_PRE_NO_ERROR(); + BT_ASSERT_PRE_TRACE_NON_NULL(trace); + BT_ASSERT_PRE_NAME_NON_NULL(name); + value_obj = bt_value_integer_signed_create_init(value); if (!value_obj) { BT_LIB_LOGE_APPEND_CAUSE( @@ -332,21 +341,18 @@ end: uint64_t bt_trace_get_environment_entry_count(const struct bt_trace *trace) { - int64_t ret; - - BT_ASSERT_PRE_DEV_NON_NULL(trace, "Trace"); - ret = bt_attributes_get_count(trace->environment); - BT_ASSERT(ret >= 0); - return (uint64_t) ret; + BT_ASSERT_PRE_DEV_TRACE_NON_NULL(trace); + return bt_attributes_get_count(trace->environment); } void bt_trace_borrow_environment_entry_by_index_const( const struct bt_trace *trace, uint64_t index, const char **name, const struct bt_value **value) { - BT_ASSERT_PRE_DEV_NON_NULL(trace, "Trace"); - BT_ASSERT_PRE_DEV_NON_NULL(name, "Name"); - BT_ASSERT_PRE_DEV_NON_NULL(value, "Value"); + BT_ASSERT_PRE_DEV_TRACE_NON_NULL(trace); + BT_ASSERT_PRE_DEV_NAME_NON_NULL(name); + BT_ASSERT_PRE_DEV_NON_NULL("value-object-output", value, + "Value object (output)"); BT_ASSERT_PRE_DEV_VALID_INDEX(index, bt_attributes_get_count(trace->environment)); *value = bt_attributes_borrow_field_value(trace->environment, index); @@ -358,22 +364,22 @@ void bt_trace_borrow_environment_entry_by_index_const( const struct bt_value *bt_trace_borrow_environment_entry_value_by_name_const( const struct bt_trace *trace, const char *name) { - BT_ASSERT_PRE_DEV_NON_NULL(trace, "Trace"); - BT_ASSERT_PRE_DEV_NON_NULL(name, "Name"); + BT_ASSERT_PRE_DEV_TRACE_NON_NULL(trace); + BT_ASSERT_PRE_DEV_NAME_NON_NULL(name); return bt_attributes_borrow_field_value_by_name(trace->environment, name); } uint64_t bt_trace_get_stream_count(const struct bt_trace *trace) { - BT_ASSERT_PRE_DEV_NON_NULL(trace, "Trace"); + BT_ASSERT_PRE_DEV_TRACE_NON_NULL(trace); return (uint64_t) trace->streams->len; } struct bt_stream *bt_trace_borrow_stream_by_index( struct bt_trace *trace, uint64_t index) { - BT_ASSERT_PRE_DEV_NON_NULL(trace, "Trace"); + BT_ASSERT_PRE_DEV_TRACE_NON_NULL(trace); BT_ASSERT_PRE_DEV_VALID_INDEX(index, trace->streams->len); return g_ptr_array_index(trace->streams, index); } @@ -390,7 +396,7 @@ struct bt_stream *bt_trace_borrow_stream_by_id(struct bt_trace *trace, struct bt_stream *stream = NULL; uint64_t i; - BT_ASSERT_PRE_DEV_NON_NULL(trace, "Trace"); + BT_ASSERT_PRE_DEV_TRACE_NON_NULL(trace); for (i = 0; i < trace->streams->len; i++) { struct bt_stream *stream_candidate = @@ -424,8 +430,9 @@ enum bt_trace_add_listener_status bt_trace_add_destruction_listener( .data = data, }; - BT_ASSERT_PRE_NON_NULL(trace, "Trace"); - BT_ASSERT_PRE_NON_NULL(listener, "Listener"); + BT_ASSERT_PRE_NO_ERROR(); + BT_ASSERT_PRE_TRACE_NON_NULL(trace); + BT_ASSERT_PRE_LISTENER_FUNC_NON_NULL(listener); /* Find the next available spot */ for (i = 0; i < trace->destruction_listeners->len; i++) { @@ -468,8 +475,10 @@ enum bt_trace_remove_listener_status bt_trace_remove_destruction_listener( struct bt_trace *trace = (void *) c_trace; struct bt_trace_destruction_listener_elem *elem; - BT_ASSERT_PRE_NON_NULL(trace, "Trace"); - BT_ASSERT_PRE(has_listener_id(trace, listener_id), + BT_ASSERT_PRE_NO_ERROR(); + BT_ASSERT_PRE_TRACE_NON_NULL(trace); + BT_ASSERT_PRE("listener-id-exists", + has_listener_id(trace, listener_id), "Trace has no such trace destruction listener ID: " "%![trace-]+t, %" PRIu64, trace, listener_id); elem = &g_array_index(trace->destruction_listeners, @@ -537,7 +546,7 @@ uint64_t bt_trace_get_automatic_stream_id(const struct bt_trace *trace, struct bt_trace_class *bt_trace_borrow_class(struct bt_trace *trace) { - BT_ASSERT_PRE_DEV_NON_NULL(trace, "Trace"); + BT_ASSERT_PRE_DEV_TRACE_NON_NULL(trace); return trace->class; } @@ -550,7 +559,7 @@ const struct bt_trace_class *bt_trace_borrow_class_const( const struct bt_value *bt_trace_borrow_user_attributes_const( const struct bt_trace *trace) { - BT_ASSERT_PRE_DEV_NON_NULL(trace, "Trace"); + BT_ASSERT_PRE_DEV_TRACE_NON_NULL(trace); return trace->user_attributes; } @@ -563,14 +572,13 @@ void bt_trace_set_user_attributes( struct bt_trace *trace, const struct bt_value *user_attributes) { - BT_ASSERT_PRE_NON_NULL(trace, "Trace"); - BT_ASSERT_PRE_NON_NULL(user_attributes, "User attributes"); - BT_ASSERT_PRE(user_attributes->type == BT_VALUE_TYPE_MAP, - "User attributes object is not a map value object."); + BT_ASSERT_PRE_TRACE_NON_NULL(trace); + BT_ASSERT_PRE_USER_ATTRS_NON_NULL(user_attributes); + BT_ASSERT_PRE_USER_ATTRS_IS_MAP(user_attributes); 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)