diff --git a/src/logger.c b/src/logger.c index 2fed1e87888a2603ff976c41f8f6f3031f64ca37..2c07d4ac575ebceffebeafe01e97ec2cc96acd9c 100644 --- a/src/logger.c +++ b/src/logger.c @@ -304,16 +304,21 @@ void logger_write_file_header(struct dump *dump) { memcpy(buff, LOGGER_VERSION, LOGGER_VERSION_SIZE); /* write number of bytes used for the offsets */ + message("Start %lu", *file_offset); buff = dump_get(dump, LOGGER_OFFSET_SIZE, file_offset); + message("End %lu", *file_offset); memcpy(buff, &log_const.offset, LOGGER_OFFSET_SIZE); /* will write the offset of the first particle here */ - skip_header = dump_get(dump, log_const.name, file_offset); + skip_header = dump_get(dump, log_const.offset, file_offset); /* write number of bytes used for names */ buff = dump_get(dump, LOGGER_NAME_SIZE, file_offset); memcpy(buff, &log_const.name, LOGGER_NAME_SIZE); + /* write number of bytes used for numbers */ + buff = dump_get(dump, LOGGER_NBER_SIZE, file_offset); + memcpy(buff, &log_const.number, LOGGER_NBER_SIZE); mask_size = log_const.nber_mask * (log_const.name + log_const.mask); name_buff = dump_get(dump, mask_size, file_offset); @@ -332,14 +337,14 @@ void logger_write_file_header(struct dump *dump) { /* last step */ memcpy(skip_header, file_offset, log_const.offset); - logger_const_free(&log_const); } void logger_const_init(struct logger_const* log_const) { - log_const->name = 20 * sizeof(char); + log_const->name = 20; log_const->offset = 7; log_const->mask = 1; + log_const->number = 1; log_const->nber_mask = 8; diff --git a/src/logger.h b/src/logger.h index f3250e0459fcb7678046c7bad982cb61a7776d48..3585131ccc6f8be1a26e57f8717e7536191baebd 100644 --- a/src/logger.h +++ b/src/logger.h @@ -84,15 +84,16 @@ struct dump; * Size in bytes */ #define LOGGER_VERSION_SIZE 20 // size of the version message -#define LOGGER_OFFSET_SIZE 1// size of the offset size information -#define LOGGER_NAME_SIZE 2 // size of the labels +#define LOGGER_NAME_SIZE 1 // size of the labels #define LOGGER_MASK_SIZE 1 // size of the masks #define LOGGER_NBER_SIZE 1 // size of the number of elements +#define LOGGER_OFFSET_SIZE 1// size of the offset size information struct logger_const { size_t name; // labels size size_t offset; // offset size size_t mask; // mask size + size_t number; // number size size_t nber_mask; // number of different masks size_t *masks; // value of each masks (e.g. logger_mask_...) size_t *masks_size; // size of each mask