geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

log: Make the message buffer static. 

Now we don't have to worry about allocation failure, or performance
issues or changes to the allocation layout when trying to track down
subtle bugs.
main
Ryan C. Gordon 2022-04-27 12:05:07 -04:00
parent c4141bc11c
commit fde9a7086e
No known key found for this signature in database
GPG Key ID: FA148B892AB48044
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/SDL_log.c
View File

@ -284,7 +284,7 @@ GetCategoryPrefix(int category)
void
SDL_LogMessageV(int category, SDL_LogPriority priority, const char *fmt, va_list ap)
{
char *message;
static char message[SDL_MAX_LOG_MESSAGE]
size_t len;
/* Nothing to do if we don't have an output function */
@ -302,9 +302,13 @@ SDL_LogMessageV(int category, SDL_LogPriority priority, const char *fmt, va_list
return;
}
message = (char *) SDL_malloc(SDL_MAX_LOG_MESSAGE);
if (!message) {
return;
if (!log_function_mutex) {
/* this mutex creation can race if you log from two threads at startup. You should have called SDL_Init first! */
log_function_mutex = SDL_CreateMutex();
}
if (log_function_mutex) {
SDL_LockMutex(log_function_mutex);
}
SDL_vsnprintf(message, SDL_MAX_LOG_MESSAGE, fmt, ap);
@ -318,11 +322,11 @@ SDL_LogMessageV(int category, SDL_LogPriority priority, const char *fmt, va_list
}
}
/* this mutex creation can race if you log from two threads at startup. You should have called SDL_Init first! */
if (!log_function_mutex) { log_function_mutex = SDL_CreateMutex(); }
if (log_function_mutex) { SDL_LockMutex(log_function_mutex); }
SDL_log_function(SDL_log_userdata, category, priority, message);
if (log_function_mutex) { SDL_UnlockMutex(log_function_mutex); }
if (log_function_mutex) {
SDL_UnlockMutex(log_function_mutex);
}
SDL_free(message);
}