/*
+ * SPDX-License-Identifier: MIT
+ *
* Copyright 2013, 2014 Jérémie Galarneau <jeremie.galarneau@efficios.com>
* Copyright 2017-2018 Philippe Proulx <pproulx@efficios.com>
- *
- * 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 "CTF-WRITER/STREAM-CLASS"
#include "logging.h"
#include <inttypes.h>
-#include <stdbool.h>
#include <stdint.h>
-#include <babeltrace2/ctf-writer/event.h>
-#include <babeltrace2/ctf-writer/object.h>
-#include <babeltrace2/ctf-writer/trace.h>
-#include <babeltrace2/ctf-writer/utils.h>
+#include <babeltrace2-ctf-writer/event.h>
+#include <babeltrace2-ctf-writer/object.h>
+#include <babeltrace2-ctf-writer/trace.h>
+#include <babeltrace2-ctf-writer/utils.h>
#include "common/align.h"
#include "common/assert.h"
const enum bt_ctf_validation_flag validation_flags =
BT_CTF_VALIDATION_FLAG_EVENT;
struct bt_ctf_clock_class *expected_clock_class = NULL;
+ struct bt_ctf_search_query query = { .value = event_class, .found = 0 };
- BT_ASSERT(copy_field_type_func);
+ BT_ASSERT_DBG(copy_field_type_func);
if (!stream_class || !event_class) {
BT_LOGW("Invalid parameter: stream class or event class is NULL: "
}
/* Check for duplicate event classes */
- struct bt_ctf_search_query query = { .value = event_class, .found = 0 };
g_ptr_array_foreach(stream_class->event_classes, event_class_exists,
&query);
if (query.found) {
* The trace and stream class should be valid at this
* point.
*/
- BT_ASSERT(trace->valid);
- BT_ASSERT(stream_class->valid);
+ BT_ASSERT_DBG(trace->valid);
+ BT_ASSERT_DBG(stream_class->valid);
packet_header_type =
bt_ctf_trace_common_borrow_packet_header_field_type(trace);
packet_context_type =
/* Only set an event ID if none was explicitly set before */
*event_id = bt_ctf_event_class_common_get_id(event_class);
if (*event_id < 0) {
- BT_LOGV("Event class has no ID: automatically setting it: "
+ BT_LOGT("Event class has no ID: automatically setting it: "
"id=%" PRId64, stream_class->next_event_id);
if (bt_ctf_event_class_common_set_id(event_class,
* now if the stream class is frozen.
*/
if (stream_class->frozen && expected_clock_class) {
- BT_ASSERT(!stream_class->clock_class ||
+ BT_ASSERT_DBG(!stream_class->clock_class ||
stream_class->clock_class == expected_clock_class);
BT_CTF_OBJECT_MOVE_REF(stream_class->clock_class, expected_clock_class);
}
ret = bt_ctf_visitor_helper(&obj, get_event_class_count,
get_event_class,
visit_event_class, visitor, data);
- BT_LOGV("bt_ctf_visitor_helper() returned: ret=%d", ret);
+ BT_LOGT("bt_ctf_visitor_helper() returned: ret=%d", ret);
end:
return ret;
int ret;
uint64_t i;
- BT_ASSERT(stream_class);
- BT_ASSERT(expected_clock_class);
+ BT_ASSERT_DBG(stream_class);
+ BT_ASSERT_DBG(expected_clock_class);
ret = bt_ctf_field_type_common_validate_single_clock_class(
stream_class->packet_context_field_type,
expected_clock_class);
struct bt_ctf_event_class_common *event_class =
g_ptr_array_index(stream_class->event_classes, i);
- BT_ASSERT(event_class);
+ BT_ASSERT_DBG(event_class);
ret = bt_ctf_event_class_common_validate_single_clock_class(
event_class, expected_clock_class);
if (ret) {
bt_ctf_field_type_structure_create();
struct bt_ctf_field_type *_uint64_t =
get_field_type(FIELD_TYPE_ALIAS_UINT64_T);
- struct bt_ctf_field_type *ts_begin_end_uint64_t;
+ struct bt_ctf_field_type *ts_begin_end_uint64_t = NULL;
if (!packet_context_type) {
BT_LOGE_STR("Cannot create empty structure field type.");
bt_ctf_field_type_structure_get_field_type_by_name(parent_ft,
field_name);
- BT_ASSERT(stream_class->clock);
+ BT_ASSERT_DBG(stream_class->clock);
if (!ft) {
/* Field does not exist: not an error */
goto end;
}
- BT_ASSERT(((struct bt_ctf_field_type_common *) ft)->id ==
+ BT_ASSERT_DBG(((struct bt_ctf_field_type_common *) ft)->id ==
BT_CTF_FIELD_TYPE_ID_INTEGER);
mapped_clock_class =
bt_ctf_field_type_integer_get_mapped_clock_class(ft);
if (!ft_copy) {
BT_LOGE("Failed to copy integer field type: ft-addr=%p",
ft);
+ ret = -1;
+ goto end;
}
ret = bt_ctf_field_type_common_integer_set_mapped_clock_class_no_check_frozen(
(void *) ft_copy, stream_class->clock->clock_class);
- BT_ASSERT(ret == 0);
+ BT_ASSERT_DBG(ret == 0);
ret = bt_ctf_field_type_common_structure_replace_field(
(void *) parent_ft, field_name, (void *) ft_copy);
bt_ctf_object_put_ref(ft_copy);
- BT_LOGV("Automatically mapped field type to stream class's clock class: "
+ BT_LOGT("Automatically mapped field type to stream class's clock class: "
"stream-class-addr=%p, stream-class-name=\"%s\", "
"stream-class-id=%" PRId64 ", ft-addr=%p, "
"ft-copy-addr=%p",
{
int ret = 0;
- BT_ASSERT(stream_class);
+ BT_ASSERT_DBG(stream_class);
if (!stream_class->clock) {
/* No clock class to map to */
}
if (!stream_class->clock) {
- BT_LOGV("Stream class has no clock: "
+ BT_LOGT("Stream class has no clock: "
"addr=%p, name=\"%s\", id=%" PRId64,
stream_class,
bt_ctf_stream_class_get_name(stream_class),
/* Replace the current clock of this stream class. */
bt_ctf_object_put_ref(stream_class->clock);
stream_class->clock = bt_ctf_object_get_ref(clock);
- BT_LOGV("Set stream class's clock: "
+ BT_LOGT("Set stream class's clock: "
"addr=%p, name=\"%s\", id=%" PRId64 ", "
"clock-addr=%p, clock-name=\"%s\"",
stream_class,
*/
trace = BT_CTF_FROM_COMMON(bt_ctf_stream_class_common_borrow_trace(
BT_CTF_TO_COMMON(stream_class)));
- BT_ASSERT(trace);
+ BT_ASSERT_DBG(trace);
packet_header_type = bt_ctf_trace_get_packet_header_field_type(trace);
trace = NULL;
if (packet_header_type) {
projects / babeltrace.git / blobdiff