X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2Ftrace-ir%2Fpacket.c;h=d71c62ed98e30e323532619fd82446520873cd17;hb=40f4ba76dd6f9508ca51b6220eaed57632281a07;hp=983887c42ebe1166cd5a8612cf48d7f2e8ad1799;hpb=238b7404b66983c6ba15c3a44bfbf642f20bdabe;p=babeltrace.git

diff --git a/lib/trace-ir/packet.c b/lib/trace-ir/packet.c
index 983887c4..d71c62ed 100644
--- a/lib/trace-ir/packet.c
+++ b/lib/trace-ir/packet.c
@@ -25,7 +25,7 @@
 
 #include <babeltrace/assert-pre-internal.h>
 #include <babeltrace/trace-ir/fields-internal.h>
-#include <babeltrace/trace-ir/private-packet.h>
+#include <babeltrace/trace-ir/packet-const.h>
 #include <babeltrace/trace-ir/packet.h>
 #include <babeltrace/trace-ir/packet-internal.h>
 #include <babeltrace/trace-ir/field-wrapper-internal.h>
@@ -50,10 +50,10 @@ struct bt_stream *bt_packet_borrow_stream(struct bt_packet *packet)
 	return packet->stream;
 }
 
-struct bt_private_stream *bt_private_packet_borrow_stream(
-		struct bt_private_packet *packet)
+const struct bt_stream *bt_packet_borrow_stream_const(
+		const struct bt_packet *packet)
 {
-	return (void *) bt_packet_borrow_stream((void *) packet);
+	return bt_packet_borrow_stream((void *) packet);
 }
 
 struct bt_field *bt_packet_borrow_header_field(struct bt_packet *packet)
@@ -62,10 +62,10 @@ struct bt_field *bt_packet_borrow_header_field(struct bt_packet *packet)
 	return packet->header_field ? packet->header_field->field : NULL;
 }
 
-struct bt_private_field *bt_private_packet_borrow_header_field(
-		struct bt_private_packet *packet)
+const struct bt_field *bt_packet_borrow_header_field_const(
+		const struct bt_packet *packet)
 {
-	return (void *) bt_packet_borrow_header_field((void *) packet);
+	return bt_packet_borrow_header_field((void *) packet);
 }
 
 struct bt_field *bt_packet_borrow_context_field(struct bt_packet *packet)
@@ -74,14 +74,14 @@ struct bt_field *bt_packet_borrow_context_field(struct bt_packet *packet)
 	return packet->context_field ? packet->context_field->field : NULL;
 }
 
-struct bt_private_field *bt_private_packet_borrow_context_field(
-		struct bt_private_packet *packet)
+const struct bt_field *bt_packet_borrow_context_field_const(
+		const struct bt_packet *packet)
 {
-	return (void *) bt_packet_borrow_context_field((void *) packet);
+	return bt_packet_borrow_context_field((void *) packet);
 }
 
 BT_HIDDEN
-void _bt_packet_set_is_frozen(struct bt_packet *packet, bool is_frozen)
+void _bt_packet_set_is_frozen(const struct bt_packet *packet, bool is_frozen)
 {
 	if (!packet) {
 		return;
@@ -102,7 +102,7 @@ void _bt_packet_set_is_frozen(struct bt_packet *packet, bool is_frozen)
 			is_frozen);
 	}
 
-	packet->frozen = is_frozen;
+	((struct bt_packet *) packet)->frozen = is_frozen;
 }
 
 static inline
@@ -267,7 +267,8 @@ struct bt_packet *bt_packet_new(struct bt_stream *stream)
 
 	bt_object_init_shared(&packet->base,
 		(bt_object_release_func) bt_packet_recycle);
-	packet->stream = bt_object_get_ref(stream);
+	packet->stream = stream;
+	bt_object_get_no_null_check(stream);
 	trace = bt_stream_class_borrow_trace_inline(stream->class);
 	BT_ASSERT(trace);
 
@@ -324,10 +325,8 @@ end:
 	return packet;
 }
 
-struct bt_private_packet *bt_private_packet_create(
-		struct bt_private_stream *priv_stream)
+struct bt_packet *bt_packet_create(struct bt_stream *stream)
 {
-	struct bt_stream *stream = (void *) priv_stream;
 	struct bt_packet *packet = NULL;
 
 	BT_ASSERT_PRE_NON_NULL(stream, "Stream");
@@ -348,11 +347,9 @@ end:
 	return (void *) packet;
 }
 
-int bt_private_packet_move_header_field(
-		struct bt_private_packet *priv_packet,
-		struct bt_private_packet_header_field *header_field)
+int bt_packet_move_header_field(struct bt_packet *packet,
+		struct bt_packet_header_field *header_field)
 {
-	struct bt_packet *packet = (void *) priv_packet;
 	struct bt_trace *trace;
 	struct bt_field_wrapper *field_wrapper = (void *) header_field;
 
@@ -378,11 +375,9 @@ int bt_private_packet_move_header_field(
 	return 0;
 }
 
-int bt_private_packet_move_context_field(
-		struct bt_private_packet *priv_packet,
-		struct bt_private_packet_context_field *context_field)
+int bt_packet_move_context_field(struct bt_packet *packet,
+		struct bt_packet_context_field *context_field)
 {
-	struct bt_packet *packet = (void *) priv_packet;
 	struct bt_stream_class *stream_class;
 	struct bt_field_wrapper *field_wrapper = (void *) context_field;
 
@@ -408,11 +403,9 @@ int bt_private_packet_move_context_field(
 	return 0;
 }
 
-void bt_private_packet_set_default_beginning_clock_value(
-		struct bt_private_packet *priv_packet,
+void bt_packet_set_default_beginning_clock_value(struct bt_packet *packet,
 		uint64_t value_cycles)
 {
-	struct bt_packet *packet = (void *) priv_packet;
 	struct bt_stream_class *sc;
 
 	BT_ASSERT_PRE_NON_NULL(packet, "Packet");
@@ -434,7 +427,8 @@ void bt_private_packet_set_default_beginning_clock_value(
 }
 
 enum bt_clock_value_status bt_packet_borrow_default_beginning_clock_value(
-		struct bt_packet *packet, struct bt_clock_value **clock_value)
+		const struct bt_packet *packet,
+		const struct bt_clock_value **clock_value)
 {
 	BT_ASSERT_PRE_NON_NULL(packet, "Packet");
 	BT_ASSERT_PRE_NON_NULL(clock_value, "Clock value (output)");
@@ -442,11 +436,9 @@ enum bt_clock_value_status bt_packet_borrow_default_beginning_clock_value(
 	return BT_CLOCK_VALUE_STATUS_KNOWN;
 }
 
-void bt_private_packet_set_default_end_clock_value(
-		struct bt_private_packet *priv_packet,
+void bt_packet_set_default_end_clock_value(struct bt_packet *packet,
 		uint64_t value_cycles)
 {
-	struct bt_packet *packet = (void *) priv_packet;
 	struct bt_stream_class *sc;
 
 	BT_ASSERT_PRE_NON_NULL(packet, "Packet");
@@ -467,7 +459,8 @@ void bt_private_packet_set_default_end_clock_value(
 }
 
 enum bt_clock_value_status bt_packet_borrow_default_end_clock_value(
-		struct bt_packet *packet, struct bt_clock_value **clock_value)
+		const struct bt_packet *packet,
+		const struct bt_clock_value **clock_value)
 {
 	BT_ASSERT_PRE_NON_NULL(packet, "Packet");
 	BT_ASSERT_PRE_NON_NULL(clock_value, "Clock value (output)");
@@ -476,7 +469,7 @@ enum bt_clock_value_status bt_packet_borrow_default_end_clock_value(
 }
 
 enum bt_property_availability bt_packet_get_discarded_event_counter_snapshot(
-		struct bt_packet *packet, uint64_t *value)
+		const struct bt_packet *packet, uint64_t *value)
 {
 	BT_ASSERT_PRE_NON_NULL(packet, "Packet");
 	BT_ASSERT_PRE_NON_NULL(value, "Value (output)");
@@ -484,11 +477,9 @@ enum bt_property_availability bt_packet_get_discarded_event_counter_snapshot(
 	return packet->discarded_event_counter_snapshot.base.avail;
 }
 
-void bt_private_packet_set_discarded_event_counter_snapshot(
-		struct bt_private_packet *priv_packet, uint64_t value)
+void bt_packet_set_discarded_event_counter_snapshot(struct bt_packet *packet,
+		uint64_t value)
 {
-	struct bt_packet *packet = (void *) priv_packet;
-
 	BT_ASSERT_PRE_NON_NULL(packet, "Packet");
 	BT_ASSERT_PRE_PACKET_HOT(packet);
 	BT_ASSERT_PRE(packet->stream->class->packets_have_discarded_event_counter_snapshot,
@@ -498,7 +489,7 @@ void bt_private_packet_set_discarded_event_counter_snapshot(
 }
 
 enum bt_property_availability bt_packet_get_packet_counter_snapshot(
-		struct bt_packet *packet, uint64_t *value)
+		const struct bt_packet *packet, uint64_t *value)
 {
 	BT_ASSERT_PRE_NON_NULL(packet, "Packet");
 	BT_ASSERT_PRE_NON_NULL(value, "Value (output)");
@@ -506,11 +497,9 @@ enum bt_property_availability bt_packet_get_packet_counter_snapshot(
 	return packet->packet_counter_snapshot.base.avail;
 }
 
-void bt_private_packet_set_packet_counter_snapshot(
-		struct bt_private_packet *priv_packet, uint64_t value)
+void bt_packet_set_packet_counter_snapshot(struct bt_packet *packet,
+		uint64_t value)
 {
-	struct bt_packet *packet = (void *) priv_packet;
-
 	BT_ASSERT_PRE_NON_NULL(packet, "Packet");
 	BT_ASSERT_PRE_PACKET_HOT(packet);
 	BT_ASSERT_PRE(packet->stream->class->packets_have_packet_counter_snapshot,