Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-16 01:44:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli: allow users to determine history buffer allocation method

Browse source 
This commit allows users to choose the appropriate memory
allocation method between static allocated and dynamically
calloc. The previous static-array way will not obviously
contribute to the final binary size since it is uninitialized,
and might have better performance than the dynamical one.
Now we provide the users with both the two options.

Signed-off-by: Hanyuan Zhao <hanyuan-z@qq.com>
This commit is contained in:
Hanyuan Zhao 2024-03-05 15:37:35 +08:00 • committed by Tom Rini
parent 4495134030
commit 421359ac52
2 changed files with 36 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
cmd/Kconfig
View file

@ -189,6 +189,17 @@ config CMD_HISTORY
Show the command-line history, i.e. a list of commands that are in
the history buffer.
config CMD_HISTORY_USE_CALLOC
bool "dynamically allocate memory"
default y
depends on CMD_HISTORY
help
Saying Y to this will use calloc to get the space for history
storing. Otherwise the history buffer will be an uninitialized
static array directly, without the memory allocation, and it is
writable after relocation to RAM. If u-boot is running from ROM
all the time or unsure, say Y to this.
config CMD_LICENSE
bool "license"
select BUILD_BIN2C

36
common/cli_readline.c
View file

@ -86,6 +86,9 @@ static int hist_add_idx;
static int hist_cur = -1;
static unsigned hist_num;
#ifndef CONFIG_CMD_HISTORY_USE_CALLOC
static char hist_data[HIST_MAX][HIST_SIZE + 1];
#endif
static char *hist_list[HIST_MAX];
#define add_idx_minus_one() ((hist_add_idx == 0) ? hist_max : hist_add_idx-1)
@ -100,20 +103,26 @@ static void getcmd_putchars(int count, int ch)
static int hist_init(void)
{
unsigned char *hist;
int i;
hist_max = 0;
hist_add_idx = 0;
hist_cur = -1;
hist_num = 0;
hist = calloc(HIST_MAX, HIST_SIZE + 1);
#ifndef CONFIG_CMD_HISTORY_USE_CALLOC
for (i = 0; i < HIST_MAX; i++) {
hist_list[i] = hist_data[i];
hist_list[i][0] = '\0';
}
#else
unsigned char *hist = calloc(HIST_MAX, HIST_SIZE + 1);
if (!hist)
panic("%s: calloc: out of memory!\n", __func__);
for (i = 0; i < HIST_MAX; i++)
hist_list[i] = hist + (i * (HIST_SIZE + 1));
#endif
hist_max = 0;
hist_add_idx = 0;
hist_cur = -1;
hist_num = 0;
return 0;
}
@ -643,10 +652,15 @@ int cli_readline_into_buffer(const char *const prompt, char *buffer,
static int initted;
/*
* History uses a global array which is not
* writable until after relocation to RAM.
* Revert to non-history version if still
* running from flash.
* Say N to CMD_HISTORY_USE_CALLOC will skip runtime
* allocation for the history buffer and directly
* use an uninitialized static array as the buffer.
* Doing this might have better performance and not
* increase the binary file's size, as it only marks
* the size. However, the array is only writable after
* relocation to RAM. If u-boot is running from ROM
* all the time, consider say Y to CMD_HISTORY_USE_CALLOC
* or disable CMD_HISTORY.
*/
if (IS_ENABLED(CONFIG_CMDLINE_EDITING) && (gd->flags & GD_FLG_RELOC)) {
if (!initted) {