* http://www.efficios.com/ctf
*/
+#include <stdlib.h>
#include <stdint.h>
#include <limits.h>
-#include <sys/mman.h>
+#include <babeltrace/compat/mman-internal.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
-#include <babeltrace/ctf-ir/field-types.h>
-#include <babeltrace/ctf-ir/fields.h>
-#include <babeltrace/ctf-ir/fields-internal.h>
#include <babeltrace/align-internal.h>
+#include <babeltrace/common-internal.h>
#include <babeltrace/mmap-align-internal.h>
+#include <babeltrace/types.h>
+#include <babeltrace/ctf-writer/fields.h>
+#include <babeltrace/ctf-writer/field-types.h>
+#include <babeltrace/ctf-ir/fields-internal.h>
+#include <babeltrace/assert-internal.h>
+
+#define PACKET_LEN_INCREMENT (bt_common_get_page_size() * 8 * CHAR_BIT)
struct bt_ctf_stream_pos {
int fd;
off_t mmap_offset; /* mmap offset in the file, in bytes */
off_t mmap_base_offset; /* offset of start of packet in mmap, in bytes */
uint64_t packet_size; /* current packet size, in bits */
- uint64_t content_size; /* current content size, in bits */
int64_t offset; /* offset from base, in bits. EOF for end of file. */
struct mmap_align *base_mma;/* mmap base address */
};
BT_HIDDEN
-int bt_ctf_field_integer_write(struct bt_ctf_field_integer *field,
+int bt_ctf_field_integer_write(struct bt_field_common *field,
struct bt_ctf_stream_pos *pos,
enum bt_ctf_byte_order native_byte_order);
BT_HIDDEN
-int bt_ctf_field_floating_point_write(struct bt_ctf_field_floating_point *field,
+int bt_ctf_field_floating_point_write(struct bt_field_common *field,
struct bt_ctf_stream_pos *pos,
enum bt_ctf_byte_order native_byte_order);
if (unlikely(pos->offset == EOF))
return 0;
+
if (pos->prot == PROT_READ) {
/*
* Reads may only reach up to the "content_size",
* regardless of the packet_size.
*/
- max_len = pos->content_size;
+ max_len = pos->offset;
} else {
/* Writes may take place up to the end of the packet. */
max_len = pos->packet_size;
}
+ if (unlikely(pos->offset < 0 || bit_len > INT64_MAX - pos->offset)) {
+ return 0;
+ }
if (unlikely(pos->offset + bit_len > max_len))
return 0;
return 1;
char *bt_ctf_stream_pos_get_addr(struct bt_ctf_stream_pos *pos)
{
/* Only makes sense to get the address after aligning on CHAR_BIT */
- assert(!(pos->offset % CHAR_BIT));
- return mmap_align_addr(pos->base_mma) +
+ BT_ASSERT(!(pos->offset % CHAR_BIT));
+ return ((char *) mmap_align_addr(pos->base_mma)) +
pos->mmap_base_offset + (pos->offset / CHAR_BIT);
}
pos->flags = MAP_SHARED;
break;
default:
- assert(false);
+ abort();
}
return 0;