Imported Upstream version 5.14.0.169
Former-commit-id: bbcdbb0cb1ff6b53df3595cc659c1de793eb31dc
This commit is contained in:
parent
e745485b67
commit
ae9e361548
@ -1 +1 @@
|
||||
afc8adebe2352d6191fca605225335ce94d20147
|
||||
44bb9ef8be292590b1345e1b063f35c47984beb6
|
@ -1 +1 @@
|
||||
1173fab747cf32f1dc1c2402cf0bc21b14ec2593
|
||||
d7231c8451f4a944be911e452a7f91eb175aee32
|
@ -34,7 +34,7 @@ static class Consts
|
||||
// Use these assembly version constants to make code more maintainable.
|
||||
//
|
||||
|
||||
public const string MonoVersion = "5.14.0.167";
|
||||
public const string MonoVersion = "5.14.0.169";
|
||||
public const string MonoCompany = "Mono development team";
|
||||
public const string MonoProduct = "Mono Common Language Infrastructure";
|
||||
public const string MonoCopyright = "(c) Various Mono authors";
|
||||
|
@ -1 +1 @@
|
||||
5c10de7d48d164a17e1dad0f6467408bd0f8f637
|
||||
2fcbe56723621a979e86eaa0ad5807441a761245
|
@ -1 +1 @@
|
||||
f07257db6941e1fdafe4f941f3da778554cb4d81
|
||||
dcdfdda502c4cdedc33c75b92b7af1bc11dca49c
|
@ -1 +1 @@
|
||||
ccef0bd061d4ec909d6582e2b37afb7f74c86ad8
|
||||
1ef91ffc452772177c253c998467896aa69100e2
|
@ -1 +1 @@
|
||||
716b25011cbac633b4b75b51f53bc385611ec1b3
|
||||
ce795997d46c0de20180488048bcfc3e5a5065bf
|
@ -1 +1 @@
|
||||
505eb89186ae2caabe6abebbf3a1e5726ce54a1c
|
||||
590bbb19b4bc6a7f03707dc93734100396ed05fd
|
@ -1 +1 @@
|
||||
3f1c39ead22bb5442917f8cd9146442ee175443e
|
||||
600664f240ac863b38f05a9ccb8b10179f411c21
|
@ -1 +1 @@
|
||||
942c0427e74c0f75623f76538d97413b653014d3
|
||||
8a8b05eb926d03af52574c5d37f0fbf203f76480
|
@ -1 +1 @@
|
||||
5c10de7d48d164a17e1dad0f6467408bd0f8f637
|
||||
2fcbe56723621a979e86eaa0ad5807441a761245
|
@ -1 +1 @@
|
||||
f07257db6941e1fdafe4f941f3da778554cb4d81
|
||||
dcdfdda502c4cdedc33c75b92b7af1bc11dca49c
|
@ -1 +1 @@
|
||||
ccef0bd061d4ec909d6582e2b37afb7f74c86ad8
|
||||
1ef91ffc452772177c253c998467896aa69100e2
|
@ -1 +1 @@
|
||||
716b25011cbac633b4b75b51f53bc385611ec1b3
|
||||
ce795997d46c0de20180488048bcfc3e5a5065bf
|
@ -1 +1 @@
|
||||
505eb89186ae2caabe6abebbf3a1e5726ce54a1c
|
||||
590bbb19b4bc6a7f03707dc93734100396ed05fd
|
@ -1 +1 @@
|
||||
3f1c39ead22bb5442917f8cd9146442ee175443e
|
||||
600664f240ac863b38f05a9ccb8b10179f411c21
|
@ -1 +1 @@
|
||||
942c0427e74c0f75623f76538d97413b653014d3
|
||||
8a8b05eb926d03af52574c5d37f0fbf203f76480
|
@ -1 +1 @@
|
||||
5c10de7d48d164a17e1dad0f6467408bd0f8f637
|
||||
2fcbe56723621a979e86eaa0ad5807441a761245
|
@ -1 +1 @@
|
||||
f07257db6941e1fdafe4f941f3da778554cb4d81
|
||||
dcdfdda502c4cdedc33c75b92b7af1bc11dca49c
|
@ -1 +1 @@
|
||||
ccef0bd061d4ec909d6582e2b37afb7f74c86ad8
|
||||
1ef91ffc452772177c253c998467896aa69100e2
|
@ -1 +1 @@
|
||||
716b25011cbac633b4b75b51f53bc385611ec1b3
|
||||
ce795997d46c0de20180488048bcfc3e5a5065bf
|
@ -1 +1 @@
|
||||
505eb89186ae2caabe6abebbf3a1e5726ce54a1c
|
||||
590bbb19b4bc6a7f03707dc93734100396ed05fd
|
@ -1 +1 @@
|
||||
3f1c39ead22bb5442917f8cd9146442ee175443e
|
||||
600664f240ac863b38f05a9ccb8b10179f411c21
|
@ -1 +1 @@
|
||||
942c0427e74c0f75623f76538d97413b653014d3
|
||||
8a8b05eb926d03af52574c5d37f0fbf203f76480
|
@ -1 +1 @@
|
||||
cf79fed54a94a4b74b5743dfed575f703f93661b
|
||||
04ba00b20c2911983269f81cd4aa51083f09d43e
|
@ -227,12 +227,20 @@ MONO_SIG_HANDLER_FUNC (static, sigterm_signal_handler)
|
||||
// die. The dump ends with the exit(1) below
|
||||
MonoContext mctx;
|
||||
gchar *output = NULL;
|
||||
MonoStackHash hashes;
|
||||
mono_sigctx_to_monoctx (ctx, &mctx);
|
||||
if (!mono_threads_summarize (&mctx, &output, NULL))
|
||||
if (!mono_threads_summarize (&mctx, &output, &hashes))
|
||||
g_assert_not_reached ();
|
||||
|
||||
// Only the dumping-supervisor thread exits mono_thread_summarize
|
||||
MOSTLY_ASYNC_SAFE_PRINTF("Unhandled exception dump: \n######\n%s\n######\n", output);
|
||||
if (mono_merp_enabled ()) {
|
||||
pid_t crashed_pid = getpid ();
|
||||
char *full_version = mono_get_runtime_build_info ();
|
||||
mono_merp_invoke (crashed_pid, "SIGTERM", output, &hashes, full_version);
|
||||
} else {
|
||||
// Only the dumping-supervisor thread exits mono_thread_summarize
|
||||
MOSTLY_ASYNC_SAFE_PRINTF("Unhandled exception dump: \n######\n%s\n######\n", output);
|
||||
sleep (3);
|
||||
}
|
||||
|
||||
mono_chain_signal (MONO_SIG_HANDLER_PARAMS);
|
||||
exit (1);
|
||||
|
@ -1 +1 @@
|
||||
#define FULL_VERSION "explicit/d4a680b"
|
||||
#define FULL_VERSION "explicit/ebc0c7c"
|
||||
|
@ -173,8 +173,8 @@ get_merp_exctype (MERPExcType exc)
|
||||
case MERP_EXC_HANG:
|
||||
return "0x02000000";
|
||||
case MERP_EXC_NONE:
|
||||
// Exception type is optional
|
||||
return "";
|
||||
// Exception type documented as optional, not optional
|
||||
g_assert_not_reached ();
|
||||
default:
|
||||
g_assert_not_reached ();
|
||||
}
|
||||
@ -195,6 +195,11 @@ parse_exception_type (const char *signal)
|
||||
if (!strcmp (signal, "SIGABRT"))
|
||||
return MERP_EXC_SIGABRT;
|
||||
|
||||
// Force quit == hang?
|
||||
// We need a default for this
|
||||
if (!strcmp (signal, "SIGTERM"))
|
||||
return MERP_EXC_HANG;
|
||||
|
||||
// FIXME: There are no other such signal
|
||||
// strings passed to mono_handle_native_crash at the
|
||||
// time of writing this
|
||||
|
BIN
po/mcs/de.gmo
BIN
po/mcs/de.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
03af8465c361c3f6b6271608b1c5ecce72b607ac
|
||||
18a58f9e10682a9706336d0df16db2fd1b4f4af7
|
BIN
po/mcs/es.gmo
BIN
po/mcs/es.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
eacefc4206489e9d8e81e90f4a8c45f06b869bf7
|
||||
8f8f041fd02a5ad94291e9002e34c3baeabb2f98
|
BIN
po/mcs/ja.gmo
BIN
po/mcs/ja.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
14279d8c2629b93897078a7f064a9492fe531cfa
|
||||
2cdba5ed4b3f2d84c1027b95299562b1bcb12de0
|
@ -6,9 +6,9 @@
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: mono 5.14.0.167\n"
|
||||
"Project-Id-Version: mono 5.14.0.169\n"
|
||||
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
|
||||
"POT-Creation-Date: 2018-07-15 08:04+0000\n"
|
||||
"POT-Creation-Date: 2018-07-19 08:01+0000\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
|
BIN
po/mcs/pt_BR.gmo
BIN
po/mcs/pt_BR.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
178ef4c9adabd058119fc3f89a7a81656d3c7ef0
|
||||
de5bacdd2e5597c9fa5aa91b0af9393e949e6cbe
|
Loading…
x
Reference in New Issue
Block a user