g_free(iter);
return NULL;
}
+ iter->callbacks = g_array_new(0, 1, sizeof(struct bt_stream_callbacks));
+ iter->recalculate_dep_graph = 0;
+ iter->main_callbacks.callback = NULL;
+ iter->dep_gc = g_ptr_array_new();
return iter;
}
void bt_ctf_iter_destroy(struct bt_ctf_iter *iter)
{
+ struct bt_stream_callbacks *bt_stream_cb;
+ struct bt_callback_chain *bt_chain;
+ int i, j;
+
+ /* free all events callbacks */
+ if (iter->main_callbacks.callback)
+ g_array_free(iter->main_callbacks.callback, TRUE);
+
+ /* free per-event callbacks */
+ for (i = 0; i < iter->callbacks->len; i++) {
+ bt_stream_cb = &g_array_index(iter->callbacks,
+ struct bt_stream_callbacks, i);
+ if (!bt_stream_cb || !bt_stream_cb->per_id_callbacks)
+ continue;
+ for (j = 0; j < bt_stream_cb->per_id_callbacks->len; j++) {
+ bt_chain = &g_array_index(bt_stream_cb->per_id_callbacks,
+ struct bt_callback_chain, j);
+ if (bt_chain->callback) {
+ g_array_free(bt_chain->callback, TRUE);
+ }
+ }
+ g_array_free(bt_stream_cb->per_id_callbacks, TRUE);
+ }
+
bt_iter_fini(&iter->parent);
g_free(iter);
}
ret->event = g_ptr_array_index(ret->stream->events_by_id,
ret->stream->event_id);
- if (ret->stream->stream_id > iter->parent.callbacks->len)
+ if (ret->stream->stream_id > iter->callbacks->len)
goto end;
- process_callbacks(&iter->parent, ret->stream);
+ process_callbacks(iter, ret->stream);
end:
return ret;
return NULL;
}
-enum ctf_type_id bt_ctf_field_type(struct definition *def)
+enum ctf_type_id bt_ctf_field_type(const struct definition *def)
{
if (def)
return def->declaration->id;
return -1;
}
-uint64_t bt_ctf_get_timestamp(struct bt_ctf_event *event)
+uint64_t bt_ctf_get_timestamp_raw(struct bt_ctf_event *event)
{
if (event && event->stream->has_timestamp)
return event->stream->timestamp;
else
- return 0;
+ return -1ULL;
+}
+
+uint64_t bt_ctf_get_timestamp(struct bt_ctf_event *event)
+{
+ uint64_t ts_nsec;
+ struct ctf_trace *trace;
+ struct trace_collection *tc;
+ uint64_t tc_offset;
+ uint64_t timestamp;
+
+ if (!event->stream->has_timestamp) {
+ return -1ULL;
+ }
+
+ trace = event->stream->stream_class->trace;
+ tc = trace->collection;
+ tc_offset = tc->single_clock_offset_avg;
+ timestamp = event->stream->timestamp;
+ if (event->stream->current_clock->freq == 1000000000ULL) {
+ ts_nsec = timestamp;
+ } else {
+ ts_nsec = (uint64_t) ((double) timestamp * 1000000000.0
+ / (double) event->stream->current_clock->freq);
+ }
+ ts_nsec += tc_offset;
+
+ return ts_nsec;
}
static void bt_ctf_field_set_error(int error)
return ret;
}
-uint64_t bt_ctf_get_uint64(struct definition *field)
+uint64_t bt_ctf_get_uint64(const struct definition *field)
{
unsigned int ret = 0;
return ret;
}
-int64_t bt_ctf_get_int64(struct definition *field)
+int64_t bt_ctf_get_int64(const struct definition *field)
{
int ret = 0;
}
-char *bt_ctf_get_char_array(struct definition *field)
+char *bt_ctf_get_char_array(const struct definition *field)
{
char *ret = NULL;
return ret;
}
-char *bt_ctf_get_string(struct definition *field)
+char *bt_ctf_get_string(const struct definition *field)
{
char *ret = NULL;