static
struct trace_descriptor *bt_dummy_open_trace(const char *path, int flags,
- void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset,
+ void (*move_pos_slow)(struct stream_pos *pos, size_t offset,
int whence), FILE *metadata_fp)
{
struct ctf_text_stream_pos *pos;
struct trace_descriptor *ctf_text_open_trace(const char *path, int flags,
- void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset,
+ void (*move_pos_slow)(struct stream_pos *pos, size_t offset,
int whence), FILE *metadata_fp);
void ctf_text_close_trace(struct trace_descriptor *descriptor);
struct trace_descriptor *ctf_text_open_trace(const char *path, int flags,
- void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset,
+ void (*move_pos_slow)(struct stream_pos *pos, size_t offset,
int whence), FILE *metadata_fp)
{
struct ctf_text_stream_pos *pos;
static
struct trace_descriptor *ctf_open_trace(const char *path, int flags,
- void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset,
+ void (*move_pos_slow)(struct stream_pos *pos, size_t offset,
int whence), FILE *metadata_fp);
static
struct trace_descriptor *ctf_open_mmap_trace(
struct mmap_stream_list *mmap_list,
- void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset, int whence),
+ void (*move_pos_slow)(struct stream_pos *pos, size_t offset, int whence),
FILE *metadata_fp);
static
pos->parent.rw_table = write_dispatch_table;
pos->parent.event_cb = ctf_write_event;
if (fd >= 0)
- ctf_move_pos_slow(pos, 0, SEEK_SET); /* position for write */
+ ctf_move_pos_slow(&pos->parent, 0, SEEK_SET); /* position for write */
break;
default:
assert(0);
(void) g_array_free(pos->packet_index, TRUE);
}
-void ctf_move_pos_slow(struct ctf_stream_pos *pos, size_t offset, int whence)
+void ctf_move_pos_slow(struct stream_pos *stream_pos, size_t offset, int whence)
{
+ struct ctf_stream_pos *pos =
+ container_of(stream_pos, struct ctf_stream_pos, parent);
struct ctf_file_stream *file_stream =
container_of(pos, struct ctf_file_stream, pos);
int ret;
static
int ctf_open_trace_metadata_read(struct ctf_trace *td,
- void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset,
+ void (*move_pos_slow)(struct stream_pos *pos, size_t offset,
int whence), FILE *metadata_fp)
{
struct ctf_scanner *scanner;
}
/* Move pos back to beginning of file */
- ctf_move_pos_slow(pos, 0, SEEK_SET); /* position for write */
+ ctf_move_pos_slow(&pos->parent, 0, SEEK_SET); /* position for write */
return 0;
}
*/
static
int ctf_open_file_stream_read(struct ctf_trace *td, const char *path, int flags,
- void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset,
+ void (*move_pos_slow)(struct stream_pos *pos, size_t offset,
int whence))
{
int ret;
static
int ctf_open_trace_read(struct ctf_trace *td,
const char *path, int flags,
- void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset,
+ void (*move_pos_slow)(struct stream_pos *pos, size_t offset,
int whence), FILE *metadata_fp)
{
int ret;
static
struct trace_descriptor *ctf_open_trace(const char *path, int flags,
- void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset,
+ void (*move_pos_slow)(struct stream_pos *pos, size_t offset,
int whence), FILE *metadata_fp)
{
struct ctf_trace *td;
static
int ctf_open_mmap_stream_read(struct ctf_trace *td,
struct mmap_stream *mmap_info,
- void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset,
+ void (*move_pos_slow)(struct stream_pos *pos, size_t offset,
int whence))
{
int ret;
int ctf_open_mmap_trace_read(struct ctf_trace *td,
struct mmap_stream_list *mmap_list,
- void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset,
+ void (*move_pos_slow)(struct stream_pos *pos, size_t offset,
int whence),
FILE *metadata_fp)
{
static
struct trace_descriptor *ctf_open_mmap_trace(
struct mmap_stream_list *mmap_list,
- void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset, int whence),
+ void (*move_pos_slow)(struct stream_pos *pos, size_t offset, int whence),
FILE *metadata_fp)
{
struct ctf_trace *td;
ssize_t offset; /* offset from base, in bits. EOF for end of file. */
ssize_t last_offset; /* offset before the last read_event */
size_t cur_index; /* current index in packet index */
- void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset,
+ void (*move_pos_slow)(struct stream_pos *pos, size_t offset,
int whence); /* function called to switch packet */
int dummy; /* dummy position, for length calculation */
int ctf_sequence_read(struct stream_pos *pos, struct definition *definition);
int ctf_sequence_write(struct stream_pos *pos, struct definition *definition);
-void ctf_move_pos_slow(struct ctf_stream_pos *pos, size_t offset, int whence);
+void ctf_move_pos_slow(struct stream_pos *pos, size_t offset, int whence);
void ctf_init_pos(struct ctf_stream_pos *pos, int fd, int open_flags);
void ctf_fini_pos(struct ctf_stream_pos *pos);
&& (unlikely(pos->offset + bit_offset >= pos->packet_size))) {
printf_debug("ctf_move_pos_slow (before call): %zd\n",
pos->offset);
- ctf_move_pos_slow(pos, bit_offset, SEEK_CUR);
+ ctf_move_pos_slow(&pos->parent, bit_offset, SEEK_CUR);
printf_debug("ctf_move_pos_slow (after call): %zd\n",
pos->offset);
return;
if (pos->offset == pos->content_size) {
printf_debug("ctf_move_pos_slow (before call): %zd\n",
pos->offset);
- pos->move_pos_slow(pos, 0, SEEK_CUR);
+ pos->move_pos_slow(&pos->parent, 0, SEEK_CUR);
printf_debug("ctf_move_pos_slow (after call): %zd\n",
pos->offset);
}
typedef int bt_intern_str;
/* forward declaration */
-struct ctf_stream_pos;
+struct stream_pos;
/* Parent trace descriptor */
struct trace_descriptor {
bt_intern_str name;
struct trace_descriptor *(*open_trace)(const char *path, int flags,
- void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset,
- int whence), FILE *metadata_fp);
+ void (*move_pos_slow)(struct stream_pos *pos,
+ size_t offset, int whence),
+ FILE *metadata_fp);
struct trace_descriptor *(*open_mmap_trace)(
struct mmap_stream_list *mmap_list,
- void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset,
- int whence), FILE *metadata_fp);
+ void (*move_pos_slow)(struct stream_pos *pos,
+ size_t offset, int whence),
+ FILE *metadata_fp);
void (*close_trace)(struct trace_descriptor *descriptor);
};
continue;
stream_pos->cur_index = i;
- stream_pos->move_pos_slow(stream_pos, index->offset, SEEK_SET);
+ stream_pos->move_pos_slow(&stream_pos->parent,
+ index->offset, SEEK_SET);
while (cfs->parent.timestamp < timestamp) {
ret = stream_read_event(cfs);
if (ret < 0)
saved_pos->cur_index);
stream_pos->cur_index = saved_pos->cur_index;
- stream_pos->move_pos_slow(stream_pos, index->offset,
- SEEK_SET);
+ stream_pos->move_pos_slow(&stream_pos->parent,
+ index->offset, SEEK_SET);
/*
* the timestamp needs to be restored after
*/
break;
case BT_SEEK_BEGIN:
- file_stream->pos.move_pos_slow(&file_stream->pos, 0, SEEK_SET);
+ file_stream->pos.move_pos_slow(&file_stream->pos.parent,
+ 0, SEEK_SET);
ret = stream_read_event(file_stream);
break;
case BT_SEEK_TIME: