# include "config.h"
#endif
+#include <stdlib.h>
#include <stdarg.h> /* va_list for BSD */
-#ifdef __APPLE__
-# include <xlocale.h>
-#elif defined(HAVE_LOCALE_H)
-# include <locale.h>
-#endif
-#include <errno.h> /* errno */
-#include <assert.h>
+#include <unistd.h>
#include <vlc_common.h>
#include <vlc_interface.h>
-#ifdef WIN32
-# include <vlc_network.h> /* 'net_strerror' and 'WSAGetLastError' */
-#endif
#include <vlc_charset.h>
#include "../libvlc.h"
-/**
- * Store all data required by messages interfaces.
- */
-vlc_rwlock_t msg_lock = VLC_STATIC_RWLOCK;
-msg_subscription_t *msg_head;
-
-/**
- * Subscribe to the message queue.
- * Whenever a message is emitted, a callback will be called.
- * Callback invocation are serialized within a subscription.
- *
- * @param cb callback function
- * @param opaque data for the callback function
- */
-void vlc_Subscribe (msg_subscription_t *sub, msg_callback_t cb, void *opaque)
-{
- sub->prev = NULL;
- sub->func = cb;
- sub->opaque = opaque;
-
- vlc_rwlock_wrlock (&msg_lock);
- sub->next = msg_head;
- msg_head = sub;
- vlc_rwlock_unlock (&msg_lock);
-}
-
-/**
- * Unsubscribe from the message queue.
- * This function waits for the message callback to return if needed.
- */
-void vlc_Unsubscribe (msg_subscription_t *sub)
-{
- vlc_rwlock_wrlock (&msg_lock);
- if (sub->next != NULL)
- sub->next->prev = sub->prev;
- if (sub->prev != NULL)
- sub->prev->next = sub->next;
- else
- {
- assert (msg_head == sub);
- msg_head = sub->next;
- }
- vlc_rwlock_unlock (&msg_lock);
-}
+#ifdef __ANDROID__
+#include <android/log.h>
+#endif
/**
* Emit a log message.
va_end (args);
}
-static void PrintColorMsg (void *, int, const msg_item_t *,
- const char *, va_list);
-static void PrintMsg (void *, int, const msg_item_t *, const char *, va_list);
-#ifdef WIN32
-static void Win32DebugOutputMsg (void *, int , const msg_item_t *,
+#ifdef _WIN32
+static void Win32DebugOutputMsg (void *, int , const vlc_log_t *,
const char *, va_list);
#endif
if (obj != NULL && obj->i_flags & OBJECT_FLAGS_QUIET)
return;
- /* C locale to get error messages in English in the logs */
- locale_t c = newlocale (LC_MESSAGES_MASK, "C", (locale_t)0);
- locale_t locale = uselocale (c);
-
-#ifndef __GLIBC__
- /* Expand %m to strerror(errno) - only once */
- char buf[strlen(format) + 2001], *ptr;
- strcpy (buf, format);
- ptr = (char*)buf;
- format = (const char*) buf;
+ /* Get basename from the module filename */
+ char *p = strrchr(module, '/');
+ if (p != NULL)
+ module = p;
+ p = strchr(module, '.');
- for( ;; )
+ size_t modlen = (p != NULL) ? (p - module) : 0;
+ char modulebuf[modlen + 1];
+ if (p != NULL)
{
- ptr = strchr( ptr, '%' );
- if( ptr == NULL )
- break;
-
- if( ptr[1] == 'm' )
- {
- char errbuf[2001];
- size_t errlen;
-
-#ifndef WIN32
- strerror_r( errno, errbuf, 1001 );
-#else
- int sockerr = WSAGetLastError( );
- if( sockerr )
- {
- strncpy( errbuf, net_strerror( sockerr ), 1001 );
- WSASetLastError( sockerr );
- }
- if ((sockerr == 0)
- || (strcmp ("Unknown network stack error", errbuf) == 0))
- strncpy( errbuf, strerror( errno ), 1001 );
-#endif
- errbuf[1000] = 0;
-
- /* Escape '%' from the error string */
- for( char *percent = strchr( errbuf, '%' );
- percent != NULL;
- percent = strchr( percent + 2, '%' ) )
- {
- memmove( percent + 1, percent, strlen( percent ) + 1 );
- }
-
- errlen = strlen( errbuf );
- memmove( ptr + errlen, ptr + 2, strlen( ptr + 2 ) + 1 );
- memcpy( ptr, errbuf, errlen );
- break; /* Only once, so we don't overflow */
- }
-
- /* Looks for conversion specifier... */
- do
- ptr++;
- while( *ptr && ( strchr( "diouxXeEfFgGaAcspn%", *ptr ) == NULL ) );
- if( *ptr )
- ptr++; /* ...and skip it */
+ memcpy(modulebuf, module, modlen);
+ modulebuf[modlen] = '\0';
+ module = modulebuf;
}
-#endif
/* Fill message information fields */
- msg_item_t msg;
+ vlc_log_t msg;
msg.i_object_id = (uintptr_t)obj;
msg.psz_object_type = (obj != NULL) ? obj->psz_object_type : "generic";
break;
}
- /* Pass message to subscribers */
- libvlc_priv_t *priv = libvlc_priv (obj->p_libvlc);
+ /* Pass message to the callback */
+ libvlc_priv_t *priv = obj ? libvlc_priv (obj->p_libvlc) : NULL;
+#ifdef _WIN32
va_list ap;
va_copy (ap, args);
- if (priv->b_color)
- PrintColorMsg (&priv->i_verbose, type, &msg, format, ap);
- else
- PrintMsg (&priv->i_verbose, type, &msg, format, ap);
- va_end (ap);
-
-#ifdef WIN32
- va_copy (ap, args);
- Win32DebugOutputMsg (&priv->i_verbose, type, &msg, format, ap);
+ Win32DebugOutputMsg (priv ? &priv->log.verbose : NULL, type, &msg, format, ap);
va_end (ap);
#endif
- vlc_rwlock_rdlock (&msg_lock);
- for (msg_subscription_t *sub = msg_head; sub != NULL; sub = sub->next)
- {
- va_copy (ap, args);
- sub->func (sub->opaque, type, &msg, format, ap);
- va_end (ap);
+ if (priv) {
+ vlc_rwlock_rdlock (&priv->log.lock);
+ priv->log.cb (priv->log.opaque, type, &msg, format, args);
+ vlc_rwlock_unlock (&priv->log.lock);
}
- vlc_rwlock_unlock (&msg_lock);
-
- uselocale (locale);
- freelocale (c);
}
static const char msg_type[4][9] = { "", " error", " warning", " debug" };
#define GRAY "\033[0m"
static const char msg_color[4][8] = { WHITE, RED, YELLOW, GRAY };
-static void PrintColorMsg (void *d, int type, const msg_item_t *p_item,
+/* Display size of a pointer */
+static const int ptr_width = 2 * /* hex digits */ sizeof(uintptr_t);
+
+static void PrintColorMsg (void *d, int type, const vlc_log_t *p_item,
const char *format, va_list ap)
{
- const signed char *pverbose = d;
FILE *stream = stderr;
+ int verbose = (intptr_t)d;
- if (*pverbose < 0 || *pverbose < (type - VLC_MSG_ERR))
+ if (verbose < 0 || verbose < (type - VLC_MSG_ERR))
return;
int canc = vlc_savecancel ();
flockfile (stream);
- fprintf (stream, "["GREEN"%p"GRAY"] ", (void *)p_item->i_object_id);
+ utf8_fprintf (stream, "["GREEN"%0*"PRIxPTR""GRAY"] ", ptr_width, p_item->i_object_id);
if (p_item->psz_header != NULL)
utf8_fprintf (stream, "[%s] ", p_item->psz_header);
utf8_fprintf (stream, "%s %s%s: %s", p_item->psz_module,
p_item->psz_object_type, msg_type[type], msg_color[type]);
utf8_vfprintf (stream, format, ap);
fputs (GRAY"\n", stream);
-#if defined (WIN32) || defined (__OS2__)
+#if defined (_WIN32) || defined (__OS2__)
fflush (stream);
#endif
funlockfile (stream);
vlc_restorecancel (canc);
}
-static void PrintMsg (void *d, int type, const msg_item_t *p_item,
+static void PrintMsg (void *d, int type, const vlc_log_t *p_item,
const char *format, va_list ap)
{
- const signed char *pverbose = d;
FILE *stream = stderr;
+ int verbose = (intptr_t)d;
- if (*pverbose < 0 || *pverbose < (type - VLC_MSG_ERR))
+ if (verbose < 0 || verbose < (type - VLC_MSG_ERR))
return;
int canc = vlc_savecancel ();
flockfile (stream);
- fprintf (stream, "[%p] ", (void *)p_item->i_object_id);
+ utf8_fprintf (stream, "[%0*"PRIxPTR"] ", ptr_width, p_item->i_object_id);
if (p_item->psz_header != NULL)
utf8_fprintf (stream, "[%s] ", p_item->psz_header);
utf8_fprintf (stream, "%s %s%s: ", p_item->psz_module,
p_item->psz_object_type, msg_type[type]);
utf8_vfprintf (stream, format, ap);
putc_unlocked ('\n', stream);
-#if defined (WIN32) || defined (__OS2__)
+#if defined (_WIN32) || defined (__OS2__)
fflush (stream);
#endif
funlockfile (stream);
vlc_restorecancel (canc);
}
-#ifdef WIN32
-static void Win32DebugOutputMsg (void* d, int type, const msg_item_t *p_item,
+#ifdef _WIN32
+static void Win32DebugOutputMsg (void* d, int type, const vlc_log_t *p_item,
const char *format, va_list dol)
{
VLC_UNUSED(p_item);
msg[msg_len] = '\n';
msg[msg_len + 1] = '\0';
}
- OutputDebugStringA(msg);
+ char* psz_msg = NULL;
+ if(asprintf(&psz_msg, "%s %s%s: %s", p_item->psz_module,
+ p_item->psz_object_type, msg_type[type], msg) > 0) {
+ wchar_t* wmsg = ToWide(psz_msg);
+ OutputDebugStringW(wmsg);
+ free(wmsg);
+ free(psz_msg);
+ }
}
free(msg);
}
#endif
+
+#ifdef __ANDROID__
+static void AndroidPrintMsg (void *d, int type, const vlc_log_t *p_item,
+ const char *format, va_list ap)
+{
+ int verbose = (intptr_t)d;
+ int prio;
+
+ if (verbose < 0 || verbose < (type - VLC_MSG_ERR))
+ return;
+
+ int canc = vlc_savecancel ();
+
+ char *format2;
+ if (asprintf (&format2, "[%0*"PRIxPTR"] %s %s: %s",
+ ptr_width, p_item->i_object_id, p_item->psz_module,
+ p_item->psz_object_type, format) < 0)
+ return;
+ switch (type) {
+ case VLC_MSG_INFO:
+ prio = ANDROID_LOG_INFO;
+ break;
+ case VLC_MSG_ERR:
+ prio = ANDROID_LOG_ERROR;
+ break;
+ case VLC_MSG_WARN:
+ prio = ANDROID_LOG_WARN;
+ break;
+ default:
+ case VLC_MSG_DBG:
+ prio = ANDROID_LOG_DEBUG;
+ }
+ __android_log_vprint (prio, "VLC", format2, ap);
+ free (format2);
+ vlc_restorecancel (canc);
+}
+#endif
+
+/**
+ * Sets the message logging callback.
+ * \param cb message callback, or NULL to reset
+ * \param data data pointer for the message callback
+ */
+void vlc_LogSet (libvlc_int_t *vlc, vlc_log_cb cb, void *opaque)
+{
+ libvlc_priv_t *priv = libvlc_priv (vlc);
+
+ if (cb == NULL)
+ {
+#ifdef __ANDROID__
+ cb = AndroidPrintMsg;
+#else
+#if defined (HAVE_ISATTY) && !defined (_WIN32)
+ if (isatty (STDERR_FILENO) && var_InheritBool (vlc, "color"))
+ cb = PrintColorMsg;
+ else
+#endif
+ cb = PrintMsg;
+#endif // __ANDROID__
+ opaque = (void *)(intptr_t)priv->log.verbose;
+ }
+
+ vlc_rwlock_wrlock (&priv->log.lock);
+ priv->log.cb = cb;
+ priv->log.opaque = opaque;
+ vlc_rwlock_unlock (&priv->log.lock);
+
+ /* Announce who we are */
+ msg_Dbg (vlc, "VLC media player - %s", VERSION_MESSAGE);
+ msg_Dbg (vlc, "%s", COPYRIGHT_MESSAGE);
+ msg_Dbg (vlc, "revision %s", psz_vlc_changeset);
+ msg_Dbg (vlc, "configured with %s", CONFIGURE_LINE);
+}
+
+void vlc_LogInit (libvlc_int_t *vlc)
+{
+ libvlc_priv_t *priv = libvlc_priv (vlc);
+ const char *str;
+
+ if (var_InheritBool (vlc, "quiet"))
+ priv->log.verbose = -1;
+ else
+ if ((str = getenv ("VLC_VERBOSE")) != NULL)
+ priv->log.verbose = atoi (str);
+ else
+ priv->log.verbose = var_InheritInteger (vlc, "verbose");
+
+ vlc_rwlock_init (&priv->log.lock);
+ vlc_LogSet (vlc, NULL, NULL);
+}
+
+void vlc_LogDeinit (libvlc_int_t *vlc)
+{
+ libvlc_priv_t *priv = libvlc_priv (vlc);
+
+ vlc_rwlock_destroy (&priv->log.lock);
+}
projects / vlc / blobdiff