openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-07-01 14:11:15 +02:00
Code Issues Releases Wiki Activity

libflashrom: Add set log level functionality

Browse Source 
Before this commit, any message from Flashrom would trigger
the user's callback. This could lead to additional delays
and slow down overall Flashrom performance.

This patch adds the ability to configure the log level for
messages from Flashrom. It sets the default log level to INFO

Testing: Both unit tests and CLI tools serve as libflashrom clients.
    All unit tests run successfully.

Change-Id: I095d48b8feb5fbc950a36eb17bed0d7cb8d9df64
Signed-off-by: Dmitry Zhadinets <dzhadinets@gmail.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/87047
Reviewed-by: Anastasia Klimchuk <aklm@chromium.org>
Reviewed-by: Peter Marheine <pmarheine@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Dmitry Zhadinets
2025-03-29 19:10:24 -04:00
committed by Anastasia Klimchuk
parent b1794138f0
commit 6571f263b5
5 changed files with 65 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
tests/libflashrom.c
View File

@ -23,26 +23,22 @@
static int test_log_callback(enum flashrom_log_level level, const char *format,
va_list vargs)
{
/* check that loglevel has passed corectly */
assert_int_equal(level, FLASHROM_MSG_INFO);
char message[3] = {0};
vsnprintf(message, 3, format, vargs);
assert_string_equal(message, "1\n");
return 0x666 + 1;
return 0x666 + (int)level;
}
static void test_log_callback_v2(enum flashrom_log_level level,
const char *message, void *user_data)
{
/* check that loglevel has passed corectly */
assert_int_equal(level, FLASHROM_MSG_ERROR);
/* check that user dta has passed */
assert_ptr_not_equal(user_data, 0);
/* check that user_data is correct */
assert_int_equal(*(int *)(user_data), 100500);
/* check that format is working correctly */
assert_string_equal(message, "2\n");
*(int*)user_data = 0x666 + 2;
*(int*)user_data = 0x666 + (int)level;
}
void flashrom_set_log_callback_test_success(void **state)
@ -50,7 +46,7 @@ void flashrom_set_log_callback_test_success(void **state)
(void)state; /* unused */
flashrom_set_log_callback(test_log_callback);
/* check that callback is called */
assert_int_equal(print(FLASHROM_MSG_INFO, "1%s", "\n"), 0x666 + 1);
assert_int_equal(print(FLASHROM_MSG_INFO, "1%s", "\n"), 0x666 + (int)FLASHROM_MSG_INFO);
flashrom_set_log_callback(NULL);
}
@ -61,6 +57,43 @@ void flashrom_set_log_callback_v2_test_success(void **state)
flashrom_set_log_callback_v2(test_log_callback_v2, &user_data);
print(FLASHROM_MSG_ERROR, "2%s", "\n");
/* check that callback is called */
assert_int_equal(user_data, 0x666 + 2);
assert_int_equal(user_data, 0x666 + (int)FLASHROM_MSG_ERROR);
flashrom_set_log_callback_v2(NULL, NULL);
}
void flashrom_set_log_level_test_success(void **state)
{
(void)state; /* unused */
int user_data;
flashrom_set_log_level(FLASHROM_MSG_WARN);
/* v2 API check */
user_data = 100500;
flashrom_set_log_callback_v2(test_log_callback_v2, &user_data);
print(FLASHROM_MSG_DEBUG, "2%s", "\n");
/* check that callback is not called */
assert_int_equal(user_data, 100500);
print(FLASHROM_MSG_ERROR, "2%s", "\n");
/* check that callback is called for less */
assert_int_equal(user_data, 0x666 + (int)FLASHROM_MSG_ERROR);
user_data = 100500;
print(FLASHROM_MSG_WARN, "2%s", "\n");
/* check that callback is called for equal */
assert_int_equal(user_data, 0x666 + (int)FLASHROM_MSG_WARN);
/* v1 API check */
flashrom_set_log_callback(test_log_callback);
/* check that callback is not called */
assert_int_equal(print(FLASHROM_MSG_INFO, "1%s", "\n"), 0);
/* check that callback is called for equal */
assert_int_equal(print(FLASHROM_MSG_WARN, "1%s", "\n"), 0x666 + (int)FLASHROM_MSG_WARN);
/* check that callback is called for less*/
assert_int_equal(print(FLASHROM_MSG_ERROR, "1%s", "\n"), 0x666 + (int)FLASHROM_MSG_ERROR);
flashrom_set_log_level(FLASHROM_MSG_INFO);
/* check that callback is called after the change*/
assert_int_equal(print(FLASHROM_MSG_INFO, "1%s", "\n"), 0x666 + (int)FLASHROM_MSG_INFO);
flashrom_set_log_callback(NULL);
}

1
tests/tests.c
View File

@ -481,6 +481,7 @@ int main(int argc, char *argv[])
const struct CMUnitTest libflashrom_tests[] = {
cmocka_unit_test(flashrom_set_log_callback_test_success),
cmocka_unit_test(flashrom_set_log_callback_v2_test_success),
cmocka_unit_test(flashrom_set_log_level_test_success),
};
ret |= cmocka_run_group_tests_name("libflashrom.c tests", libflashrom_tests, NULL, NULL);

1
tests/tests.h
View File

@ -34,6 +34,7 @@ void flashbuses_to_text_test_success(void **state);
/* libflashrom.c */
void flashrom_set_log_callback_test_success(void **state);
void flashrom_set_log_callback_v2_test_success(void **state);
void flashrom_set_log_level_test_success(void **state);
/* spi25.c */
void spi_write_enable_test_success(void **state);