mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-02 09:01:46 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

reduce malloc() usage when logging, to minimize the hit of logging in RT threads. Not complete yet, i18n still uses malloc

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/glitch-free@2435 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2008-05-15 22:21:05 +00:00
parent b57c520149
commit 86ea73acd3
1 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/pulsecore/log.c
View file

@ -109,9 +109,13 @@ void pa_log_levelv_meta(
va_list ap) { va_list ap) {
const char *e; const char *e;
char *text, *t, *n, *location; char *t, *n;
int saved_errno = errno; int saved_errno = errno;
/* We don't use dynamic memory allocation here to minimize the hit
* in RT threads */
char text[1024], location[128];
pa_assert(level < PA_LOG_LEVEL_MAX); pa_assert(level < PA_LOG_LEVEL_MAX);
pa_assert(format); pa_assert(format);
@ -123,14 +127,14 @@ void pa_log_levelv_meta(
return; return;
} }
text = pa_vsprintf_malloc(format, ap); pa_vsnprintf(text, sizeof(text), format, ap);
if (getenv(ENV_LOGMETA) && file && line > 0 && func) if (getenv(ENV_LOGMETA) && file && line > 0 && func)
location = pa_sprintf_malloc("[%s:%i %s()] ", file, line, func); pa_snprintf(location, sizeof(location), "[%s:%i %s()] ", file, line, func);
else if (file) else if (file)
location = pa_sprintf_malloc("%s: ", pa_path_get_filename(file)); pa_snprintf(location, sizeof(location), "%s: ", pa_path_get_filename(file));
else else
location = pa_xstrdup(""); location[0] = 0;
if (!pa_utf8_valid(text)) if (!pa_utf8_valid(text))
pa_log_level(level, __FILE__": invalid UTF-8 string following below:"); pa_log_level(level, __FILE__": invalid UTF-8 string following below:");
@ -162,6 +166,8 @@ void pa_log_levelv_meta(
} }
#endif #endif
/* We shouldn't be using dynamic allocation here to
* minimize the hit in RT threads */
local_t = pa_utf8_to_locale(t); local_t = pa_utf8_to_locale(t);
if (!local_t) if (!local_t)
fprintf(stderr, "%c: %s%s%s%s\n", level_to_char[level], location, prefix, t, suffix); fprintf(stderr, "%c: %s%s%s%s\n", level_to_char[level], location, prefix, t, suffix);
@ -193,11 +199,10 @@ void pa_log_levelv_meta(
#endif #endif
case PA_LOG_USER: { case PA_LOG_USER: {
char *x; char x[1024];
x = pa_sprintf_malloc("%s%s", location, t); pa_snprintf(x, sizeof(x), "%s%s", location, t);
user_log_func(level, x); user_log_func(level, x);
pa_xfree(x);
break; break;
} }
@ -208,9 +213,6 @@ void pa_log_levelv_meta(
} }
} }
pa_xfree(text);
pa_xfree(location);
errno = saved_errno; errno = saved_errno;
} }