Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- if (sin->pos.offset == -EOF)
- return -EOF;
+ if (sin->pos.offset == EOF)
+ return EOF;
/* Hide event payload struct brackets */
sout->depth = -1;
/* Hide event payload struct brackets */
sout->depth = -1;
/* TODO: order events by timestamps across streams */
for (;;) {
ret = convert_event(sout, sin);
/* TODO: order events by timestamps across streams */
for (;;) {
ret = convert_event(sout, sin);
break;
else if (ret) {
fprintf(stdout, "[error] Printing event failed.\n");
break;
else if (ret) {
fprintf(stdout, "[error] Printing event failed.\n");
assert(0);
}
if (pos->cur_index >= pos->packet_index->len) {
assert(0);
}
if (pos->cur_index >= pos->packet_index->len) {
return;
}
index = &g_array_index(pos->packet_index, struct packet_index,
return;
}
index = &g_array_index(pos->packet_index, struct packet_index,
int rbo = (integer_declaration->byte_order != BYTE_ORDER); /* reverse byte order */
ctf_align_pos(pos, integer_declaration->p.alignment);
int rbo = (integer_declaration->byte_order != BYTE_ORDER); /* reverse byte order */
ctf_align_pos(pos, integer_declaration->p.alignment);
- assert(!(pos->offset % CHAR_BIT));
if (!ctf_pos_access_ok(pos, integer_declaration->len))
return -EFAULT;
if (!ctf_pos_access_ok(pos, integer_declaration->len))
return -EFAULT;
+ assert(!(pos->offset % CHAR_BIT));
if (!integer_declaration->signedness) {
switch (integer_declaration->len) {
case 8:
if (!integer_declaration->signedness) {
switch (integer_declaration->len) {
case 8:
int rbo = (integer_declaration->byte_order != BYTE_ORDER); /* reverse byte order */
ctf_align_pos(pos, integer_declaration->p.alignment);
int rbo = (integer_declaration->byte_order != BYTE_ORDER); /* reverse byte order */
ctf_align_pos(pos, integer_declaration->p.alignment);
- assert(!(pos->offset % CHAR_BIT));
if (!ctf_pos_access_ok(pos, integer_declaration->len))
return -EFAULT;
if (!ctf_pos_access_ok(pos, integer_declaration->len))
return -EFAULT;
+ assert(!(pos->offset % CHAR_BIT));
if (pos->dummy)
goto end;
if (!integer_declaration->signedness) {
if (pos->dummy)
goto end;
if (!integer_declaration->signedness) {
ctf_align_pos(pos, string_declaration->p.alignment);
srcaddr = ctf_get_pos_addr(pos);
ctf_align_pos(pos, string_declaration->p.alignment);
srcaddr = ctf_get_pos_addr(pos);
- if (pos->offset == -EOF)
+ if (pos->offset == EOF)
return -EFAULT;
/* Not counting \0 */
max_len = pos->packet_size - pos->offset - 1;
return -EFAULT;
/* Not counting \0 */
max_len = pos->packet_size - pos->offset - 1;
*/
#include <babeltrace/types.h>
*/
#include <babeltrace/types.h>
+#include <babeltrace/babeltrace.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
size_t content_size; /* current content size, in bits */
uint32_t *content_size_loc; /* pointer to current content size */
char *base; /* mmap base address */
size_t content_size; /* current content size, in bits */
uint32_t *content_size_loc; /* pointer to current content size */
char *base; /* mmap base address */
- ssize_t offset; /* offset from base, in bits. -EOF for end of file. */
+ ssize_t offset; /* offset from base, in bits. EOF for end of file. */
size_t cur_index; /* current index in packet index */
int dummy; /* dummy position, for length calculation */
size_t cur_index; /* current index in packet index */
int dummy; /* dummy position, for length calculation */
static inline
void ctf_move_pos(struct ctf_stream_pos *pos, size_t bit_offset)
{
static inline
void ctf_move_pos(struct ctf_stream_pos *pos, size_t bit_offset)
{
- if (pos->offset == -EOF)
+ printf_debug("ctf_move_pos test EOF: %zd\n", pos->offset);
+ if (pos->offset == EOF)
return;
if (pos->fd >= 0) {
return;
if (pos->fd >= 0) {
&& (pos->offset + bit_offset >= pos->content_size))
|| ((pos->prot == PROT_WRITE)
&& (pos->offset + bit_offset >= pos->packet_size))) {
&& (pos->offset + bit_offset >= pos->content_size))
|| ((pos->prot == PROT_WRITE)
&& (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, bit_offset, SEEK_CUR);
+ printf_debug("ctf_move_pos_slow (after call): %zd\n",
+ pos->offset);
return;
}
}
pos->offset += bit_offset;
return;
}
}
pos->offset += bit_offset;
+ printf_debug("ctf_move_pos after increment: %zd\n", pos->offset);
static inline
int ctf_pos_access_ok(struct ctf_stream_pos *pos, size_t bit_len)
{
static inline
int ctf_pos_access_ok(struct ctf_stream_pos *pos, size_t bit_len)
{
- if (pos->offset == -EOF)
+ if (pos->offset == EOF)
return 0;
if (pos->offset + bit_len > pos->packet_size)
return 0;
return 0;
if (pos->offset + bit_len > pos->packet_size)
return 0;