auracaster/openocd
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

log: simplify handling of mallinfo()

Browse Source 
Simplify the use of C preprocessor conditionals by adding a new
function get_free_memory_space().

Change-Id: I795bd13284d06844f976a5264ca4d54ad887983c
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: https://review.openocd.org/c/openocd/+/9463
Reviewed-by: R. Diez <rdiez-2006@rd10.de>
Tested-by: jenkins
This commit is contained in:
Antonio Borneo
2026-02-15 21:04:09 +01:00
parent a5a9121ad6
commit c3b4bcc6e6
1 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/helper/log.c
View File

@@ -62,6 +62,28 @@ static void log_forward(const char *file, unsigned int line, const char *functio
} }
} }
// whitespace + SIZE_MAX + zero termination
#define MEM_STR_LEN (1 + 21 + 1)
static void get_free_memory_space(char *s)
{
#if defined(HAVE_MALLINFO2)
if (LOG_LEVEL_IS(LOG_LVL_DEBUG_MALLOC)) {
struct mallinfo2 info = mallinfo2();
snprintf(s, MEM_STR_LEN, " %zu", info.fordblks);
return;
}
#elif defined(HAVE_MALLINFO)
if (LOG_LEVEL_IS(LOG_LVL_DEBUG_MALLOC)) {
struct mallinfo info = mallinfo();
snprintf(s, MEM_STR_LEN, " %d", info.fordblks);
return;
}
#endif
// empty string
*s = 0;
}
/* The log_puts() serves two somewhat different goals: /* The log_puts() serves two somewhat different goals:
* *
* - logging * - logging
@@ -102,34 +124,12 @@ static void log_puts(enum log_levels level,
/* print with count and time information */ /* print with count and time information */
int64_t t = timeval_ms() - start; int64_t t = timeval_ms() - start;
#if defined(HAVE_MALLINFO) || defined(HAVE_MALLINFO2) char free_memory[MEM_STR_LEN];
const int should_use_mallinfo = LOG_LEVEL_IS(LOG_LVL_DEBUG_MALLOC); get_free_memory_space(free_memory);
if (should_use_mallinfo) { fprintf(log_output, "%s%u %" PRId64 " %s:%d %s()%s: %s",
#ifdef HAVE_MALLINFO2 log_strings[level + 1], count, t, file, line, function,
struct mallinfo2 info = mallinfo2(); free_memory, string);
#else
struct mallinfo info = mallinfo();
#endif
fprintf(log_output, "%s%u %" PRId64 " %s:%d %s()"
#ifdef HAVE_MALLINFO2
" %zu"
#else
" %d"
#endif
": %s", log_strings[level + 1], count, t, file, line, function,
info.fordblks,
string);
}
#else
const int should_use_mallinfo = 0;
#endif
if (!should_use_mallinfo) {
fprintf(log_output, "%s%u %" PRId64 " %s:%d %s()"
": %s", log_strings[level + 1], count, t, file, line, function,
string);
}
} else { } else {
/* if we are using gdb through pipes then we do not want any output /* if we are using gdb through pipes then we do not want any output
* to the pipe otherwise we get repeated strings */ * to the pipe otherwise we get repeated strings */