Merged, thanks! Mathieu
----- Original Message ----- > From: "Jérémie Galarneau" <[email protected]> > To: [email protected] > Sent: Tuesday, October 15, 2013 1:23:18 PM > Subject: [lttng-dev] [PATCH babeltrace] Fix: Use the packet's final size > when mmap-ing the next packet > > ctf_packet_seek() assumed that a packet would be of fixed size > "WRITE_PACKET_LEN" when seeking to the next packet in write mode. > This ensures that the real size used. > > Signed-off-by: Jérémie Galarneau <[email protected]> > Reviewed-by: Mathieu Desnoyers <[email protected]> > --- > formats/ctf/ctf.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c > index 947b439..60d9c9f 100644 > --- a/formats/ctf/ctf.c > +++ b/formats/ctf/ctf.c > @@ -712,7 +712,7 @@ void ctf_packet_seek(struct bt_stream_pos *stream_pos, > size_t index, int whence) > switch (whence) { > case SEEK_CUR: > /* The writer will add padding */ > - pos->mmap_offset += WRITE_PACKET_LEN / CHAR_BIT; > + pos->mmap_offset += pos->packet_size / CHAR_BIT; > break; > case SEEK_SET: > assert(index == 0); /* only seek supported for now > */ > -- > 1.8.4 > > > _______________________________________________ > lttng-dev mailing list > [email protected] > http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev > -- Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com _______________________________________________ lttng-dev mailing list [email protected] http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
