#include <stdio.h>
#include <glib.h>
-#include "mono-logger.h"
+#include "mono-compiler.h"
+#include "mono-logger-internal.h"
typedef struct {
GLogLevelFlags level;
static const char *mono_log_domain = "Mono";
static GQueue *level_stack = NULL;
+static MonoPrintCallback print_callback, printerr_callback;
/**
* mono_trace_init:
if(level_stack == NULL) {
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_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;
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);
}
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", "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_ALL };
if(!value)
return;
- tok = strtok (value, ",");
+ tok = value;
- if(!tok)
- 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);
+ break;
+ }
+ }
+
+ mono_trace_set_mask (flags);
+}
+
+/*
+ * mono_trace_is_traced:
+ *
+ * Returns whenever a message with @level and @mask will be printed or not.
+ */
+gboolean
+mono_trace_is_traced (GLogLevelFlags level, MonoTraceMask mask)
+{
+ return (level <= current_level && mask & current_mask);
+}
+
+static MonoLogCallback log_callback;
- tok = strtok (NULL, ",");
+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";
}
+}
+
+static void
+log_adapter (const gchar *log_domain, GLogLevelFlags log_level, const gchar *message, gpointer user_data)
+{
+ log_callback (log_domain, log_level_get_name (log_level), message, log_level & G_LOG_LEVEL_ERROR, user_data);
+}
- if(flags)
- mono_trace_set_mask (flags);
+/**
+ * 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.
+ */
+void
+mono_trace_set_log_handler (MonoLogCallback callback, void *user_data)
+{
+ g_assert (callback);
+ log_callback = callback;
+ g_log_set_default_handler (log_adapter, 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_print_handler (printerr_handler);
}
projects / mono.git / blobdiff