int convert_trace(struct trace_descriptor *td_write,
struct bt_context *ctx)
{
- struct babeltrace_iter *iter;
+ struct bt_iter *iter;
struct ctf_stream *stream;
struct ctf_stream_event *event;
struct ctf_text_stream_pos *sout;
- struct trace_collection_pos begin_pos;
+ struct bt_iter_pos begin_pos;
int ret;
sout = container_of(td_write, struct ctf_text_stream_pos,
trace_descriptor);
begin_pos.type = BT_SEEK_BEGIN;
- iter = babeltrace_iter_create(ctx, &begin_pos, NULL);
+ iter = bt_iter_create(ctx, &begin_pos, NULL);
if (!iter) {
ret = -1;
goto error_iter;
}
- while (babeltrace_iter_read_event(iter, &stream, &event) == 0) {
+ while (bt_iter_read_event(iter, &stream, &event) == 0) {
ret = sout->parent.event_cb(&sout->parent, stream);
if (ret) {
fprintf(stderr, "[error] Writing event failed.\n");
goto end;
}
- ret = babeltrace_iter_next(iter);
+ ret = bt_iter_next(iter);
if (ret < 0)
goto end;
}
ret = 0;
end:
- babeltrace_iter_destroy(iter);
+ bt_iter_destroy(iter);
error_iter:
return ret;
}
typedef GQuark bt_event_name;
/* Forward declarations */
-struct babeltrace_iter;
+struct bt_iter;
struct ctf_stream_event;
struct ctf_stream;
struct bt_dependencies;
/*
* struct bt_dependencies must be destroyed explicitly if not passed as
- * parameter to a babeltrace_iter_add_callback().
+ * parameter to a bt_iter_add_callback().
*/
void babeltrace_dependencies_destroy(struct bt_dependencies *dep);
/*
- * babeltrace_iter_add_callback: Add a callback to iterator.
+ * bt_iter_add_callback: Add a callback to iterator.
*
* @iter: trace collection iterator (input)
* @event: event to target. 0 for all events.
* destroyed, but they belong to the babeltrace library.
*
* (note to implementor: we need to keep a gptrarray of struct
- * bt_dependencies to "garbage collect" in struct babeltrace_iter, and
+ * bt_dependencies to "garbage collect" in struct bt_iter, and
* dependencies need to have a refcount to handle the case where they
* would be passed to more than one iterator. Upon iterator detroy, we
* iterate on all the gc ptrarray and decrement the refcounts, freeing
* if we reach 0.)
* (note to implementor: we calculate the dependency graph when
- * babeltrace_iter_read_event() is executed after a
- * babeltrace_iter_add_callback(). Beware that it is valid to create/add
+ * bt_iter_read_event() is executed after a
+ * bt_iter_add_callback(). Beware that it is valid to create/add
* callbacks/read/add more callbacks/read some more.)
*/
-int babeltrace_iter_add_callback(struct babeltrace_iter *iter,
+int bt_iter_add_callback(struct bt_iter *iter,
bt_event_name event, void *private_data, int flags,
enum bt_cb_ret (*callback)(struct bt_ctf_data *ctf_data,
void *caller_data),
int refcount; /* free when decremented to 0 */
};
-void process_callbacks(struct babeltrace_iter *iter,
+void process_callbacks(struct bt_iter *iter,
struct ctf_stream *stream);
#endif /* _BABELTRACE_CALLBACKS_INTERNAL_H */
*/
/*
- * struct babeltrace_iter: data structure representing an iterator on a trace
+ * struct bt_iter: data structure representing an iterator on a trace
* collection.
*/
-struct babeltrace_iter {
+struct bt_iter {
struct ptr_heap *stream_heap;
struct bt_context *ctx;
- struct trace_collection_pos *end_pos;
+ struct bt_iter_pos *end_pos;
GArray *callbacks; /* Array of struct bt_stream_callbacks */
struct bt_callback_chain main_callbacks; /* For all events */
/*
* Flag indicating if dependency graph needs to be recalculated.
- * Set by babeltrace_iter_add_callback(), and checked (and
- * cleared) by upon entry into babeltrace_iter_read_event().
- * babeltrace_iter_read_event() is responsible for calling dep
+ * Set by bt_iter_add_callback(), and checked (and
+ * cleared) by upon entry into bt_iter_read_event().
+ * bt_iter_read_event() is responsible for calling dep
* graph calculation if it sees this flag set.
*/
int recalculate_dep_graph;
* Array of pointers to struct bt_dependencies, for garbage
* collection. We're not using a linked list here because each
* struct bt_dependencies can belong to more than one
- * babeltrace_iter.
+ * bt_iter.
*/
GPtrArray *dep_gc;
};
#include <babeltrace/context.h>
/* Forward declarations */
-struct babeltrace_iter;
+struct bt_iter;
struct ctf_stream_event;
struct ctf_stream;
-struct babeltrace_saved_pos;
+struct bt_saved_pos;
-struct trace_collection_pos {
+struct bt_iter_pos {
enum {
BT_SEEK_TIME, /* uses u.seek_time */
BT_SEEK_RESTORE, /* uses u.restore */
} type;
union {
uint64_t seek_time;
- struct babeltrace_saved_pos *restore;
+ struct bt_saved_pos *restore;
} u;
};
/*
- * babeltrace_iter_create - Allocate a trace collection iterator.
+ * bt_iter_create - Allocate a trace collection iterator.
*
* begin_pos and end_pos are optional parameters to specify the position
* at which the trace collection should be seeked upon iterator
* creation. By default, if end_pos is NULL, a BT_SEEK_END (end of
* trace) is the EOF criterion.
*/
-struct babeltrace_iter *babeltrace_iter_create(struct bt_context *ctx,
- struct trace_collection_pos *begin_pos,
- struct trace_collection_pos *end_pos);
+struct bt_iter *bt_iter_create(struct bt_context *ctx,
+ struct bt_iter_pos *begin_pos,
+ struct bt_iter_pos *end_pos);
/*
- * babeltrace_iter_destroy - Free a trace collection iterator.
+ * bt_iter_destroy - Free a trace collection iterator.
*/
-void babeltrace_iter_destroy(struct babeltrace_iter *iter);
+void bt_iter_destroy(struct bt_iter *iter);
/*
- * babeltrace_iter_next: Move trace collection position to the next event.
+ * bt_iter_next: Move trace collection position to the next event.
*
* Returns 0 on success, a negative value on error
*/
-int babeltrace_iter_next(struct babeltrace_iter *iter);
+int bt_iter_next(struct bt_iter *iter);
/*
- * babeltrace_iter_save_pos - Save the current trace collection position.
+ * bt_iter_save_pos - Save the current trace collection position.
*
* The position returned by this function needs to be freed by
- * babeltrace_iter_free_pos after use.
+ * bt_iter_free_pos after use.
*/
-struct trace_collection_pos *
- babeltrace_iter_save_pos(struct babeltrace_iter *iter);
+struct bt_iter_pos *
+ bt_iter_save_pos(struct bt_iter *iter);
/*
- * babeltrace_iter_free_pos - Free the position.
+ * bt_iter_free_pos - Free the position.
*/
-void babeltrace_iter_free_pos(struct trace_collection_pos *pos);
+void bt_iter_free_pos(struct bt_iter_pos *pos);
/*
- * babeltrace_iter_seek: seek iterator to given position.
+ * bt_iter_seek: seek iterator to given position.
*
* Return EOF if position is after the last event of the trace collection.
* Return other negative value for other errors.
* Return 0 for success.
*/
-int babeltrace_iter_seek(struct babeltrace_iter *iter,
- const struct trace_collection_pos *pos);
+int bt_iter_seek(struct bt_iter *iter,
+ const struct bt_iter_pos *pos);
/*
- * babeltrace_iter_read_event: Read the iterator's current event data.
+ * bt_iter_read_event: Read the iterator's current event data.
*
* @iter: trace collection iterator (input)
* @stream: stream containing event at current position (output)
* @event: current event (output)
* Return 0 on success, negative error value on error.
*/
-int babeltrace_iter_read_event(struct babeltrace_iter *iter,
+int bt_iter_read_event(struct bt_iter *iter,
struct ctf_stream **stream,
struct ctf_stream_event **event);
}
/*
- * babeltrace_iter_add_callback: Add a callback to iterator.
+ * bt_iter_add_callback: Add a callback to iterator.
*/
-int babeltrace_iter_add_callback(struct babeltrace_iter *iter,
+int bt_iter_add_callback(struct bt_iter *iter,
bt_event_name event, void *private_data, int flags,
enum bt_cb_ret (*callback)(struct bt_ctf_data *ctf_data,
void *private_data),
return event;
}
-void process_callbacks(struct babeltrace_iter *iter,
+void process_callbacks(struct bt_iter *iter,
struct ctf_stream *stream)
{
struct bt_stream_callbacks *bt_stream_cb;
ssize_t offset; /* offset from base, in bits. EOF for end of file. */
};
-struct babeltrace_saved_pos {
+struct bt_saved_pos {
struct trace_collection *tc;
GArray *stream_saved_pos; /* Contains struct stream_saved_pos */
};
* The stream_id parameter is only useful for BT_SEEK_RESTORE.
*/
static int babeltrace_filestream_seek(struct ctf_file_stream *file_stream,
- const struct trace_collection_pos *begin_pos,
+ const struct bt_iter_pos *begin_pos,
unsigned long stream_id)
{
int ret = 0;
}
/*
- * babeltrace_iter_seek: seek iterator to given position.
+ * bt_iter_seek: seek iterator to given position.
*/
-int babeltrace_iter_seek(struct babeltrace_iter *iter,
- const struct trace_collection_pos *begin_pos)
+int bt_iter_seek(struct bt_iter *iter,
+ const struct bt_iter_pos *begin_pos)
{
int i, stream_id;
int ret = 0;
return ret;
}
-struct babeltrace_iter *babeltrace_iter_create(struct bt_context *ctx,
- struct trace_collection_pos *begin_pos,
- struct trace_collection_pos *end_pos)
+struct bt_iter *bt_iter_create(struct bt_context *ctx,
+ struct bt_iter_pos *begin_pos,
+ struct bt_iter_pos *end_pos)
{
int i, stream_id;
int ret = 0;
- struct babeltrace_iter *iter;
+ struct bt_iter *iter;
- iter = malloc(sizeof(struct babeltrace_iter));
+ iter = malloc(sizeof(struct bt_iter));
if (!iter)
goto error_malloc;
iter->stream_heap = g_new(struct ptr_heap, 1);
return NULL;
}
-void babeltrace_iter_destroy(struct babeltrace_iter *iter)
+void bt_iter_destroy(struct bt_iter *iter)
{
struct bt_stream_callbacks *bt_stream_cb;
struct bt_callback_chain *bt_chain;
free(iter);
}
-int babeltrace_iter_next(struct babeltrace_iter *iter)
+int bt_iter_next(struct bt_iter *iter)
{
struct ctf_file_stream *file_stream, *removed;
int ret;
return ret;
}
-int babeltrace_iter_read_event(struct babeltrace_iter *iter,
+int bt_iter_read_event(struct bt_iter *iter,
struct ctf_stream **stream,
struct ctf_stream_event **event)
{
projects / babeltrace.git / commitdiff
