Fix API: rename unclear move_pos_slow to packet_seek

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/formats/bt-dummy/bt-dummy.c b/formats/bt-dummy/bt-dummy.c
index 8bc6a9bb3469470698e81709d08c43cd5758ad0e..3249317ae347fb0ab6a75ba9086e8859faea9d3d 100644 (file)
--- a/formats/bt-dummy/bt-dummy.c
+++ b/formats/bt-dummy/bt-dummy.c
@@ -40,7 +40,7 @@ int bt_dummy_write_event(struct stream_pos *ppos,
 
 static
 struct trace_descriptor *bt_dummy_open_trace(const char *path, int flags,
-               void (*move_pos_slow)(struct stream_pos *pos, size_t offset,
+               void (*packet_seek)(struct stream_pos *pos, size_t offset,
                        int whence), FILE *metadata_fp)
 {
        struct ctf_text_stream_pos *pos;

diff --git a/formats/ctf-text/ctf-text.c b/formats/ctf-text/ctf-text.c
index 85644a6b327c6b0700f390378dd10d6a75344d1b..62cb5310092dce9dcdbbc1f28673a11bd7259bbe 100644 (file)
--- a/formats/ctf-text/ctf-text.c
+++ b/formats/ctf-text/ctf-text.c
@@ -76,7 +76,7 @@ enum bt_loglevel {
 
 
 struct trace_descriptor *ctf_text_open_trace(const char *path, int flags,
-               void (*move_pos_slow)(struct stream_pos *pos, size_t offset,
+               void (*packet_seek)(struct stream_pos *pos, size_t offset,
                        int whence), FILE *metadata_fp);
 void ctf_text_close_trace(struct trace_descriptor *descriptor);
 
@@ -459,7 +459,7 @@ error:
 
 
 struct trace_descriptor *ctf_text_open_trace(const char *path, int flags,
-               void (*move_pos_slow)(struct stream_pos *pos, size_t offset,
+               void (*packet_seek)(struct stream_pos *pos, size_t offset,
                        int whence), FILE *metadata_fp)
 {
        struct ctf_text_stream_pos *pos;

diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c
index 8d617bcd620f66b8576a7a40ad2dd01f9f89ad44..51a87083f10cd82c67403be898edff8277decf3a 100644 (file)
--- a/formats/ctf/ctf.c
+++ b/formats/ctf/ctf.c
@@ -65,12 +65,12 @@ extern int yydebug;
 
 static
 struct trace_descriptor *ctf_open_trace(const char *path, int flags,
-               void (*move_pos_slow)(struct stream_pos *pos, size_t offset,
+               void (*packet_seek)(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 stream_pos *pos, size_t offset, int whence),
+               void (*packet_seek)(struct stream_pos *pos, size_t offset, int whence),
                FILE *metadata_fp);
 
 static
@@ -411,7 +411,7 @@ void ctf_init_pos(struct ctf_stream_pos *pos, int fd, int open_flags)
                pos->parent.rw_table = write_dispatch_table;
                pos->parent.event_cb = ctf_write_event;
                if (fd >= 0)
-                       ctf_move_pos_slow(&pos->parent, 0, SEEK_SET);   /* position for write */
+                       ctf_packet_seek(&pos->parent, 0, SEEK_SET);     /* position for write */
                break;
        default:
                assert(0);
@@ -436,7 +436,7 @@ void ctf_fini_pos(struct ctf_stream_pos *pos)
        (void) g_array_free(pos->packet_index, TRUE);
 }
 
-void ctf_move_pos_slow(struct stream_pos *stream_pos, size_t offset, int whence)
+void ctf_packet_seek(struct stream_pos *stream_pos, size_t offset, int whence)
 {
        struct ctf_stream_pos *pos =
                container_of(stream_pos, struct ctf_stream_pos, parent);
@@ -770,7 +770,7 @@ int ctf_open_trace_metadata_stream_read(struct ctf_trace *td, FILE **fp,
 
 static
 int ctf_open_trace_metadata_read(struct ctf_trace *td,
-               void (*move_pos_slow)(struct stream_pos *pos, size_t offset,
+               void (*packet_seek)(struct stream_pos *pos, size_t offset,
                        int whence), FILE *metadata_fp)
 {
        struct ctf_scanner *scanner;
@@ -781,10 +781,10 @@ int ctf_open_trace_metadata_read(struct ctf_trace *td,
 
        metadata_stream = g_new0(struct ctf_file_stream, 1);
 
-       if (move_pos_slow) {
-               metadata_stream->pos.move_pos_slow = move_pos_slow;
+       if (packet_seek) {
+               metadata_stream->pos.packet_seek = packet_seek;
        } else {
-               fprintf(stderr, "[error] move_pos_slow function undefined.\n");
+               fprintf(stderr, "[error] packet_seek function undefined.\n");
                ret = -1;
                goto end_stream;
        }
@@ -1208,7 +1208,7 @@ int create_stream_packet_index(struct ctf_trace *td,
        }
 
        /* Move pos back to beginning of file */
-       ctf_move_pos_slow(&pos->parent, 0, SEEK_SET);   /* position for write */
+       ctf_packet_seek(&pos->parent, 0, SEEK_SET);     /* position for write */
 
        return 0;
 }
@@ -1243,7 +1243,7 @@ error:
  */
 static
 int ctf_open_file_stream_read(struct ctf_trace *td, const char *path, int flags,
-               void (*move_pos_slow)(struct stream_pos *pos, size_t offset,
+               void (*packet_seek)(struct stream_pos *pos, size_t offset,
                        int whence))
 {
        int ret;
@@ -1256,10 +1256,10 @@ int ctf_open_file_stream_read(struct ctf_trace *td, const char *path, int flags,
        }
        file_stream = g_new0(struct ctf_file_stream, 1);
 
-       if (move_pos_slow) {
-               file_stream->pos.move_pos_slow = move_pos_slow;
+       if (packet_seek) {
+               file_stream->pos.packet_seek = packet_seek;
        } else {
-               fprintf(stderr, "[error] move_pos_slow function undefined.\n");
+               fprintf(stderr, "[error] packet_seek function undefined.\n");
                ret = -1;
                goto error_def;
        }
@@ -1294,7 +1294,7 @@ error:
 static
 int ctf_open_trace_read(struct ctf_trace *td,
                const char *path, int flags,
-               void (*move_pos_slow)(struct stream_pos *pos, size_t offset,
+               void (*packet_seek)(struct stream_pos *pos, size_t offset,
                        int whence), FILE *metadata_fp)
 {
        int ret;
@@ -1326,7 +1326,7 @@ int ctf_open_trace_read(struct ctf_trace *td,
         * Keep the metadata file separate.
         */
 
-       ret = ctf_open_trace_metadata_read(td, move_pos_slow, metadata_fp);
+       ret = ctf_open_trace_metadata_read(td, packet_seek, metadata_fp);
        if (ret) {
                goto error_metadata;
        }
@@ -1355,7 +1355,8 @@ int ctf_open_trace_read(struct ctf_trace *td,
                                || !strcmp(diriter->d_name, "..")
                                || !strcmp(diriter->d_name, "metadata"))
                        continue;
-               ret = ctf_open_file_stream_read(td, diriter->d_name, flags, move_pos_slow);
+               ret = ctf_open_file_stream_read(td, diriter->d_name,
+                                       flags, packet_seek);
                if (ret) {
                        fprintf(stderr, "[error] Open file stream error.\n");
                        goto readdir_error;
@@ -1377,7 +1378,7 @@ error:
 
 static
 struct trace_descriptor *ctf_open_trace(const char *path, int flags,
-               void (*move_pos_slow)(struct stream_pos *pos, size_t offset,
+               void (*packet_seek)(struct stream_pos *pos, size_t offset,
                        int whence), FILE *metadata_fp)
 {
        struct ctf_trace *td;
@@ -1391,7 +1392,7 @@ struct trace_descriptor *ctf_open_trace(const char *path, int flags,
                        fprintf(stderr, "[error] Path missing for input CTF trace.\n");
                        goto error;
                }
-               ret = ctf_open_trace_read(td, path, flags, move_pos_slow, metadata_fp);
+               ret = ctf_open_trace_read(td, path, flags, packet_seek, metadata_fp);
                if (ret)
                        goto error;
                break;
@@ -1460,7 +1461,7 @@ end:
 static
 int ctf_open_mmap_stream_read(struct ctf_trace *td,
                struct mmap_stream *mmap_info,
-               void (*move_pos_slow)(struct stream_pos *pos, size_t offset,
+               void (*packet_seek)(struct stream_pos *pos, size_t offset,
                        int whence))
 {
        int ret;
@@ -1469,7 +1470,7 @@ int ctf_open_mmap_stream_read(struct ctf_trace *td,
        file_stream = g_new0(struct ctf_file_stream, 1);
        ctf_init_mmap_pos(&file_stream->pos, mmap_info);
 
-       file_stream->pos.move_pos_slow = move_pos_slow;
+       file_stream->pos.packet_seek = packet_seek;
 
        ret = create_trace_definitions(td, &file_stream->parent);
        if (ret) {
@@ -1495,14 +1496,14 @@ error_def:
 
 int ctf_open_mmap_trace_read(struct ctf_trace *td,
                struct mmap_stream_list *mmap_list,
-               void (*move_pos_slow)(struct stream_pos *pos, size_t offset,
+               void (*packet_seek)(struct stream_pos *pos, size_t offset,
                        int whence),
                FILE *metadata_fp)
 {
        int ret;
        struct mmap_stream *mmap_info;
 
-       ret = ctf_open_trace_metadata_read(td, ctf_move_pos_slow, metadata_fp);
+       ret = ctf_open_trace_metadata_read(td, ctf_packet_seek, metadata_fp);
        if (ret) {
                goto error;
        }
@@ -1512,7 +1513,7 @@ int ctf_open_mmap_trace_read(struct ctf_trace *td,
         * stream ID to add to the right location in the stream array.
         */
        bt_list_for_each_entry(mmap_info, &mmap_list->head, list) {
-               ret = ctf_open_mmap_stream_read(td, mmap_info, move_pos_slow);
+               ret = ctf_open_mmap_stream_read(td, mmap_info, packet_seek);
                if (ret) {
                        fprintf(stderr, "[error] Open file mmap stream error.\n");
                        goto error;
@@ -1528,7 +1529,7 @@ error:
 static
 struct trace_descriptor *ctf_open_mmap_trace(
                struct mmap_stream_list *mmap_list,
-               void (*move_pos_slow)(struct stream_pos *pos, size_t offset, int whence),
+               void (*packet_seek)(struct stream_pos *pos, size_t offset, int whence),
                FILE *metadata_fp)
 {
        struct ctf_trace *td;
@@ -1539,12 +1540,12 @@ struct trace_descriptor *ctf_open_mmap_trace(
                                "required for mmap parsing\n");
                goto error;
        }
-       if (!move_pos_slow) {
-               fprintf(stderr, "[error] move_pos_slow function undefined.\n");
+       if (!packet_seek) {
+               fprintf(stderr, "[error] packet_seek function undefined.\n");
                goto error;
        }
        td = g_new0(struct ctf_trace, 1);
-       ret = ctf_open_mmap_trace_read(td, mmap_list, move_pos_slow, metadata_fp);
+       ret = ctf_open_mmap_trace_read(td, mmap_list, packet_seek, metadata_fp);
        if (ret)
                goto error_free;
 

diff --git a/include/babeltrace/ctf/types.h b/include/babeltrace/ctf/types.h
index 05a026e79918fa86fa0fd881105a8cac6fb908eb..24e1aa5b4783166ff222e8571083040a44c3b373 100644 (file)
--- a/include/babeltrace/ctf/types.h
+++ b/include/babeltrace/ctf/types.h
@@ -62,7 +62,7 @@ struct ctf_stream_pos {
        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 stream_pos *pos, size_t offset,
+       void (*packet_seek)(struct stream_pos *pos, size_t offset,
                        int whence); /* function called to switch packet */
 
        int dummy;              /* dummy position, for length calculation */
@@ -90,7 +90,7 @@ int ctf_array_write(struct stream_pos *pos, struct definition *definition);
 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 stream_pos *pos, size_t offset, int whence);
+void ctf_packet_seek(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);
@@ -109,17 +109,17 @@ void ctf_move_pos(struct ctf_stream_pos *pos, size_t bit_offset)
 
        if (pos->fd >= 0) {
                /*
-                * PROT_READ ctf_move_pos_slow is called from within
+                * PROT_READ ctf_packet_seek is called from within
                 * ctf_pos_get_event so end of packet does not change
                 * the packet context on for the last event of the
                 * packet.
                 */
                if ((pos->prot == PROT_WRITE)
                        && (unlikely(pos->offset + bit_offset >= pos->packet_size))) {
-                       printf_debug("ctf_move_pos_slow (before call): %zd\n",
+                       printf_debug("ctf_packet_seek (before call): %zd\n",
                                     pos->offset);
-                       ctf_move_pos_slow(&pos->parent, bit_offset, SEEK_CUR);
-                       printf_debug("ctf_move_pos_slow (after call): %zd\n",
+                       ctf_packet_seek(&pos->parent, bit_offset, SEEK_CUR);
+                       printf_debug("ctf_packet_seek (after call): %zd\n",
                                     pos->offset);
                        return;
                }
@@ -192,10 +192,10 @@ void ctf_pos_get_event(struct ctf_stream_pos *pos)
 {
        assert(pos->offset <= pos->content_size);
        if (pos->offset == pos->content_size) {
-               printf_debug("ctf_move_pos_slow (before call): %zd\n",
+               printf_debug("ctf_packet_seek (before call): %zd\n",
                             pos->offset);
-               pos->move_pos_slow(&pos->parent, 0, SEEK_CUR);
-               printf_debug("ctf_move_pos_slow (after call): %zd\n",
+               pos->packet_seek(&pos->parent, 0, SEEK_CUR);
+               printf_debug("ctf_packet_seek (after call): %zd\n",
                             pos->offset);
        }
 }

diff --git a/include/babeltrace/format.h b/include/babeltrace/format.h
index d30db9c5e38e2b677a7ea939631d76c3841931d3..bba056cc5a7c799a99451f265ae15248645e1c9b 100644 (file)
--- a/include/babeltrace/format.h
+++ b/include/babeltrace/format.h
@@ -47,12 +47,12 @@ struct format {
        bt_intern_str name;
 
        struct trace_descriptor *(*open_trace)(const char *path, int flags,
-                       void (*move_pos_slow)(struct stream_pos *pos,
+                       void (*packet_seek)(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 stream_pos *pos,
+                       void (*packet_seek)(struct stream_pos *pos,
                                size_t offset, int whence),
                        FILE *metadata_fp);
        void (*close_trace)(struct trace_descriptor *descriptor);

diff --git a/lib/context.c b/lib/context.c
index 32efb85db0f57b81c65dafee81d56e97c4926dee..f4c234aa6f955960edccb0f0550928c254b22d74 100644 (file)
--- a/lib/context.c
+++ b/lib/context.c
@@ -32,7 +32,7 @@
 #include <fcntl.h> /* For O_RDONLY */
 
 /* TODO ybrosseau: should be hidden in the CTF format */
-#include <babeltrace/ctf/types.h> /* for ctf_move_pos_slow */
+#include <babeltrace/ctf/types.h> /* for ctf_packet_seek */
 
 #include <glib.h>
 
@@ -72,7 +72,7 @@ int bt_context_add_trace(struct bt_context *ctx, const char *path,
                goto end;
        }
        td = fmt->open_trace(path, O_RDONLY,
-                            ctf_move_pos_slow, NULL);
+                            ctf_packet_seek, NULL);
        if (!td) {
                fprintf(stderr, "[error] [Context] Cannot open_trace of the format %s .\n\n",
                                path);

diff --git a/lib/iterator.c b/lib/iterator.c
index d595e7617a82b4998d3bf82c6cd14eb098711520..2cb40cbc5b166a4e4884c58f4d52e817a7a7e8a0 100644 (file)
--- a/lib/iterator.c
+++ b/lib/iterator.c
@@ -116,7 +116,7 @@ static int seek_file_stream_by_timestamp(struct ctf_file_stream *cfs,
                        continue;
 
                stream_pos->cur_index = i;
-               stream_pos->move_pos_slow(&stream_pos->parent,
+               stream_pos->packet_seek(&stream_pos->parent,
                        index->offset, SEEK_SET);
                while (cfs->parent.timestamp < timestamp) {
                        ret = stream_read_event(cfs);
@@ -204,12 +204,12 @@ int bt_iter_set_pos(struct bt_iter *iter, const struct bt_iter_pos *iter_pos)
                                        saved_pos->cur_index);
 
                        stream_pos->cur_index = saved_pos->cur_index;
-                       stream_pos->move_pos_slow(&stream_pos->parent,
+                       stream_pos->packet_seek(&stream_pos->parent,
                                        index->offset, SEEK_SET);
 
                        /*
                         * the timestamp needs to be restored after
-                        * move_pos_slow, because this function resets
+                        * packet_seek, because this function resets
                         * the timestamp to the beginning of the packet
                         */
                        stream->timestamp = saved_pos->current_timestamp;
@@ -387,7 +387,7 @@ static int babeltrace_filestream_seek(struct ctf_file_stream *file_stream,
                 */
                break;
        case BT_SEEK_BEGIN:
-               file_stream->pos.move_pos_slow(&file_stream->pos.parent,
+               file_stream->pos.packet_seek(&file_stream->pos.parent,
                                0, SEEK_SET);
                ret = stream_read_event(file_stream);
                break;