lib: remove bt_packet_context_field API
authorSimon Marchi <simon.marchi@efficios.com>
Wed, 13 Nov 2019 22:00:08 +0000 (17:00 -0500)
committerSimon Marchi <simon.marchi@efficios.com>
Wed, 20 Nov 2019 15:58:55 +0000 (10:58 -0500)
Change-Id: I357daa5915140882dab47acb70570178fb767db8
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2390
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
include/Makefile.am
include/babeltrace2/babeltrace.h
include/babeltrace2/trace-ir/packet-context-field.h [deleted file]
include/babeltrace2/trace-ir/packet.h
include/babeltrace2/types.h
src/lib/trace-ir/Makefile.am
src/lib/trace-ir/packet-context-field.c [deleted file]
src/lib/trace-ir/packet.c

index 98d0e31be94cb8f94df6b8c570dad39afc9c8e04..1594d2ca5053cfd8a3a66571566147a7921135e8 100644 (file)
@@ -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 \
index e2ea83cfbc855315d1b7e36ed1e66fcc8ffcf8d2..ce324694da86e1afc229b4233ba349fcf5e6dff0 100644 (file)
@@ -72,7 +72,6 @@
 #include <babeltrace2/trace-ir/field-path-const.h>
 #include <babeltrace2/trace-ir/field.h>
 #include <babeltrace2/trace-ir/packet-const.h>
-#include <babeltrace2/trace-ir/packet-context-field.h>
 #include <babeltrace2/trace-ir/packet.h>
 #include <babeltrace2/trace-ir/stream-class-const.h>
 #include <babeltrace2/trace-ir/stream-class.h>
diff --git a/include/babeltrace2/trace-ir/packet-context-field.h b/include/babeltrace2/trace-ir/packet-context-field.h
deleted file mode 100644 (file)
index 1766550..0000000
+++ /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 <babeltrace2/babeltrace.h> instead."
-#endif
-
-#include <babeltrace2/types.h>
-
-#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 */
index fbe5ed049c3f720c0879c6a4516a1a1fb18f967b..6a310854b89545a11842c3fb4baa66e9f56e3f6f 100644 (file)
@@ -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
index f541b9c39e7b7382b3af800a9ed7017062c94692..585905f1c68a22eb40e488e8138fdf9cb83f1fab 100644 (file)
@@ -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;
index 5ce62239682411c91310868de258fd431e51f2cd..e4148543bd664c590360d8fc50252fe0e6b7b165 100644 (file)
@@ -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 (file)
index c5a628c..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright 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 "LIB/PACKET-CONTEXT-FIELD"
-#include "lib/logging.h"
-
-#include "lib/assert-pre.h"
-#include <babeltrace2/trace-ir/packet-context-field.h>
-#include <glib.h>
-
-#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;
-}
index 166f7ca2e5d433532d11d712e4d1f276b421d61d..50304868bf5da33789a3efddbc1058894c1df40f 100644 (file)
@@ -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);
This page took 0.028919 seconds and 4 git commands to generate.