From: Emil Velikov Date: Thu, 4 May 2017 18:20:17 +0000 (+0100) Subject: egl: remove no longer needed logger infra X-Git-Tag: upstream/18.1.0~9990 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1dd038e98846b1fe77cb61ed2f39bd7d1fea0fb3;p=platform%2Fupstream%2Fmesa.git egl: remove no longer needed logger infra As of last commit nobody requires anything else but the _eglDefaultLogger(). As such use it directly and simplify the implementation. Signed-off-by: Emil Velikov Reviewed-by: Eric Engestrom Reviewed-by: Chad Versace --- diff --git a/src/egl/main/egllog.c b/src/egl/main/egllog.c index 9d7e930..4423272 100644 --- a/src/egl/main/egllog.c +++ b/src/egl/main/egllog.c @@ -70,14 +70,10 @@ static struct { EGLBoolean initialized; EGLint level; - _EGLLogProc logger; - EGLint num_messages; } logging = { _MTX_INITIALIZER_NP, EGL_FALSE, FALLBACK_LOG_LEVEL, - NULL, - 0 }; static const char *level_strings[] = { @@ -91,34 +87,6 @@ static const char *level_strings[] = { /** - * Set the function to be called when there is a message to log. - * Note that the function will be called with an internal lock held. - * Recursive logging is not allowed. - */ -void -_eglSetLogProc(_EGLLogProc logger) -{ - EGLint num_messages = 0; - - mtx_lock(&logging.mutex); - - if (logging.logger != logger) { - logging.logger = logger; - - num_messages = logging.num_messages; - logging.num_messages = 0; - } - - mtx_unlock(&logging.mutex); - - if (num_messages) - _eglLog(_EGL_DEBUG, - "New logger installed. " - "Messages before the new logger might not be available."); -} - - -/** * The default logger. It prints the message to stderr. */ static void @@ -172,7 +140,6 @@ _eglInitLogger(void) level = FALLBACK_LOG_LEVEL; } - logging.logger = _eglDefaultLogger; logging.level = (level >= 0) ? level : FALLBACK_LOG_LEVEL; logging.initialized = EGL_TRUE; @@ -206,16 +173,13 @@ _eglLog(EGLint level, const char *fmtStr, ...) mtx_lock(&logging.mutex); - if (logging.logger) { - va_start(args, fmtStr); - ret = vsnprintf(msg, MAXSTRING, fmtStr, args); - if (ret < 0 || ret >= MAXSTRING) - strcpy(msg, ""); - va_end(args); + va_start(args, fmtStr); + ret = vsnprintf(msg, MAXSTRING, fmtStr, args); + if (ret < 0 || ret >= MAXSTRING) + strcpy(msg, ""); + va_end(args); - logging.logger(level, msg); - logging.num_messages++; - } + _eglDefaultLogger(level, msg); mtx_unlock(&logging.mutex); diff --git a/src/egl/main/egllog.h b/src/egl/main/egllog.h index 9035a7a..2a06a34 100644 --- a/src/egl/main/egllog.h +++ b/src/egl/main/egllog.h @@ -44,13 +44,6 @@ extern "C" { #define _EGL_DEBUG 3 /* useful info for debugging */ -typedef void (*_EGLLogProc)(EGLint level, const char *msg); - - -extern void -_eglSetLogProc(_EGLLogProc logger); - - extern void _eglLog(EGLint level, const char *fmtStr, ...);