michaelh/zephyr
1
0
Fork 0
Code Releases Activity

logging: Fix cbprintf package alignement

Browse source 
Fix alignment fo the cbprintf package withing the log message.
Aligning tests to pass.

Signed-off-by: Krzysztof Chruscinski <krzysztof.chruscinski@nordicsemi.no>
This commit is contained in:
Krzysztof Chruscinski 2022-04-11 15:36:50 +02:00 • committed by Marti Bolivar
commit acbdbb15dd
2 changed files with 20 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

12
tests/subsys/logging/log_msg2/src/main.c
View file

@ -361,7 +361,7 @@ void test_mode_size_plain_string(void)
*
* Message size is rounded up to the required alignment.
*/
exp_len = sizeof(struct log_msg2_hdr) +
exp_len = offsetof(struct log_msg2, data) +
/* package */2 * sizeof(const char *);
exp_len = ROUND_UP(exp_len, Z_LOG_MSG2_ALIGNMENT) / sizeof(int);
@ -392,7 +392,7 @@ void test_mode_size_data_only(void)
*
* Message size is rounded up to the required alignment.
*/
exp_len = sizeof(struct log_msg2_hdr) + sizeof(data);
exp_len = offsetof(struct log_msg2, data) + sizeof(data);
exp_len = ROUND_UP(exp_len, Z_LOG_MSG2_ALIGNMENT) / sizeof(int);
get_msg_validate_length(exp_len);
}
@ -420,7 +420,7 @@ void test_mode_size_plain_str_data(void)
*
* Message size is rounded up to the required alignment.
*/
exp_len = sizeof(struct log_msg2_hdr) + sizeof(data) +
exp_len = offsetof(struct log_msg2, data) + sizeof(data) +
/* package */2 * sizeof(char *);
exp_len = ROUND_UP(exp_len, Z_LOG_MSG2_ALIGNMENT) / sizeof(int);
get_msg_validate_length(exp_len);
@ -454,7 +454,7 @@ void test_mode_size_str_with_strings(void)
*
* Message size is rounded up to the required alignment.
*/
exp_len = sizeof(struct log_msg2_hdr) +
exp_len = offsetof(struct log_msg2, data) +
/* package */3 * sizeof(const char *);
exp_len = ROUND_UP(exp_len, Z_LOG_MSG2_ALIGNMENT) / sizeof(int);
@ -495,7 +495,7 @@ void test_mode_size_str_with_2strings(void)
*
* Message size is rounded up to the required alignment.
*/
exp_len = sizeof(struct log_msg2_hdr) +
exp_len = offsetof(struct log_msg2, data) +
/* package */4 * sizeof(const char *) + 2 + strlen(sufix);
exp_len = ROUND_UP(exp_len, Z_LOG_MSG2_ALIGNMENT) / sizeof(int);
@ -516,7 +516,7 @@ void test_saturate(void)
}
uint32_t exp_len =
ROUND_UP(sizeof(struct log_msg2_hdr) + 2 * sizeof(void *),
ROUND_UP(offsetof(struct log_msg2, data) + 2 * sizeof(void *),
Z_LOG_MSG2_ALIGNMENT);
uint32_t exp_capacity = (CONFIG_LOG_BUFFER_SIZE - 1) / exp_len;
int mode;