*/
#include <babeltrace/types.h>
+#include <babeltrace/babeltrace.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
#include <sys/mman.h>
#include <errno.h>
#include <stdint.h>
#include <unistd.h>
#include <glib.h>
+#include <stdio.h>
struct packet_index {
off_t offset; /* offset of the packet in the file, in bytes */
+ off_t data_offset; /* offset of data within the packet, in bits */
size_t packet_size; /* packet size, in bits */
size_t content_size; /* content size, in bits */
};
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 offset; /* offset from base, in bits */
+ 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 */
return container_of(pos, struct ctf_stream_pos, parent);
}
-/*
- * IMPORTANT: All lengths (len) and offsets (start, end) are expressed in bits,
- * *not* in bytes.
- *
- * All write primitives, as well as read for dynamically sized entities, can
- * receive a NULL ptr/dest parameter. In this case, no write is performed, but
- * the size is returned.
- */
-
-uint64_t ctf_uint_read(struct stream_pos *pos,
- const struct declaration_integer *integer_declaration);
-int64_t ctf_int_read(struct stream_pos *pos,
- const struct declaration_integer *integer_declaration);
-void ctf_uint_write(struct stream_pos *pos,
- const struct declaration_integer *integer_declaration,
- uint64_t v);
-void ctf_int_write(struct stream_pos *pos,
- const struct declaration_integer *integer_declaration,
- int64_t v);
-
-double ctf_double_read(struct stream_pos *pos,
- const struct declaration_float *src);
-void ctf_double_write(struct stream_pos *pos,
- const struct declaration_float *dest,
- double v);
-long double ctf_ldouble_read(struct stream_pos *pos,
- const struct declaration_float *src);
-void ctf_ldouble_write(struct stream_pos *pos,
- const struct declaration_float *dest,
- long double v);
-void ctf_float_copy(struct stream_pos *destp,
- struct stream_pos *srcp,
- const struct declaration_float *float_declaration);
-
-void ctf_string_copy(struct stream_pos *dest, struct stream_pos *src,
- const struct declaration_string *string_declaration);
-void ctf_string_read(char **dest, struct stream_pos *src,
- const struct declaration_string *string_declaration);
-void ctf_string_write(struct stream_pos *dest, const char *src,
- const struct declaration_string *string_declaration);
-void ctf_string_free_temp(char *string);
-
-GArray *ctf_enum_read(struct stream_pos *pos,
- const struct declaration_enum *src);
-void ctf_enum_write(struct stream_pos *pos,
- const struct declaration_enum *dest,
- GQuark q);
-void ctf_struct_begin(struct stream_pos *pos,
- const struct declaration_struct *struct_declaration);
-void ctf_struct_end(struct stream_pos *pos,
- const struct declaration_struct *struct_declaration);
-void ctf_variant_begin(struct stream_pos *pos,
- const struct declaration_variant *variant_declaration);
-void ctf_variant_end(struct stream_pos *pos,
- const struct declaration_variant *variant_declaration);
-void ctf_array_begin(struct stream_pos *pos,
- const struct declaration_array *array_declaration);
-void ctf_array_end(struct stream_pos *pos,
- const struct declaration_array *array_declaration);
-void ctf_sequence_begin(struct stream_pos *pos,
- const struct declaration_sequence *sequence_declaration);
-void ctf_sequence_end(struct stream_pos *pos,
- const struct declaration_sequence *sequence_declaration);
-
-void ctf_move_pos_slow(struct ctf_stream_pos *pos, size_t offset);
-
-void ctf_init_pos(struct ctf_stream_pos *pos, int fd);
+int ctf_integer_read(struct stream_pos *pos, struct definition *definition);
+int ctf_integer_write(struct stream_pos *pos, struct definition *definition);
+int ctf_float_read(struct stream_pos *pos, struct definition *definition);
+int ctf_float_write(struct stream_pos *pos, struct definition *definition);
+int ctf_string_read(struct stream_pos *pos, struct definition *definition);
+int ctf_string_write(struct stream_pos *pos, struct definition *definition);
+int ctf_enum_read(struct stream_pos *pos, struct definition *definition);
+int ctf_enum_write(struct stream_pos *pos, struct definition *definition);
+int ctf_struct_rw(struct stream_pos *pos, struct definition *definition);
+int ctf_variant_rw(struct stream_pos *pos, struct definition *definition);
+int ctf_array_read(struct stream_pos *pos, struct definition *definition);
+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 ctf_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);
/*
static inline
void ctf_move_pos(struct ctf_stream_pos *pos, size_t bit_offset)
{
+ printf_debug("ctf_move_pos test EOF: %zd\n", pos->offset);
+ if (pos->offset == EOF)
+ return;
+
if (pos->fd >= 0) {
if (((pos->prot == PROT_READ)
&& (pos->offset + bit_offset >= pos->content_size))
|| ((pos->prot == PROT_WRITE)
&& (pos->offset + bit_offset >= pos->packet_size))) {
- ctf_move_pos_slow(pos, bit_offset);
+ printf_debug("ctf_move_pos_slow (before call): %zd\n",
+ pos->offset);
+ 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;
+ printf_debug("ctf_move_pos after increment: %zd\n", pos->offset);
}
/*
ctf_move_pos(pos, pos->packet_size - pos->offset);
}
+static inline
+int ctf_pos_access_ok(struct ctf_stream_pos *pos, size_t bit_len)
+{
+ if (pos->offset == EOF)
+ return 0;
+ if (pos->offset + bit_len > pos->packet_size)
+ return 0;
+ return 1;
+}
+
#endif /* _BABELTRACE_CTF_TYPES_H */