mirror of
https://review.coreboot.org/flashrom.git
synced 2025-04-26 22:52:34 +02:00
6571f263b5
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>
99 lines
3.3 KiB
C
99 lines
3.3 KiB
C
/*
|
|
* This file is part of the flashrom project.
|
|
*
|
|
* Copyright 2025 Dmitry Zhadinets (dzhadinets@gmail.com)
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; version 2 of the License.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*/
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <include/test.h>
|
|
#include "tests.h"
|
|
#include "libflashrom.h"
|
|
#include "flash.h"
|
|
|
|
static int test_log_callback(enum flashrom_log_level level, const char *format,
|
|
va_list vargs)
|
|
{
|
|
char message[3] = {0};
|
|
vsnprintf(message, 3, format, vargs);
|
|
assert_string_equal(message, "1\n");
|
|
return 0x666 + (int)level;
|
|
}
|
|
|
|
static void test_log_callback_v2(enum flashrom_log_level level,
|
|
const char *message, void *user_data)
|
|
{
|
|
/* 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 + (int)level;
|
|
}
|
|
|
|
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 + (int)FLASHROM_MSG_INFO);
|
|
flashrom_set_log_callback(NULL);
|
|
}
|
|
|
|
void flashrom_set_log_callback_v2_test_success(void **state)
|
|
{
|
|
(void)state; /* unused */
|
|
int user_data = 100500;
|
|
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 + (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);
|
|
} |