X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=src%2Fctf-writer%2Fevent.h;h=dc1187cd564706d35b4815374c5e36f335ba7169;hp=1a8138ab2ab2fd432b686b696a31e85c3150f5e4;hb=0235b0db7de5bcacdb3650c92461f2ce5eb2143d;hpb=578e048b5debf169e286e5b5cc747b5d6c16886d diff --git a/src/ctf-writer/event.h b/src/ctf-writer/event.h index 1a8138ab..dc1187cd 100644 --- a/src/ctf-writer/event.h +++ b/src/ctf-writer/event.h @@ -1,39 +1,23 @@ -#ifndef BABELTRACE_CTF_WRITER_EVENT_INTERNAL_H -#define BABELTRACE_CTF_WRITER_EVENT_INTERNAL_H - /* - * Copyright 2013, 2014 Jérémie Galarneau - * - * 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: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. + * SPDX-License-Identifier: MIT * - * 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 2013, 2014 Jérémie Galarneau * * The Common Trace Format (CTF) Specification is available at * http://www.efficios.com/ctf */ +#ifndef BABELTRACE_CTF_WRITER_EVENT_INTERNAL_H +#define BABELTRACE_CTF_WRITER_EVENT_INTERNAL_H + +#include + #include "common/assert.h" -#include "common/babeltrace.h" -#include -#include -#include -#include +#include "common/macros.h" +#include +#include +#include +#include #include "ctfser/ctfser.h" #include "assert-pre.h" @@ -82,14 +66,14 @@ static inline struct bt_ctf_event_class_common *bt_ctf_event_common_borrow_class( struct bt_ctf_event_common *event) { - BT_ASSERT(event); + BT_ASSERT_DBG(event); return event->class; } -typedef void *(*create_field_func)(void *); -typedef void (*release_field_func)(void *); -typedef void *(*create_header_field_func)(void *, void *); -typedef void (*release_header_field_func)(void *, void *); +typedef void *(*create_field_func_type)(void *); +typedef void (*release_field_func_type)(void *); +typedef void *(*create_header_field_func_type)(void *, void *); +typedef void (*release_header_field_func_type)(void *, void *); BT_HIDDEN int bt_ctf_event_common_initialize(struct bt_ctf_event_common *event, @@ -101,10 +85,14 @@ int bt_ctf_event_common_initialize(struct bt_ctf_event_common *event, int (*map_clock_classes_func)(struct bt_ctf_stream_class_common *stream_class, struct bt_ctf_field_type_common *packet_context_field_type, struct bt_ctf_field_type_common *event_header_field_type), - create_field_func create_field_func, - release_field_func release_field_func, - create_header_field_func create_header_field_func, - release_header_field_func release_header_field_func); + create_field_func_type create_field_func, + release_field_func_type release_field_func, + create_header_field_func_type create_header_field_func, + release_header_field_func_type release_header_field_func); + +BT_HIDDEN +int bt_ctf_event_common_set_payload(struct bt_ctf_event *event, + struct bt_ctf_field *payload); static inline struct bt_ctf_field_common *bt_ctf_event_common_borrow_payload( @@ -115,7 +103,7 @@ struct bt_ctf_field_common *bt_ctf_event_common_borrow_payload( BT_CTF_ASSERT_PRE_NON_NULL(event, "Event"); if (!event->payload_field) { - BT_LOGV("Event has no current payload field: addr=%p, " + BT_LOGT("Event has no current payload field: addr=%p, " "event-class-name=\"%s\", event-class-id=%" PRId64, event, bt_ctf_event_class_common_get_name(event->class), bt_ctf_event_class_common_get_id(event->class)); @@ -137,7 +125,7 @@ struct bt_ctf_field_common *bt_ctf_event_common_borrow_header( BT_CTF_ASSERT_PRE_NON_NULL(event, "Event"); if (!event->header_field) { - BT_LOGV("Event has no current header field: addr=%p, " + BT_LOGT("Event has no current header field: addr=%p, " "event-class-name=\"%s\", event-class-id=%" PRId64, event, bt_ctf_event_class_common_get_name(event->class), bt_ctf_event_class_common_get_id(event->class)); @@ -159,7 +147,7 @@ struct bt_ctf_field_common *bt_ctf_event_common_borrow_context( BT_CTF_ASSERT_PRE_NON_NULL(event, "Event"); if (!event->context_field) { - BT_LOGV("Event has no current context field: addr=%p, " + BT_LOGT("Event has no current context field: addr=%p, " "event-class-name=\"%s\", event-class-id=%" PRId64, event, bt_ctf_event_class_common_get_name(event->class), bt_ctf_event_class_common_get_id(event->class)); @@ -181,7 +169,7 @@ struct bt_ctf_field_common *bt_ctf_event_common_borrow_stream_event_context( BT_CTF_ASSERT_PRE_NON_NULL(event, "Event"); if (!event->stream_event_context_field) { - BT_LOGV("Event has no current stream event context field: addr=%p, " + BT_LOGT("Event has no current stream event context field: addr=%p, " "event-class-name=\"%s\", event-class-id=%" PRId64, event, bt_ctf_event_class_common_get_name(event->class), bt_ctf_event_class_common_get_id(event->class));