X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fctf-writer%2Fstream-class.h;h=ab54ce73db762c161437ebf565a1343b0749af36;hb=1353b066072e6c389ff35853bac83f65597e7a6a;hp=c008a1facc400bf58fae49f5d8fad76dd1d7e038;hpb=578e048b5debf169e286e5b5cc747b5d6c16886d;p=babeltrace.git diff --git a/src/ctf-writer/stream-class.h b/src/ctf-writer/stream-class.h index c008a1fa..ab54ce73 100644 --- a/src/ctf-writer/stream-class.h +++ b/src/ctf-writer/stream-class.h @@ -1,38 +1,20 @@ -#ifndef BABELTRACE_CTF_WRITER_STREAM_CLASS_INTERNAL_H -#define BABELTRACE_CTF_WRITER_STREAM_CLASS_INTERNAL_H - /* - * Copyright 2014 EfficiOS Inc. - * - * Author: 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: + * SPDX-License-Identifier: MIT * - * 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. + * Copyright 2014 EfficiOS Inc. * * The Common Trace Format (CTF) Specification is available at * http://www.efficios.com/ctf */ +#ifndef BABELTRACE_CTF_WRITER_STREAM_CLASS_INTERNAL_H +#define BABELTRACE_CTF_WRITER_STREAM_CLASS_INTERNAL_H + #include "common/assert.h" -#include "common/babeltrace.h" +#include "common/macros.h" #include "common/common.h" -#include -#include +#include +#include #include #include "clock.h" @@ -88,14 +70,11 @@ struct bt_ctf_stream_class_common { struct bt_ctf_event_class_common; -BT_HIDDEN int bt_ctf_stream_class_common_initialize(struct bt_ctf_stream_class_common *stream_class, const char *name, bt_ctf_object_release_func release_func); -BT_HIDDEN void bt_ctf_stream_class_common_finalize(struct bt_ctf_stream_class_common *stream_class); -BT_HIDDEN void bt_ctf_stream_class_common_freeze(struct bt_ctf_stream_class_common *stream_class); static inline @@ -115,7 +94,7 @@ int64_t bt_ctf_stream_class_common_get_id( BT_CTF_ASSERT_PRE_NON_NULL(stream_class, "Stream class"); if (!stream_class->id_set) { - BT_LOGV("Stream class's ID is not set: addr=%p, name=\"%s\"", + BT_LOGT("Stream class's ID is not set: addr=%p, name=\"%s\"", stream_class, bt_ctf_stream_class_common_get_name(stream_class)); ret = (int64_t) -1; @@ -128,26 +107,21 @@ end: return ret; } -BT_HIDDEN void bt_ctf_stream_class_common_set_byte_order( struct bt_ctf_stream_class_common *stream_class, int byte_order); -BT_HIDDEN int bt_ctf_stream_class_common_validate_single_clock_class( struct bt_ctf_stream_class_common *stream_class, struct bt_ctf_clock_class **expected_clock_class); -BT_HIDDEN int bt_ctf_stream_class_common_add_event_class( struct bt_ctf_stream_class_common *stream_class, struct bt_ctf_event_class_common *event_class, bt_ctf_validation_flag_copy_field_type_func copy_field_type_func); -BT_HIDDEN int bt_ctf_stream_class_common_visit(struct bt_ctf_stream_class_common *stream_class, bt_ctf_visitor visitor, void *data); -BT_HIDDEN int bt_ctf_stream_class_visit(struct bt_ctf_stream_class *stream_class, bt_ctf_visitor visitor, void *data); @@ -155,7 +129,7 @@ static inline struct bt_ctf_trace_common *bt_ctf_stream_class_common_borrow_trace( struct bt_ctf_stream_class_common *stream_class) { - BT_ASSERT(stream_class); + BT_ASSERT_DBG(stream_class); return (void *) bt_ctf_object_borrow_parent(&stream_class->base); } @@ -193,7 +167,7 @@ int bt_ctf_stream_class_common_set_name(struct bt_ctf_stream_class_common *strea g_string_assign(stream_class->name, name); } - BT_LOGV("Set stream class's name: " + BT_LOGT("Set stream class's name: " "addr=%p, name=\"%s\", id=%" PRId64, stream_class, bt_ctf_stream_class_common_get_name(stream_class), bt_ctf_stream_class_common_get_id(stream_class)); @@ -205,10 +179,10 @@ static inline void _bt_ctf_stream_class_common_set_id( struct bt_ctf_stream_class_common *stream_class, int64_t id) { - BT_ASSERT(stream_class); + BT_ASSERT_DBG(stream_class); stream_class->id = id; stream_class->id_set = 1; - BT_LOGV("Set stream class's ID (internal): " + BT_LOGT("Set stream class's ID (internal): " "addr=%p, name=\"%s\", id=%" PRId64, stream_class, bt_ctf_stream_class_common_get_name(stream_class), bt_ctf_stream_class_common_get_id(stream_class)); @@ -259,7 +233,7 @@ int bt_ctf_stream_class_common_set_id(struct bt_ctf_stream_class_common *stream_ ret = bt_ctf_stream_class_common_set_id_no_check(stream_class, id); if (ret == 0) { - BT_LOGV("Set stream class's ID: " + BT_LOGT("Set stream class's ID: " "addr=%p, name=\"%s\", id=%" PRId64, stream_class, bt_ctf_stream_class_common_get_name(stream_class), @@ -361,7 +335,7 @@ int bt_ctf_stream_class_common_set_packet_context_field_type( bt_ctf_object_put_ref(stream_class->packet_context_field_type); stream_class->packet_context_field_type = packet_context_type; bt_ctf_object_get_ref(stream_class->packet_context_field_type); - BT_LOGV("Set stream class's packet context field type: " + BT_LOGT("Set stream class's packet context field type: " "addr=%p, name=\"%s\", id=%" PRId64 ", " "packet-context-ft-addr=%p", stream_class, bt_ctf_stream_class_common_get_name(stream_class), @@ -382,7 +356,7 @@ bt_ctf_stream_class_common_borrow_event_header_field_type( BT_CTF_ASSERT_PRE_NON_NULL(stream_class, "Stream class"); if (!stream_class->event_header_field_type) { - BT_LOGV("Stream class has no event header field type: " + BT_LOGT("Stream class has no event header field type: " "addr=%p, name=\"%s\", id=%" PRId64, stream_class, bt_ctf_stream_class_common_get_name(stream_class), @@ -438,7 +412,7 @@ int bt_ctf_stream_class_common_set_event_header_field_type( bt_ctf_object_put_ref(stream_class->event_header_field_type); stream_class->event_header_field_type = event_header_type; bt_ctf_object_get_ref(stream_class->event_header_field_type); - BT_LOGV("Set stream class's event header field type: " + BT_LOGT("Set stream class's event header field type: " "addr=%p, name=\"%s\", id=%" PRId64 ", " "event-header-ft-addr=%p", stream_class, bt_ctf_stream_class_common_get_name(stream_class), @@ -508,7 +482,7 @@ int bt_ctf_stream_class_common_set_event_context_field_type( bt_ctf_object_put_ref(stream_class->event_context_field_type); stream_class->event_context_field_type = event_context_type; bt_ctf_object_get_ref(stream_class->event_context_field_type); - BT_LOGV("Set stream class's event context field type: " + BT_LOGT("Set stream class's event context field type: " "addr=%p, name=\"%s\", id=%" PRId64 ", " "event-context-ft-addr=%p", stream_class, bt_ctf_stream_class_common_get_name(stream_class), @@ -526,11 +500,9 @@ struct bt_ctf_stream_class { struct metadata_context; -BT_HIDDEN int bt_ctf_stream_class_serialize(struct bt_ctf_stream_class *stream_class, struct metadata_context *context); -BT_HIDDEN int bt_ctf_stream_class_map_clock_class( struct bt_ctf_stream_class *stream_class, struct bt_ctf_field_type *packet_context_type,