*/
#define BT_LOG_TAG "LIB/TRACE"
-#include "lib/lib-logging.h"
+#include "lib/logging.h"
#include "lib/assert-pre.h"
#include <babeltrace2/trace-ir/trace.h>
#include "trace-class.h"
#include "trace.h"
#include "utils.h"
+#include "lib/func-status.h"
struct bt_trace_destruction_listener_elem {
bt_trace_destruction_listener_func func;
BT_LIB_LOGD("Creating trace object: %![tc-]+T", tc);
trace = g_new0(struct bt_trace, 1);
if (!trace) {
- BT_LOGE_STR("Failed to allocate one trace.");
+ BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate one trace.");
goto error;
}
trace->streams = g_ptr_array_new_with_free_func(
(GDestroyNotify) bt_object_try_spec_release);
if (!trace->streams) {
- BT_LOGE_STR("Failed to allocate one GPtrArray.");
+ BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate one GPtrArray.");
goto error;
}
trace->stream_classes_stream_count = g_hash_table_new(g_direct_hash,
g_direct_equal);
if (!trace->stream_classes_stream_count) {
- BT_LOGE_STR("Failed to allocate one GHashTable.");
+ BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate one GHashTable.");
goto error;
}
trace->name.str = g_string_new(NULL);
if (!trace->name.str) {
- BT_LOGE_STR("Failed to allocate one GString.");
+ BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate one GString.");
goto error;
}
trace->destruction_listeners = g_array_new(FALSE, TRUE,
sizeof(struct bt_trace_destruction_listener_elem));
if (!trace->destruction_listeners) {
- BT_LOGE_STR("Failed to allocate one GArray.");
+ BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate one GArray.");
goto error;
}
return trace->name.value;
}
-enum bt_trace_status bt_trace_set_name(struct bt_trace *trace, const char *name)
+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");
g_string_assign(trace->name.str, name);
trace->name.value = trace->name.str->str;
BT_LIB_LOGD("Set trace's name: %!+t", trace);
- return BT_TRACE_STATUS_OK;
+ return BT_FUNC_STATUS_OK;
}
uint64_t bt_trace_get_stream_count(const struct bt_trace *trace)
return bt_trace_borrow_stream_by_id((void *) trace, id);
}
-enum bt_trace_status bt_trace_add_destruction_listener(
+enum bt_trace_add_listener_status bt_trace_add_destruction_listener(
const struct bt_trace *c_trace,
bt_trace_destruction_listener_func listener,
void *data, uint64_t *listener_id)
BT_LIB_LOGD("Added destruction listener: " "%![trace-]+t, "
"listener-id=%" PRIu64, trace, i);
- return BT_TRACE_STATUS_OK;
+ return BT_FUNC_STATUS_OK;
}
BT_ASSERT_PRE_FUNC
listener_id))->func != NULL;
}
-enum bt_trace_status bt_trace_remove_destruction_listener(
+enum bt_trace_remove_listener_status bt_trace_remove_destruction_listener(
const struct bt_trace *c_trace, uint64_t listener_id)
{
struct bt_trace *trace = (void *) c_trace;
BT_LIB_LOGD("Removed \"trace destruction listener: "
"%![trace-]+t, listener-id=%" PRIu64,
trace, listener_id);
- return BT_TRACE_STATUS_OK;
+ return BT_FUNC_STATUS_OK;
}
BT_HIDDEN