Namespace the struct mmap_stream

This struct is exposed in the public API so we need to namespace it.

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

diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c
index 2411f7ff43e4afc3ede991396949d3d06a724e85..3bd1cc1e2b454ce190102c4924eb1bb7fba49176 100644 (file)
--- a/formats/ctf/ctf.c
+++ b/formats/ctf/ctf.c
@@ -82,7 +82,7 @@ struct bt_trace_descriptor *ctf_open_trace(const char *path, int flags,
                FILE *metadata_fp);
 static
 struct bt_trace_descriptor *ctf_open_mmap_trace(
                FILE *metadata_fp);
 static
 struct bt_trace_descriptor *ctf_open_mmap_trace(

-               struct mmap_stream_list *mmap_list,
+               struct bt_mmap_stream_list *mmap_list,

                void (*packet_seek)(struct bt_stream_pos *pos, size_t index,
                        int whence),
                FILE *metadata_fp);
                void (*packet_seek)(struct bt_stream_pos *pos, size_t index,
                        int whence),
                FILE *metadata_fp);


@@ -1736,7 +1736,7 @@ error:
 
 static
 void ctf_init_mmap_pos(struct ctf_stream_pos *pos,
 
 static
 void ctf_init_mmap_pos(struct ctf_stream_pos *pos,

-               struct mmap_stream *mmap_info)
+               struct bt_mmap_stream *mmap_info)

 {
        pos->mmap_offset = 0;
        pos->packet_size = 0;
 {
        pos->mmap_offset = 0;
        pos->packet_size = 0;


@@ -1785,7 +1785,7 @@ end:
 
 static
 int ctf_open_mmap_stream_read(struct ctf_trace *td,
 
 static
 int ctf_open_mmap_stream_read(struct ctf_trace *td,

-               struct mmap_stream *mmap_info,
+               struct bt_mmap_stream *mmap_info,

                void (*packet_seek)(struct bt_stream_pos *pos, size_t index,
                        int whence))
 {
                void (*packet_seek)(struct bt_stream_pos *pos, size_t index,
                        int whence))
 {


@@ -1827,13 +1827,13 @@ error_def:
 
 static
 int ctf_open_mmap_trace_read(struct ctf_trace *td,
 
 static
 int ctf_open_mmap_trace_read(struct ctf_trace *td,

-               struct mmap_stream_list *mmap_list,
+               struct bt_mmap_stream_list *mmap_list,

                void (*packet_seek)(struct bt_stream_pos *pos, size_t index,
                        int whence),
                FILE *metadata_fp)
 {
        int ret;
                void (*packet_seek)(struct bt_stream_pos *pos, size_t index,
                        int whence),
                FILE *metadata_fp)
 {
        int ret;

-       struct mmap_stream *mmap_info;
+       struct bt_mmap_stream *mmap_info;

 
        ret = ctf_open_trace_metadata_read(td, ctf_packet_seek, metadata_fp);
        if (ret) {
 
        ret = ctf_open_trace_metadata_read(td, ctf_packet_seek, metadata_fp);
        if (ret) {


@@ -1860,7 +1860,7 @@ error:
 
 static
 struct bt_trace_descriptor *ctf_open_mmap_trace(
 
 static
 struct bt_trace_descriptor *ctf_open_mmap_trace(

-               struct mmap_stream_list *mmap_list,
+               struct bt_mmap_stream_list *mmap_list,

                void (*packet_seek)(struct bt_stream_pos *pos, size_t index,
                        int whence),
                FILE *metadata_fp)
                void (*packet_seek)(struct bt_stream_pos *pos, size_t index,
                        int whence),
                FILE *metadata_fp)

diff --git a/include/babeltrace/context.h b/include/babeltrace/context.h
index f3763e1f570f303d378cfe61d71554e455fe71f2..b28df09f060cdcac484b08b8927c28b9f7e408f3 100644 (file)
--- a/include/babeltrace/context.h
+++ b/include/babeltrace/context.h
@@ -84,7 +84,7 @@ int bt_context_add_trace(struct bt_context *ctx, const char *path,
                const char *format,
                void (*packet_seek)(struct bt_stream_pos *pos,
                        size_t index, int whence),
                const char *format,
                void (*packet_seek)(struct bt_stream_pos *pos,
                        size_t index, int whence),

-               struct mmap_stream_list *stream_list,
+               struct bt_mmap_stream_list *stream_list,

                FILE *metadata);
 
 /*
                FILE *metadata);
 
 /*

diff --git a/include/babeltrace/format.h b/include/babeltrace/format.h
index d0f9378e5dfce942c785858345b2bd298e47c060..8d4ac4b290a794af51af64006e029c80343015f2 100644 (file)
--- a/include/babeltrace/format.h
+++ b/include/babeltrace/format.h
@@ -49,12 +49,12 @@ struct bt_trace_handle;
 struct bt_trace_descriptor {
 };
 
 struct bt_trace_descriptor {
 };
 

-struct mmap_stream {
+struct bt_mmap_stream {

        int fd;
        struct bt_list_head list;
 };
 
        int fd;
        struct bt_list_head list;
 };
 

-struct mmap_stream_list {
+struct bt_mmap_stream_list {

        struct bt_list_head head;
 };
 
        struct bt_list_head head;
 };
 


@@ -66,7 +66,7 @@ struct format {
                                size_t index, int whence),
                        FILE *metadata_fp);
        struct bt_trace_descriptor *(*open_mmap_trace)(
                                size_t index, int whence),
                        FILE *metadata_fp);
        struct bt_trace_descriptor *(*open_mmap_trace)(

-                       struct mmap_stream_list *mmap_list,
+                       struct bt_mmap_stream_list *mmap_list,

                        void (*packet_seek)(struct bt_stream_pos *pos,
                                size_t index, int whence),
                        FILE *metadata_fp);
                        void (*packet_seek)(struct bt_stream_pos *pos,
                                size_t index, int whence),
                        FILE *metadata_fp);

diff --git a/lib/context.c b/lib/context.c
index e6b60fa686fb95f2ac5f14fabd29ae423197d3c6..00409726e0d6d38714387b8af44e4354b87da1e8 100644 (file)
--- a/lib/context.c
+++ b/lib/context.c
@@ -69,7 +69,7 @@ int bt_context_add_trace(struct bt_context *ctx, const char *path,
                const char *format_name,
                void (*packet_seek)(struct bt_stream_pos *pos, size_t index,
                        int whence),
                const char *format_name,
                void (*packet_seek)(struct bt_stream_pos *pos, size_t index,
                        int whence),

-               struct mmap_stream_list *stream_list,
+               struct bt_mmap_stream_list *stream_list,

                FILE *metadata)
 {
        struct bt_trace_descriptor *td;
                FILE *metadata)
 {
        struct bt_trace_descriptor *td;