X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Futils%2Fmono-logger.c;h=54bf4db6f629e4f8f90f4e0d26ca9136950f2b39;hb=64c693851228345fcd6b3df03f7c25845d2820b5;hp=11162fc19fdea26aed66671c403af632d2a31a2d;hpb=e51a9b6ba1a93bc981639a706c93bee413099fd6;p=mono.git diff --git a/mono/utils/mono-logger.c b/mono/utils/mono-logger.c index 11162fc19fd..8c6c5aa5512 100644 --- a/mono/utils/mono-logger.c +++ b/mono/utils/mono-logger.c @@ -3,32 +3,50 @@ #include #include -#include "mono-logger.h" +#include "mono-compiler.h" +#include "mono-logger-internals.h" typedef struct { GLogLevelFlags level; MonoTraceMask mask; } MonoLogLevelEntry; -static GLogLevelFlags current_level = G_LOG_LEVEL_ERROR; -static MonoTraceMask current_mask = MONO_TRACE_ALL; +GLogLevelFlags mono_internal_current_level = INT_MAX; +MonoTraceMask mono_internal_current_mask = MONO_TRACE_ALL; +gboolean mono_trace_log_header = FALSE; -static const char *mono_log_domain = "Mono"; static GQueue *level_stack = NULL; +static const char *mono_log_domain = "Mono"; +static MonoPrintCallback print_callback, printerr_callback; + +static MonoLogCallParm logCallback = { + .opener = NULL, + .writer = NULL, + .closer = NULL, + .header = FALSE +}; + +typedef struct { + MonoLogCallback legacy_callback; + gpointer user_data; +} legacyLoggerUserData; /** * mono_trace_init: * * Initializes the mono tracer. */ -static void +void mono_trace_init (void) { if(level_stack == NULL) { + mono_internal_current_level = G_LOG_LEVEL_ERROR; level_stack = g_queue_new(); - mono_trace_set_mask_string(getenv("MONO_LOG_MASK")); - mono_trace_set_level_string(getenv("MONO_LOG_LEVEL")); + mono_trace_set_mask_string(g_getenv("MONO_LOG_MASK")); + mono_trace_set_level_string(g_getenv("MONO_LOG_LEVEL")); + mono_trace_set_logheader_string(g_getenv("MONO_LOG_HEADER")); + mono_trace_set_logdest_string(g_getenv("MONO_LOG_DEST")); } } @@ -45,34 +63,12 @@ mono_trace_cleanup (void) g_free (g_queue_pop_head (level_stack)); } + logCallback.closer(); g_queue_free (level_stack); level_stack = NULL; } } -/** - * mono_trace: - * - * @level: Verbose level of the specified message - * @mask: Type of the specified message - * - * Traces a new message, depending on the current logging level - * and trace mask. - */ -void -mono_trace(GLogLevelFlags level, MonoTraceMask mask, const char *format, ...) -{ - if(level_stack == NULL) - mono_trace_init(); - - if(level <= current_level && mask & current_mask) { - va_list args; - va_start (args, format); - g_logv (mono_log_domain, level, format, args); - va_end (args); - } -} - /** * mono_tracev: * @@ -83,13 +79,21 @@ mono_trace(GLogLevelFlags level, MonoTraceMask mask, const char *format, ...) * and trace mask. */ void -mono_tracev (GLogLevelFlags level, MonoTraceMask mask, const char *format, va_list args) +mono_tracev_inner (GLogLevelFlags level, MonoTraceMask mask, const char *format, va_list args) { - if (level_stack == NULL) + if (level_stack == NULL) { mono_trace_init (); + if(level > mono_internal_current_level || !(mask & mono_internal_current_mask)) + return; + } - if(level <= current_level && mask & current_mask) - g_logv (mono_log_domain, level, format, args); + if (logCallback.opener == NULL) { + logCallback.opener = mono_log_open_logfile; + logCallback.writer = mono_log_write_logfile; + logCallback.closer = mono_log_close_logfile; + logCallback.opener(NULL, NULL); + } + logCallback.writer(mono_log_domain, level, logCallback.header, format, args); } /** @@ -107,7 +111,7 @@ mono_trace_set_level (GLogLevelFlags level) if(level_stack == NULL) mono_trace_init(); - current_level = level; + mono_internal_current_level = level; } /** @@ -125,7 +129,55 @@ mono_trace_set_mask (MonoTraceMask mask) if(level_stack == NULL) mono_trace_init(); - current_mask = mask; + mono_internal_current_mask = mask; +} + +/** + * mono_trace_set_logdest: + * + * @dest: Destination for logging + * + * Sets the current logging destination. This can be a file or, if supported, + * syslog. + */ +void +mono_trace_set_logdest_string (const char *dest) +{ + MonoLogCallParm logger; + + if(level_stack == NULL) + mono_trace_init(); + + if ((dest == NULL) || (strcmp("syslog", dest) != 0)) { + logger.opener = mono_log_open_logfile; + logger.writer = mono_log_write_logfile; + logger.closer = mono_log_close_logfile; + logger.dest = (char *) dest; + mono_trace_set_log_handler_internal(&logger, NULL); + } else { + logger.opener = mono_log_open_syslog; + logger.writer = mono_log_write_syslog; + logger.closer = mono_log_close_syslog; + logger.dest = (char *) dest; + mono_trace_set_log_handler_internal(&logger, NULL); + } +} + +/** + * mono_trace_set_logheader: + * + * @head: Whether we want pid/date/time header on log messages + * + * Sets the current logging header option. + */ +void +mono_trace_set_logheader_string(const char *head) +{ + if (head == NULL) { + mono_trace_log_header = FALSE; + } else { + mono_trace_log_header = TRUE; + } } /** @@ -141,18 +193,18 @@ void mono_trace_push (GLogLevelFlags level, MonoTraceMask mask) { if(level_stack == NULL) - g_error(G_GNUC_PRETTY_FUNCTION ": cannot use mono_trace_push without calling mono_trace_init first."); + g_error("%s: cannot use mono_trace_push without calling mono_trace_init first.", __func__); else { - MonoLogLevelEntry *entry = g_malloc(sizeof(MonoLogLevelEntry)); - entry->level = current_level; - entry->mask = current_mask; + MonoLogLevelEntry *entry = (MonoLogLevelEntry *) g_malloc(sizeof(MonoLogLevelEntry)); + entry->level = mono_internal_current_level; + entry->mask = mono_internal_current_mask; g_queue_push_head (level_stack, (gpointer)entry); /* Set the new level and mask */ - current_level = level; - current_mask = mask; + mono_internal_current_level = level; + mono_internal_current_mask = mask; } } @@ -165,15 +217,15 @@ void mono_trace_pop (void) { if(level_stack == NULL) - g_error(G_GNUC_PRETTY_FUNCTION ": cannot use mono_trace_pop without calling mono_trace_init first."); + g_error("%s: cannot use mono_trace_pop without calling mono_trace_init first.", __func__); else { if(!g_queue_is_empty (level_stack)) { MonoLogLevelEntry *entry = (MonoLogLevelEntry*)g_queue_pop_head (level_stack); /* Restore previous level and mask */ - current_level = entry->level; - current_mask = entry->mask; + mono_internal_current_level = entry->level; + mono_internal_current_mask = entry->mask; g_free (entry); } @@ -205,39 +257,43 @@ mono_trace_set_level_string (const char *value) } void -mono_trace_set_mask_string (char *value) +mono_trace_set_mask_string (const char *value) { int i; - char *tok; + const char *tok; guint32 flags = 0; - const char *valid_flags[] = {"asm", "type", "dll", "gc", "cfg", "aot", "all", NULL}; + const char *valid_flags[] = {"asm", "type", "dll", "gc", "cfg", "aot", "security", "threadpool", "io-threadpool", "io-layer", "w32handle", "all", NULL}; const MonoTraceMask valid_masks[] = {MONO_TRACE_ASSEMBLY, MONO_TRACE_TYPE, MONO_TRACE_DLLIMPORT, - MONO_TRACE_GC, MONO_TRACE_CONFIG, MONO_TRACE_AOT, MONO_TRACE_ALL }; + MONO_TRACE_GC, MONO_TRACE_CONFIG, MONO_TRACE_AOT, MONO_TRACE_SECURITY, + MONO_TRACE_THREADPOOL, MONO_TRACE_IO_THREADPOOL, MONO_TRACE_IO_LAYER, + MONO_TRACE_W32HANDLE, MONO_TRACE_ALL }; if(!value) return; - tok = strtok (value, ","); - - if(!tok) - tok = value; + tok = value; - while (tok) { + while (*tok) { + if (*tok == ',') { + tok++; + continue; + } for (i = 0; valid_flags[i]; i++) { - if (strcmp (tok, valid_flags[i]) == 0) { + int len = strlen (valid_flags[i]); + if (strncmp (tok, valid_flags[i], len) == 0 && (tok[len] == 0 || tok[len] == ',')) { flags |= valid_masks[i]; + tok += len; break; } } - if (!valid_flags[i]) + if (!valid_flags[i]) { g_print("Unknown trace flag: %s\n", tok); - - tok = strtok (NULL, ","); + break; + } } - if(flags) - mono_trace_set_mask (flags); + mono_trace_set_mask ((MonoTraceMask) flags); } /* @@ -248,5 +304,170 @@ mono_trace_set_mask_string (char *value) gboolean mono_trace_is_traced (GLogLevelFlags level, MonoTraceMask mask) { - return (level <= current_level && mask & current_mask); + return (level <= mono_internal_current_level && mask & mono_internal_current_mask); +} + +/** + * log_level_get_name + * @log_level severity level + * + * Convert log level into a string for legacy log handlers + */ +static const char * +log_level_get_name (GLogLevelFlags log_level) +{ + switch (log_level & G_LOG_LEVEL_MASK) { + case G_LOG_LEVEL_ERROR: return "error"; + case G_LOG_LEVEL_CRITICAL: return "critical"; + case G_LOG_LEVEL_WARNING: return "warning"; + case G_LOG_LEVEL_MESSAGE: return "message"; + case G_LOG_LEVEL_INFO: return "info"; + case G_LOG_LEVEL_DEBUG: return "debug"; + default: return "unknown"; + } +} + +/** + * callback_adapter + * + * @log_domain Message prefix + * @log_level Severity + * @message Message to be written + * @fatal Fatal flag - write then abort + * @user_data Argument passed to @callback + * + * This adapts the old callback writer exposed by MonoCallback to the newer method of + * logging. We ignore the header request as legacy handlers never had headers. + */ +static void +callback_adapter(const char *domain, GLogLevelFlags level, mono_bool fatal, const char *fmt, va_list args) +{ + legacyLoggerUserData *ll = (legacyLoggerUserData *) logCallback.user_data; + const char *msg = g_strdup_vprintf (fmt, args); + + ll->legacy_callback (domain, log_level_get_name(level), msg, fatal, ll->user_data); + g_free ((void *) msg); +} + +/** + * legacy_opener + * + * Dummy routine for older style loggers + */ +static void +legacy_opener(const char *path, void *user_data) +{ + /* nothing to do */ +} + +/** + * legacy_closer + * + * Cleanup routine for older style loggers + */ +static void +legacy_closer() +{ + if (logCallback.user_data != NULL) { + g_free (logCallback.user_data); /* This is a LegacyLoggerUserData struct */ + logCallback.opener = NULL; + logCallback.writer = NULL; + logCallback.closer = NULL; + logCallback.user_data = NULL; + logCallback.header = FALSE; + } +} + +/** + * mono_trace_set_log_handler: + * + * @callback The callback that will replace the default logging handler + * @user_data Argument passed to @callback + * + * The log handler replaces the default runtime logger. All logging requests with be routed to it. + * If the fatal argument in the callback is true, the callback must abort the current process. The runtime expects that + * execution will not resume after a fatal error. This is for "old-style" or legacy log handers. + */ +void +mono_trace_set_log_handler (MonoLogCallback callback, void *user_data) +{ + g_assert (callback); + if (logCallback.closer != NULL) + logCallback.closer(); + legacyLoggerUserData *ll = g_malloc (sizeof (legacyLoggerUserData)); + ll->legacy_callback = callback; + ll->user_data = user_data; + logCallback.opener = legacy_opener; + logCallback.writer = callback_adapter; + logCallback.closer = legacy_closer; + logCallback.user_data = ll; + logCallback.dest = NULL; +} + +/** + * mono_trace_set_log_handler_internal: + * + * @callback The callback that will replace the default logging handler + * @user_data Argument passed to @callback + * + * The log handler replaces the default runtime logger. All logging requests with be routed to it. + * If the fatal argument in the callback is true, the callback must abort the current process. The runtime expects that + * execution will not resume after a fatal error. + */ +void +mono_trace_set_log_handler_internal (MonoLogCallParm *callback, void *user_data) +{ + g_assert (callback); + if (logCallback.closer != NULL) + logCallback.closer(); + logCallback.opener = callback->opener; + logCallback.writer = callback->writer; + logCallback.closer = callback->closer; + logCallback.header = mono_trace_log_header; + logCallback.dest = callback->dest; + logCallback.opener(logCallback.dest, user_data); +} + +static void +print_handler (const char *string) +{ + print_callback (string, TRUE); +} + +static void +printerr_handler (const char *string) +{ + printerr_callback (string, FALSE); +} + +/** + * mono_trace_set_print_handler: + * + * @callback The callback that will replace the default runtime behavior for stdout output. + * + * The print handler replaces the default runtime stdout output handler. This is used by free form output done by the runtime. + * + */ +void +mono_trace_set_print_handler (MonoPrintCallback callback) +{ + g_assert (callback); + print_callback = callback; + g_set_print_handler (print_handler); +} + +/** + * mono_trace_set_printerr_handler: + * + * @callback The callback that will replace the default runtime behavior for stderr output. + * + * The print handler replaces the default runtime stderr output handler. This is used by free form output done by the runtime. + * + */ +void +mono_trace_set_printerr_handler (MonoPrintCallback callback) +{ + g_assert (callback); + printerr_callback = callback; + g_set_printerr_handler (printerr_handler); }