lib: remove CTF concepts of packet and event headers

[babeltrace.git] / include / babeltrace / trace-ir / event-internal.h

diff --git a/include/babeltrace/trace-ir/event-internal.h b/include/babeltrace/trace-ir/event-internal.h
index 12928dd2d7b2e6ac69c13d84f2d01162a97754e3..cfc30ee1b48fa46c3110f361e2587cff06425378 100644 (file)
--- a/include/babeltrace/trace-ir/event-internal.h
+++ b/include/babeltrace/trace-ir/event-internal.h
@@ -2,10 +2,9 @@
 #define BABELTRACE_TRACE_IR_EVENT_INTERNAL_H
 
 /*
+ * Copyright 2017-2018 Philippe Proulx <pproulx@efficios.com>
  * Copyright 2013, 2014 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
- * Author: Jérémie Galarneau <jeremie.galarneau@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
@@ -33,7 +32,7 @@
 #include <babeltrace/assert-pre-internal.h>
 #include <babeltrace/babeltrace-internal.h>
 #include <babeltrace/value.h>
-#include <babeltrace/trace-ir/clock-value-internal.h>
+#include <babeltrace/trace-ir/clock-snapshot-internal.h>
 #include <babeltrace/trace-ir/stream-class.h>
 #include <babeltrace/trace-ir/stream.h>
 #include <babeltrace/trace-ir/stream-internal.h>
@@ -60,11 +59,10 @@ struct bt_event {
        /* Owned by this */
        struct bt_packet *packet;
 
-       struct bt_field_wrapper *header_field;
        struct bt_field *common_context_field;
        struct bt_field *specific_context_field;
        struct bt_field *payload_field;
-       struct bt_clock_value *default_cv;
+       struct bt_clock_snapshot *default_cs;
        bool frozen;
 };
 
@@ -89,13 +87,6 @@ void _bt_event_reset_dev_mode(struct bt_event *event)
 {
        BT_ASSERT(event);
 
-       if (event->header_field) {
-               bt_field_set_is_frozen(
-                       event->header_field->field, false);
-               bt_field_reset(
-                       event->header_field->field);
-       }
-
        if (event->common_context_field) {
                bt_field_set_is_frozen(
                        event->common_context_field, false);
@@ -129,8 +120,8 @@ void bt_event_reset(struct bt_event *event)
        BT_LIB_LOGD("Resetting event: %!+e", event);
        bt_event_set_is_frozen(event, false);
 
-       if (event->default_cv) {
-               bt_clock_value_reset(event->default_cv);
+       if (event->default_cs) {
+               bt_clock_snapshot_reset(event->default_cs);
        }
 
        bt_object_put_no_null_check(&event->packet->base);