From 44e2e039eb4bea7100896f504f6e6a40b20b6a1e Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Wed, 13 Nov 2019 17:00:08 -0500 Subject: [PATCH] lib: remove bt_packet_context_field API Change-Id: I357daa5915140882dab47acb70570178fb767db8 Signed-off-by: Simon Marchi Reviewed-on: https://review.lttng.org/c/babeltrace/+/2390 Reviewed-by: Philippe Proulx --- include/Makefile.am | 1 - include/babeltrace2/babeltrace.h | 1 - .../trace-ir/packet-context-field.h | 52 ----------- include/babeltrace2/trace-ir/packet.h | 8 -- include/babeltrace2/types.h | 2 - src/lib/trace-ir/Makefile.am | 1 - src/lib/trace-ir/packet-context-field.c | 88 ------------------- src/lib/trace-ir/packet.c | 30 ------- 8 files changed, 183 deletions(-) delete mode 100644 include/babeltrace2/trace-ir/packet-context-field.h delete mode 100644 src/lib/trace-ir/packet-context-field.c diff --git a/include/Makefile.am b/include/Makefile.am index 98d0e31b..1594d2ca 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -52,7 +52,6 @@ babeltrace2traceirinclude_HEADERS = \ babeltrace2/trace-ir/field-const.h \ babeltrace2/trace-ir/field.h \ babeltrace2/trace-ir/packet-const.h \ - babeltrace2/trace-ir/packet-context-field.h \ babeltrace2/trace-ir/packet.h \ babeltrace2/trace-ir/stream-class-const.h \ babeltrace2/trace-ir/stream-class.h \ diff --git a/include/babeltrace2/babeltrace.h b/include/babeltrace2/babeltrace.h index e2ea83cf..ce324694 100644 --- a/include/babeltrace2/babeltrace.h +++ b/include/babeltrace2/babeltrace.h @@ -72,7 +72,6 @@ #include #include #include -#include #include #include #include diff --git a/include/babeltrace2/trace-ir/packet-context-field.h b/include/babeltrace2/trace-ir/packet-context-field.h deleted file mode 100644 index 17665505..00000000 --- a/include/babeltrace2/trace-ir/packet-context-field.h +++ /dev/null @@ -1,52 +0,0 @@ -#ifndef BABELTRACE2_TRACE_IR_PACKET_CONTEXT_FIELD_H -#define BABELTRACE2_TRACE_IR_PACKET_CONTEXT_FIELD_H - -/* - * Copyright (c) 2010-2019 EfficiOS Inc. and Linux Foundation - * - * 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. - */ - -#ifndef __BT_IN_BABELTRACE_H -# error "Please include instead." -#endif - -#include - -#ifdef __cplusplus -extern "C" { -#endif - -extern -bt_packet_context_field *bt_packet_context_field_create( - bt_stream_class *stream_class); - -extern -bt_field *bt_packet_context_field_borrow_field( - bt_packet_context_field *field); - -extern -void bt_packet_context_field_release( - bt_packet_context_field *field); - -#ifdef __cplusplus -} -#endif - -#endif /* BABELTRACE2_TRACE_IR_PACKET_CONTEXT_FIELD_H */ diff --git a/include/babeltrace2/trace-ir/packet.h b/include/babeltrace2/trace-ir/packet.h index fbe5ed04..6a310854 100644 --- a/include/babeltrace2/trace-ir/packet.h +++ b/include/babeltrace2/trace-ir/packet.h @@ -42,14 +42,6 @@ extern bt_stream *bt_packet_borrow_stream(bt_packet *packet); extern bt_field *bt_packet_borrow_context_field(bt_packet *packet); -typedef enum bt_packet_move_context_field_status { - BT_PACKET_MOVE_CONTEXT_FIELD_STATUS_OK = __BT_FUNC_STATUS_OK, -} bt_packet_move_context_field_status; - -extern -bt_packet_move_context_field_status bt_packet_move_context_field( - bt_packet *packet, bt_packet_context_field *context); - #ifdef __cplusplus } #endif diff --git a/include/babeltrace2/types.h b/include/babeltrace2/types.h index f541b9c3..585905f1 100644 --- a/include/babeltrace2/types.h +++ b/include/babeltrace2/types.h @@ -121,8 +121,6 @@ typedef struct bt_message bt_message; typedef struct bt_message_iterator bt_message_iterator; typedef struct bt_object bt_object; typedef struct bt_packet bt_packet; -typedef struct bt_packet_context_field bt_packet_context_field; -typedef struct bt_packet_header_field bt_packet_header_field; typedef struct bt_plugin bt_plugin; typedef struct bt_plugin_set bt_plugin_set; typedef struct bt_plugin_so_shared_lib_handle bt_plugin_so_shared_lib_handle; diff --git a/src/lib/trace-ir/Makefile.am b/src/lib/trace-ir/Makefile.am index 5ce62239..e4148543 100644 --- a/src/lib/trace-ir/Makefile.am +++ b/src/lib/trace-ir/Makefile.am @@ -20,7 +20,6 @@ libtrace_ir_la_SOURCES = \ field-wrapper.c \ field-wrapper.h \ packet.c \ - packet-context-field.c \ packet.h \ resolve-field-path.c \ resolve-field-path.h \ diff --git a/src/lib/trace-ir/packet-context-field.c b/src/lib/trace-ir/packet-context-field.c deleted file mode 100644 index c5a628c2..00000000 --- a/src/lib/trace-ir/packet-context-field.c +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Copyright 2018 Philippe Proulx - * - * 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/PACKET-CONTEXT-FIELD" -#include "lib/logging.h" - -#include "lib/assert-pre.h" -#include -#include - -#include "stream-class.h" -#include "field.h" -#include "field-wrapper.h" - -struct bt_field *bt_packet_context_field_borrow_field( - struct bt_packet_context_field *context_field) -{ - struct bt_field_wrapper *field_wrapper = (void *) context_field; - - BT_ASSERT_PRE_NON_NULL(field_wrapper, "Packet context field"); - return (void *) field_wrapper->field; -} - -void bt_packet_context_field_release( - struct bt_packet_context_field *context_field) -{ - struct bt_field_wrapper *field_wrapper = (void *) context_field; - - BT_ASSERT_PRE_NON_NULL(field_wrapper, "Packet context field"); - - /* - * Do not recycle because the pool could be destroyed at this - * point. This function is only called when there's an error - * anyway because the goal of a packet context field wrapper is - * to eventually move it to a packet with - * bt_packet_move_context() after creating it. - */ - bt_field_wrapper_destroy(field_wrapper); -} - -struct bt_packet_context_field *bt_packet_context_field_create( - struct bt_stream_class *stream_class) -{ - struct bt_field_wrapper *field_wrapper; - - BT_ASSERT_PRE_NO_ERROR(); - BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class"); - BT_ASSERT_PRE(stream_class->supports_packets, - "Stream class does not support packets: %![sc-]+S", - stream_class); - BT_ASSERT_PRE(stream_class->packet_context_fc, - "Stream class has no packet context field class: %!+S", - stream_class); - field_wrapper = bt_field_wrapper_create( - &stream_class->packet_context_field_pool, - (void *) stream_class->packet_context_fc); - if (!field_wrapper) { - BT_LIB_LOGE_APPEND_CAUSE( - "Cannot allocate one packet context field from stream class: " - "%![sc-]+S", stream_class); - goto end; - } - - BT_ASSERT(field_wrapper->field); - bt_stream_class_freeze(stream_class); - -end: - return (void *) field_wrapper; -} diff --git a/src/lib/trace-ir/packet.c b/src/lib/trace-ir/packet.c index 166f7ca2..50304868 100644 --- a/src/lib/trace-ir/packet.c +++ b/src/lib/trace-ir/packet.c @@ -242,36 +242,6 @@ end: return (void *) packet; } -enum bt_packet_move_context_field_status bt_packet_move_context_field( - struct bt_packet *packet, - struct bt_packet_context_field *context_field) -{ - struct bt_stream_class *stream_class; - struct bt_field_wrapper *field_wrapper = (void *) context_field; - - BT_ASSERT_PRE_DEV_NO_ERROR(); - BT_ASSERT_PRE_DEV_NON_NULL(packet, "Packet"); - BT_ASSERT_PRE_DEV_NON_NULL(field_wrapper, "Context field"); - BT_ASSERT_PRE_DEV_HOT(packet, "Packet", ": %!+a", packet); - stream_class = packet->stream->class; - BT_ASSERT_PRE_DEV(stream_class->packet_context_fc, - "Stream class has no packet context field class: %!+S", - stream_class); - BT_ASSERT_PRE_DEV(field_wrapper->field->class == - stream_class->packet_context_fc, - "Unexpected packet context field's class: " - "%![fc-]+F, %![expected-fc-]+F", field_wrapper->field->class, - stream_class->packet_context_fc); - - /* Recycle current context field: always exists */ - BT_ASSERT(packet->context_field); - recycle_context_field(packet->context_field, stream_class); - - /* Move new field */ - packet->context_field = field_wrapper; - return BT_FUNC_STATUS_OK; -} - void bt_packet_get_ref(const struct bt_packet *packet) { bt_object_get_ref(packet); -- 2.34.1