From 2267658db44f7ffade5fd15cd1b8a4019a380f7e Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Tue, 26 Nov 2013 21:48:57 +0100 Subject: snprintf: lockless operation Instead of having global variables put them on the stack. Change-Id: I462e3b245612ff2dfb077da1cbcc5ac88f8b8e48 Signed-off-by: Vladimir Serbinenko Reviewed-on: http://review.coreboot.org/4288 Reviewed-by: Ronald G. Minnich Tested-by: build bot (Jenkins) --- src/console/vsprintf.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/console/vsprintf.c b/src/console/vsprintf.c index 435401b7ef..321ce81490 100644 --- a/src/console/vsprintf.c +++ b/src/console/vsprintf.c @@ -20,32 +20,32 @@ */ #include -#include #include #include -DECLARE_SPIN_LOCK(vsprintf_lock) - -static char *str_buf; +struct vsprintf_context +{ + char *str_buf; +}; -static void str_tx_byte(unsigned char byte) +static void str_tx_byte(unsigned char byte, void *data) { - *str_buf = byte; - str_buf++; + struct vsprintf_context *ctx = data; + *ctx->str_buf = byte; + ctx->str_buf++; } static int vsprintf(char *buf, const char *fmt, va_list args) { int i; + struct vsprintf_context ctx; DISABLE_TRACE; - spin_lock(&vsprintf_lock); - str_buf = buf; - i = vtxprintf(str_tx_byte, fmt, args); - *str_buf = '\0'; + ctx.str_buf = buf; + i = vtxdprintf(str_tx_byte, fmt, args, &ctx); + *ctx.str_buf = '\0'; - spin_unlock(&vsprintf_lock); ENABLE_TRACE; return i; -- cgit v1.2.3