#include <babeltrace/compat/time-internal.h>
#include <babeltrace/compat/utc-internal.h>
-#include <babeltrace/graph/notification-iterator.h>
-#include <babeltrace/graph/private-notification-iterator.h>
-#include <babeltrace/graph/notification.h>
-#include <babeltrace/graph/notification-event.h>
-#include <babeltrace/graph/notification-stream.h>
-#include <babeltrace/graph/notification-packet.h>
-#include <babeltrace/graph/component-filter.h>
-#include <babeltrace/graph/private-component-filter.h>
-#include <babeltrace/graph/private-port.h>
-#include <babeltrace/graph/private-connection.h>
-#include <babeltrace/graph/private-component.h>
-#include <babeltrace/graph/connection.h>
-#include <babeltrace/ctf-ir/event.h>
-#include <babeltrace/ctf-ir/stream.h>
-#include <babeltrace/ctf-ir/stream-class.h>
-#include <babeltrace/ctf-ir/clock-class.h>
-#include <babeltrace/ctf-ir/packet.h>
-#include <babeltrace/ctf-ir/trace.h>
-#include <babeltrace/ctf-ir/fields.h>
+#include <babeltrace/babeltrace.h>
#include <assert.h>
#include <plugins-common.h>
static
gboolean close_packets(gpointer key, gpointer value, gpointer user_data)
{
- struct bt_ctf_packet *writer_packet = value;
+ struct bt_packet *writer_packet = value;
bt_put(writer_packet);
return TRUE;
}
BT_HIDDEN
-void trimmer_iterator_finalize(struct bt_private_notification_iterator *it)
+void trimmer_iterator_finalize(struct bt_private_connection_private_notification_iterator *it)
{
struct trimmer_iterator *trim_it;
- trim_it = bt_private_notification_iterator_get_user_data(it);
+ trim_it = bt_private_connection_private_notification_iterator_get_user_data(it);
assert(trim_it);
bt_put(trim_it->input_iterator);
BT_HIDDEN
enum bt_notification_iterator_status trimmer_iterator_init(
- struct bt_private_notification_iterator *iterator,
+ struct bt_private_connection_private_notification_iterator *iterator,
struct bt_private_port *port)
{
enum bt_notification_iterator_status ret =
struct bt_private_port *input_port = NULL;
struct bt_private_connection *connection = NULL;
struct bt_private_component *component =
- bt_private_notification_iterator_get_private_component(iterator);
+ bt_private_connection_private_notification_iterator_get_private_component(iterator);
struct trimmer_iterator *it_data = g_new0(struct trimmer_iterator, 1);
static const enum bt_notification_type notif_types[] = {
BT_NOTIFICATION_TYPE_EVENT,
it_data->packet_map = g_hash_table_new_full(g_direct_hash,
g_direct_equal, NULL, NULL);
- it_ret = bt_private_notification_iterator_set_user_data(iterator,
+ it_ret = bt_private_connection_private_notification_iterator_set_user_data(iterator,
it_data);
if (it_ret) {
goto end;
if (bound->lazy_values.gmt) {
/* Get day, month, year. */
if (!bt_gmtime_r(&timeval, &tm)) {
- BT_LOGE_STR("Failure in bt_gmtime_r()");
+ BT_LOGE_STR("Failure in bt_gmtime_r().");
goto error;
}
tm.tm_sec = bound->lazy_values.ss;
} else {
/* Get day, month, year. */
if (!bt_localtime_r(&timeval, &tm)) {
- BT_LOGE_STR("Failure in bt_localtime_r()");
+ BT_LOGE_STR("Failure in bt_localtime_r().");
goto error;
}
tm.tm_sec = bound->lazy_values.ss;
{
int64_t ts;
int clock_ret;
- struct bt_ctf_event *event = NULL, *writer_event;
+ struct bt_event *event = NULL, *writer_event;
bool in_range = true;
- struct bt_ctf_clock_class *clock_class = NULL;
- struct bt_ctf_trace *trace = NULL;
- struct bt_ctf_stream *stream = NULL;
- struct bt_ctf_stream_class *stream_class = NULL;
- struct bt_ctf_clock_value *clock_value = NULL;
+ struct bt_clock_class *clock_class = NULL;
+ struct bt_trace *trace = NULL;
+ struct bt_stream *stream = NULL;
+ struct bt_stream_class *stream_class = NULL;
+ struct bt_clock_value *clock_value = NULL;
bool lazy_update = false;
struct bt_notification *new_notification = NULL;
struct bt_clock_class_priority_map *cc_prio_map;
assert(new_notification);
bt_put(cc_prio_map);
- stream = bt_ctf_event_get_stream(event);
+ stream = bt_event_get_stream(event);
assert(stream);
- stream_class = bt_ctf_stream_get_class(stream);
+ stream_class = bt_stream_get_class(stream);
assert(stream_class);
- trace = bt_ctf_stream_class_get_trace(stream_class);
+ trace = bt_stream_class_get_trace(stream_class);
assert(trace);
/* FIXME multi-clock? */
- clock_class = bt_ctf_trace_get_clock_class_by_index(trace, 0);
+ clock_class = bt_trace_get_clock_class_by_index(trace, 0);
if (!clock_class) {
goto end;
}
- clock_value = bt_ctf_event_get_clock_value(event, clock_class);
+ clock_value = bt_event_get_clock_value(event, clock_class);
if (!clock_value) {
- BT_LOGE_STR("Failed to retrieve clock value");
+ BT_LOGE_STR("Failed to retrieve clock value.");
goto error;
}
- clock_ret = bt_ctf_clock_value_get_value_ns_from_epoch(
+ clock_ret = bt_clock_value_get_value_ns_from_epoch(
clock_value, &ts);
if (clock_ret) {
- BT_LOGE_STR("Failed to retrieve clock value timestamp");
+ BT_LOGE_STR("Failed to retrieve clock value timestamp.");
goto error;
}
if (update_lazy_bound(begin, "begin", ts, &lazy_update)) {
}
if (lazy_update && begin->set && end->set) {
if (begin->value > end->value) {
- BT_LOGE_STR("Unexpected: time range begin value is above end value");
+ BT_LOGE_STR("Unexpected: time range begin value is above end value.");
goto error;
}
}
}
static
-int ns_from_integer_field(struct bt_ctf_field *integer, int64_t *ns)
+int ns_from_integer_field(struct bt_field *integer, int64_t *ns)
{
int ret = 0;
int is_signed;
uint64_t raw_clock_value;
- struct bt_ctf_field_type *integer_type = NULL;
- struct bt_ctf_clock_class *clock_class = NULL;
- struct bt_ctf_clock_value *clock_value = NULL;
+ struct bt_field_type *integer_type = NULL;
+ struct bt_clock_class *clock_class = NULL;
+ struct bt_clock_value *clock_value = NULL;
- integer_type = bt_ctf_field_get_type(integer);
+ integer_type = bt_field_get_type(integer);
assert(integer_type);
- clock_class = bt_ctf_field_type_integer_get_mapped_clock_class(
+ clock_class = bt_field_type_integer_get_mapped_clock_class(
integer_type);
if (!clock_class) {
ret = -1;
is_signed = bt_ctf_field_type_integer_get_signed(integer_type);
if (!is_signed) {
- ret = bt_ctf_field_unsigned_integer_get_value(integer,
+ ret = bt_field_unsigned_integer_get_value(integer,
&raw_clock_value);
if (ret) {
goto end;
goto end;
}
- clock_value = bt_ctf_clock_value_create(clock_class, raw_clock_value);
+ clock_value = bt_clock_value_create(clock_class, raw_clock_value);
if (!clock_value) {
goto end;
}
- ret = bt_ctf_clock_value_get_value_ns_from_epoch(clock_value, ns);
+ ret = bt_clock_value_get_value_ns_from_epoch(clock_value, ns);
end:
bt_put(integer_type);
bt_put(clock_class);
* timestamp minus the offset.
*/
static
-int64_t get_raw_timestamp(struct bt_ctf_packet *writer_packet,
+int64_t get_raw_timestamp(struct bt_packet *writer_packet,
int64_t timestamp)
{
- struct bt_ctf_clock_class *writer_clock_class;
+ struct bt_clock_class *writer_clock_class;
int64_t sec_offset, cycles_offset, ns;
- struct bt_ctf_trace *writer_trace;
- struct bt_ctf_stream *writer_stream;
- struct bt_ctf_stream_class *writer_stream_class;
+ struct bt_trace *writer_trace;
+ struct bt_stream *writer_stream;
+ struct bt_stream_class *writer_stream_class;
int ret;
uint64_t freq;
- writer_stream = bt_ctf_packet_get_stream(writer_packet);
+ writer_stream = bt_packet_get_stream(writer_packet);
assert(writer_stream);
- writer_stream_class = bt_ctf_stream_get_class(writer_stream);
+ writer_stream_class = bt_stream_get_class(writer_stream);
assert(writer_stream_class);
- writer_trace = bt_ctf_stream_class_get_trace(writer_stream_class);
+ writer_trace = bt_stream_class_get_trace(writer_stream_class);
assert(writer_trace);
/* FIXME multi-clock? */
- writer_clock_class = bt_ctf_trace_get_clock_class_by_index(
+ writer_clock_class = bt_trace_get_clock_class_by_index(
writer_trace, 0);
assert(writer_clock_class);
- ret = bt_ctf_clock_class_get_offset_s(writer_clock_class, &sec_offset);
+ ret = bt_clock_class_get_offset_s(writer_clock_class, &sec_offset);
assert(!ret);
ns = sec_offset * NSEC_PER_SEC;
- freq = bt_ctf_clock_class_get_frequency(writer_clock_class);
+ freq = bt_clock_class_get_frequency(writer_clock_class);
assert(freq != -1ULL);
- ret = bt_ctf_clock_class_get_offset_cycles(writer_clock_class, &cycles_offset);
+ ret = bt_clock_class_get_offset_cycles(writer_clock_class, &cycles_offset);
assert(!ret);
ns += ns_from_value(freq, cycles_offset);
{
int64_t begin_ns, pkt_begin_ns, end_ns, pkt_end_ns;
bool in_range = true;
- struct bt_ctf_packet *packet = NULL, *writer_packet = NULL;
- struct bt_ctf_field *packet_context = NULL,
+ struct bt_packet *packet = NULL, *writer_packet = NULL;
+ struct bt_field *packet_context = NULL,
*timestamp_begin = NULL,
*timestamp_end = NULL;
struct bt_notification *new_notification = NULL;
goto end;
}
- packet_context = bt_ctf_packet_get_context(writer_packet);
+ packet_context = bt_packet_get_context(writer_packet);
if (!packet_context) {
goto end_no_notif;
}
- if (!bt_ctf_field_is_structure(packet_context)) {
+ if (!bt_field_is_structure(packet_context)) {
goto end_no_notif;
}
- timestamp_begin = bt_ctf_field_structure_get_field(
+ timestamp_begin = bt_field_structure_get_field_by_name(
packet_context, "timestamp_begin");
- if (!timestamp_begin || !bt_ctf_field_is_integer(timestamp_begin)) {
+ if (!timestamp_begin || !bt_field_is_integer(timestamp_begin)) {
goto end_no_notif;
}
- timestamp_end = bt_ctf_field_structure_get_field(
+ timestamp_end = bt_field_structure_get_field_by_name(
packet_context, "timestamp_end");
- if (!timestamp_end || !bt_ctf_field_is_integer(timestamp_end)) {
+ if (!timestamp_end || !bt_field_is_integer(timestamp_end)) {
goto end_no_notif;
}
}
if (lazy_update && begin->set && end->set) {
if (begin->value > end->value) {
- BT_LOGE_STR("Unexpected: time range begin value is above end value");
+ BT_LOGE_STR("Unexpected: time range begin value is above end value.");
goto end_no_notif;
}
}
struct bt_notification *notification,
struct trimmer_iterator *trim_it)
{
- struct bt_ctf_stream *stream;
+ struct bt_stream *stream;
stream = bt_notification_stream_end_get_stream(notification);
assert(stream);
}
BT_HIDDEN
-struct bt_notification_iterator_next_return trimmer_iterator_next(
- struct bt_private_notification_iterator *iterator)
+struct bt_notification_iterator_next_method_return trimmer_iterator_next(
+ struct bt_private_connection_private_notification_iterator *iterator)
{
struct trimmer_iterator *trim_it = NULL;
struct bt_private_component *component = NULL;
struct trimmer *trimmer = NULL;
struct bt_notification_iterator *source_it = NULL;
- struct bt_notification_iterator_next_return ret = {
+ struct bt_notification_iterator_next_method_return ret = {
.status = BT_NOTIFICATION_ITERATOR_STATUS_OK,
.notification = NULL,
};
bool notification_in_range = false;
- trim_it = bt_private_notification_iterator_get_user_data(iterator);
+ trim_it = bt_private_connection_private_notification_iterator_get_user_data(iterator);
assert(trim_it);
- component = bt_private_notification_iterator_get_private_component(
+ component = bt_private_connection_private_notification_iterator_get_private_component(
iterator);
assert(component);
trimmer = bt_private_component_get_user_data(component);
bt_put(component);
return ret;
}
-
-BT_HIDDEN
-enum bt_notification_iterator_status trimmer_iterator_seek_time(
- struct bt_private_notification_iterator *iterator,
- int64_t time)
-{
- return BT_NOTIFICATION_ITERATOR_STATUS_OK;
-}
projects / babeltrace.git / blobdiff