mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 5.14.0.93

Browse Source 
Former-commit-id: dda284b8de49fb65cd1a403db6a592e6c68a5e8c
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-05-23 09:42:45 +00:00
parent fb453ffa72
commit 300ff421ef
63 changed files with 880 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mono/eglib/eglib-remap.h
View File

@@ -264,6 +264,7 @@
#define g_vasprintf monoeg_g_vasprintf
#define g_win32_getlocale monoeg_g_win32_getlocale
#define g_assertion_message monoeg_assertion_message
#define g_get_assertion_message monoeg_get_assertion_message
#define g_malloc monoeg_malloc
#define g_malloc0 monoeg_malloc0
#define g_ptr_array_grow monoeg_ptr_array_grow

1
mono/eglib/glib.h
View File

@@ -584,6 +584,7 @@ GLogLevelFlags g_log_set_fatal_mask (const gchar *log_domain, GLogLevelFlags f
void g_logv (const gchar *log_domain, GLogLevelFlags log_level, const gchar *format, va_list args);
void g_log (const gchar *log_domain, GLogLevelFlags log_level, const gchar *format, ...);
void g_assertion_message (const gchar *format, ...) G_GNUC_NORETURN;
const char * g_get_assertion_message (void);
#ifdef HAVE_C99_SUPPORT
/* The for (;;) tells gc thats g_error () doesn't return, avoiding warnings */

64
mono/eglib/goutput.c
View File

@@ -126,11 +126,22 @@ g_log (const gchar *log_domain, GLogLevelFlags log_level, const gchar *format, .
va_end (args);
}
static char *failure_assertion = NULL;
const char *
g_get_assertion_message (void)
{
return failure_assertion;
}
void
g_assertion_message (const gchar *format, ...)
{
va_list args;
va_start (args, format);
g_vasprintf (&failure_assertion, format, args);
va_start (args, format);
g_logv (G_LOG_DOMAIN, G_LOG_LEVEL_ERROR, format, args);
va_end (args);
@@ -155,10 +166,57 @@ to_android_priority (GLogLevelFlags log_level)
return ANDROID_LOG_UNKNOWN;
}
#define LOG_MESSAGE_MAX_LEN 4096
static void
android_log_line (gint log_priority, const gchar *log_domain, gchar *log_message, gint log_len)
{
gchar log_buf [LOG_MESSAGE_MAX_LEN];
g_assert (log_len <= LOG_MESSAGE_MAX_LEN - 1);
/* If line is longer than LOG_MESSAGE_MAX_LEN - 1, then we simply cut it out. This is consistent with the previous behavior. */
strncpy (log_buf, log_message, log_len);
log_buf [log_len] = '\0';
__android_log_write (log_priority, log_domain, log_buf);
}
static void
android_log (gint log_priority, const gchar *log_domain, const gchar *log_message)
{
gint log_message_len, log_message_p_len;
gchar *log_message_p;
log_message_len = strlen (log_message);
if (log_message_len <= LOG_MESSAGE_MAX_LEN) {
__android_log_write (log_priority, log_domain, log_message);
return;
}
for (log_message_p = log_message; log_message_p < log_message + log_message_len;) {
gchar *p = strstr (log_message_p, "\n");
if (p == NULL) {
/* There is no more "\n". */
android_log_line (log_priority, log_domain, log_message_p, LOG_MESSAGE_MAX_LEN - 1);
break;
}
log_message_p_len = p - log_message_p;
if (log_message_p_len > LOG_MESSAGE_MAX_LEN - 1)
log_message_p_len = LOG_MESSAGE_MAX_LEN - 1;
android_log_line (log_priority, log_domain, log_message_p, log_message_p_len);
/* Set `log_message_p` to the character right after "\n" */
log_message_p = p + 1;
}
}
void
g_log_default_handler (const gchar *log_domain, GLogLevelFlags log_level, const gchar *message, gpointer unused_data)
{
__android_log_write (to_android_priority (log_level), log_domain, message);
android_log (to_android_priority (log_level), log_domain, message);
if (log_level & fatal)
abort ();
}
@@ -167,14 +225,14 @@ static void
default_stdout_handler (const gchar *message)
{
/* TODO: provide a proper app name */
__android_log_write (ANDROID_LOG_ERROR, "mono", message);
android_log (ANDROID_LOG_ERROR, "mono", message);
}
static void
default_stderr_handler (const gchar *message)
{
/* TODO: provide a proper app name */
__android_log_write (ANDROID_LOG_ERROR, "mono", message);
android_log (ANDROID_LOG_ERROR, "mono", message);
}