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

Merge branch 'upstream'

Browse Source 
Former-commit-id: 25a260452f416d8aa2fc1c9a8f0f5a593c593102
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2018-03-21 09:37:42 +00:00
commit f0952ad113
37 changed files with 45 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
config.h.in
View File

@ -219,12 +219,6 @@
/* Use classic Windows API support */ /* Use classic Windows API support */
#undef HAVE_CLASSIC_WINAPI_SUPPORT #undef HAVE_CLASSIC_WINAPI_SUPPORT
/* CLOCK_MONOTONIC */
#undef HAVE_CLOCK_MONOTONIC
/* CLOCK_MONOTONIC_COARSE */
#undef HAVE_CLOCK_MONOTONIC_COARSE
/* Define to 1 if you have the `clock_nanosleep' function. */ /* Define to 1 if you have the `clock_nanosleep' function. */
#undef HAVE_CLOCK_NANOSLEEP #undef HAVE_CLOCK_NANOSLEEP
@ -389,9 +383,6 @@
/* Define to 1 if you have the `gethostid' function. */ /* Define to 1 if you have the `gethostid' function. */
#undef HAVE_GETHOSTID #undef HAVE_GETHOSTID
/* gethrtime */
#undef HAVE_GETHRTIME
/* Have getifaddrs */ /* Have getifaddrs */
#undef HAVE_GETIFADDRS #undef HAVE_GETIFADDRS
@ -542,9 +533,6 @@
/* Define to 1 if you have the <machine/endian.h> header file. */ /* Define to 1 if you have the <machine/endian.h> header file. */
#undef HAVE_MACHINE_ENDIAN_H #undef HAVE_MACHINE_ENDIAN_H
/* mach_absolute_time */
#undef HAVE_MACH_ABSOLUTE_TIME
/* Define to 1 if you have the `madvise' function. */ /* Define to 1 if you have the `madvise' function. */
#undef HAVE_MADVISE #undef HAVE_MADVISE
@ -669,9 +657,6 @@
/* Define to 1 if you have the `readv' function. */ /* Define to 1 if you have the `readv' function. */
#undef HAVE_READV #undef HAVE_READV
/* read_real_time */
#undef HAVE_READ_REAL_TIME
/* Define to 1 if you have the `remap_file_pages' function. */ /* Define to 1 if you have the `remap_file_pages' function. */
#undef HAVE_REMAP_FILE_PAGES #undef HAVE_REMAP_FILE_PAGES

2
configure.REMOVED.git-id
View File

@ -1 +1 @@
076c7f7ea710f371f2b456306d293464fb64345c 8a49b44278fc8f5f287833024b38e31783fab28b

2
configure.ac.REMOVED.git-id
View File

@ -1 +1 @@
3dfc7bdce20df1f718af232b5a9e164e9cbc125c c67a9efcce1d756bd7755aae18cce1416c49542d

2
mcs/build/common/Consts.cs
View File

@ -34,7 +34,7 @@ static class Consts
// Use these assembly version constants to make code more maintainable. // Use these assembly version constants to make code more maintainable.
// //
public const string MonoVersion = "5.10.1.2"; public const string MonoVersion = "5.10.1.4";
public const string MonoCompany = "Mono development team"; public const string MonoCompany = "Mono development team";
public const string MonoProduct = "Mono Common Language Infrastructure"; public const string MonoProduct = "Mono Common Language Infrastructure";
public const string MonoCopyright = "(c) Various Mono authors"; public const string MonoCopyright = "(c) Various Mono authors";

2
mcs/class/lib/monolite-darwin/1051000003/Mono.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
782ff3108fa8594e8f79418d1c0a5493c1f41b9e 632ffa63e9d733d1fa7e85288e669c7f3c0a961a

2
mcs/class/lib/monolite-darwin/1051000003/System.Configuration.dll.REMOVED.git-id
View File

@ -1 +1 @@
397304064b2cf8faea733540adc178294323fa7c 74210b34f12491fef9f55d7f8c9ed8fc29d01a37

2
mcs/class/lib/monolite-darwin/1051000003/System.Numerics.dll.REMOVED.git-id
View File

@ -1 +1 @@
a55d25fffd32c53abee6c9c5f1754b59e2bbe3ea 82f130c85c572806b2dfd30c0406a671d5821476

2
mcs/class/lib/monolite-darwin/1051000003/System.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
b13ba9b6351fc5188afd7b6f83a6a9c0a4844730 c5c35be810d44e629cfde3a5bb1a7f349529711d

2
mcs/class/lib/monolite-darwin/1051000003/System.Xml.dll.REMOVED.git-id
View File

@ -1 +1 @@
00489f90d93ff78c4a085a84390061140e81a9af c16b35960e6d2f8cf7297971db20ee4d6505166b

2
mcs/class/lib/monolite-darwin/1051000003/mcs.exe.REMOVED.git-id
View File

@ -1 +1 @@
a43fee480db4e61c27d272bea6ba535d161d1cc2 aad7272a54bf569f27d3bc8484f8656d648a1111

2
mcs/class/lib/monolite-darwin/1051000003/mscorlib.dll.REMOVED.git-id
View File

@ -1 +1 @@
fe973d5afdbe89f4e0d1767946f3fb69d9f2eb6f 5a49425c0eec7a0194b51366746eed914c57f302

2
mcs/class/lib/monolite-linux/1051000003/Mono.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
782ff3108fa8594e8f79418d1c0a5493c1f41b9e 632ffa63e9d733d1fa7e85288e669c7f3c0a961a

2
mcs/class/lib/monolite-linux/1051000003/System.Configuration.dll.REMOVED.git-id
View File

@ -1 +1 @@
397304064b2cf8faea733540adc178294323fa7c 74210b34f12491fef9f55d7f8c9ed8fc29d01a37

2
mcs/class/lib/monolite-linux/1051000003/System.Numerics.dll.REMOVED.git-id
View File

@ -1 +1 @@
a55d25fffd32c53abee6c9c5f1754b59e2bbe3ea 82f130c85c572806b2dfd30c0406a671d5821476

2
mcs/class/lib/monolite-linux/1051000003/System.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
b13ba9b6351fc5188afd7b6f83a6a9c0a4844730 c5c35be810d44e629cfde3a5bb1a7f349529711d

2
mcs/class/lib/monolite-linux/1051000003/System.Xml.dll.REMOVED.git-id
View File

@ -1 +1 @@
00489f90d93ff78c4a085a84390061140e81a9af c16b35960e6d2f8cf7297971db20ee4d6505166b

2
mcs/class/lib/monolite-linux/1051000003/mcs.exe.REMOVED.git-id
View File

@ -1 +1 @@
a43fee480db4e61c27d272bea6ba535d161d1cc2 aad7272a54bf569f27d3bc8484f8656d648a1111

2
mcs/class/lib/monolite-linux/1051000003/mscorlib.dll.REMOVED.git-id
View File

@ -1 +1 @@
fe973d5afdbe89f4e0d1767946f3fb69d9f2eb6f 5a49425c0eec7a0194b51366746eed914c57f302

2
mcs/class/lib/monolite-win32/1051000003/Mono.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
782ff3108fa8594e8f79418d1c0a5493c1f41b9e 632ffa63e9d733d1fa7e85288e669c7f3c0a961a

2
mcs/class/lib/monolite-win32/1051000003/System.Configuration.dll.REMOVED.git-id
View File

@ -1 +1 @@
397304064b2cf8faea733540adc178294323fa7c 74210b34f12491fef9f55d7f8c9ed8fc29d01a37

2
mcs/class/lib/monolite-win32/1051000003/System.Numerics.dll.REMOVED.git-id
View File

@ -1 +1 @@
a55d25fffd32c53abee6c9c5f1754b59e2bbe3ea 82f130c85c572806b2dfd30c0406a671d5821476

2
mcs/class/lib/monolite-win32/1051000003/System.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
b13ba9b6351fc5188afd7b6f83a6a9c0a4844730 c5c35be810d44e629cfde3a5bb1a7f349529711d

2
mcs/class/lib/monolite-win32/1051000003/System.Xml.dll.REMOVED.git-id
View File

@ -1 +1 @@
00489f90d93ff78c4a085a84390061140e81a9af c16b35960e6d2f8cf7297971db20ee4d6505166b

2
mcs/class/lib/monolite-win32/1051000003/mcs.exe.REMOVED.git-id
View File

@ -1 +1 @@
a43fee480db4e61c27d272bea6ba535d161d1cc2 aad7272a54bf569f27d3bc8484f8656d648a1111

2
mcs/class/lib/monolite-win32/1051000003/mscorlib.dll.REMOVED.git-id
View File

@ -1 +1 @@
fe973d5afdbe89f4e0d1767946f3fb69d9f2eb6f 5a49425c0eec7a0194b51366746eed914c57f302

2
mono/mini/version.h
View File

@ -1 +1 @@
#define FULL_VERSION "explicit/225ba3e" #define FULL_VERSION "explicit/47631c3"

8
mono/sgen/sgen-memory-governor.c
View File

@ -23,7 +23,13 @@
#include "mono/sgen/sgen-workers.h" #include "mono/sgen/sgen-workers.h"
#include "mono/sgen/sgen-client.h" #include "mono/sgen/sgen-client.h"
#define MIN_MINOR_COLLECTION_ALLOWANCE ((mword)(SGEN_DEFAULT_NURSERY_SIZE * default_allowance_nursery_size_ratio)) /*
* The allowance we are targeting is a third of the current heap size. Still, we
* allow the heap to grow at least 4 times the nursery size before triggering a
* major, to reduce unnecessary collections. We make sure we don't set the minimum
* allowance too high when using a soft heap limit.
*/
#define MIN_MINOR_COLLECTION_ALLOWANCE (MIN(((mword)(sgen_nursery_size * default_allowance_nursery_size_ratio)), (soft_heap_limit * SGEN_DEFAULT_ALLOWANCE_HEAP_SIZE_RATIO)))
static SgenPointerQueue log_entries = SGEN_POINTER_QUEUE_INIT (INTERNAL_MEM_TEMPORARY); static SgenPointerQueue log_entries = SGEN_POINTER_QUEUE_INIT (INTERNAL_MEM_TEMPORARY);
static mono_mutex_t log_entries_mutex; static mono_mutex_t log_entries_mutex;

68
mono/utils/mono-time.c
View File

@ -9,7 +9,6 @@
#include <config.h> #include <config.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <errno.h>
#ifdef HAVE_SYS_TIME_H #ifdef HAVE_SYS_TIME_H
#include <sys/time.h> #include <sys/time.h>
@ -20,18 +19,6 @@
#define MTICKS_PER_SEC (10 * 1000 * 1000) #define MTICKS_PER_SEC (10 * 1000 * 1000)
typedef enum _TimeConversionConstants
{
tccSecondsToMillieSeconds = 1000, // 10^3
tccSecondsToMicroSeconds = 1000000, // 10^6
tccSecondsToNanoSeconds = 1000000000, // 10^9
tccMillieSecondsToMicroSeconds = 1000, // 10^3
tccMillieSecondsToNanoSeconds = 1000000, // 10^6
tccMicroSecondsToNanoSeconds = 1000, // 10^3
tccSecondsTo100NanoSeconds = 10000000, // 10^7
tccMicroSecondsTo100NanoSeconds = 10 // 10^1
} TimeConversionConstants;
gint64 gint64
mono_msec_ticks (void) mono_msec_ticks (void)
{ {
@ -139,57 +126,16 @@ get_boot_time (void)
} }
/* Returns the number of milliseconds from boot time: this should be monotonic */ /* Returns the number of milliseconds from boot time: this should be monotonic */
/* Adapted from CoreCLR: https://github.com/dotnet/coreclr/blob/66d2738ea96fcce753dec1370e79a0c78f7b6adb/src/pal/src/misc/time.cpp */
gint64 gint64
mono_msec_boottime (void) mono_msec_boottime (void)
{ {
gint64 retval = 0; static gint64 boot_time = 0;
gint64 now;
#if HAVE_CLOCK_MONOTONIC_COARSE || HAVE_CLOCK_MONOTONIC if (!boot_time)
clockid_t clockType = boot_time = get_boot_time ();
#if HAVE_CLOCK_MONOTONIC_COARSE now = mono_100ns_datetime ();
CLOCK_MONOTONIC_COARSE; /* good enough resolution, fastest speed */ /*printf ("now: %llu (boot: %llu) ticks: %llu\n", (gint64)now, (gint64)boot_time, (gint64)(now - boot_time));*/
#else return (now - boot_time)/10000;
CLOCK_MONOTONIC;
#endif
struct timespec ts;
if (clock_gettime (clockType, &ts) != 0) {
g_error ("clock_gettime(CLOCK_MONOTONIC*) failed; errno is %d", errno, strerror (errno));
goto exit;
}
retval = (ts.tv_sec * tccSecondsToMillieSeconds) + (ts.tv_nsec / tccMillieSecondsToNanoSeconds);
#elif HAVE_MACH_ABSOLUTE_TIME
/* use denom == 0 to indicate that s_TimebaseInfo is uninitialised. */
if (s_TimebaseInfo.denom == 0) {
g_error ("s_TimebaseInfo is uninitialized.");
goto exit;
}
retval = (mach_absolute_time () * s_TimebaseInfo.numer / s_TimebaseInfo.denom) / tccMillieSecondsToNanoSeconds;
#elif HAVE_GETHRTIME
retval = (gint64)(gethrtime () / tccMillieSecondsToNanoSeconds);
#elif HAVE_READ_REAL_TIME
timebasestruct_t tb;
read_real_time (&tb, TIMEBASE_SZ);
if (time_base_to_time (&tb, TIMEBASE_SZ) != 0) {
g_error ("time_base_to_time() failed; errno is %d (%s)", errno, strerror (errno));
goto exit;
}
retval = (tb.tb_high * tccSecondsToMillieSeconds) + (tb.tb_low / tccMillieSecondsToNanoSeconds);
#else
struct timeval tv;
if (gettimeofday (&tv, NULL) == -1) {
g_error ("gettimeofday() failed; errno is %d (%s)", errno, strerror (errno));
goto exit;
}
retval = (tv.tv_sec * tccSecondsToMillieSeconds) + (tv.tv_usec / tccMillieSecondsToMicroSeconds);
#endif /* HAVE_CLOCK_MONOTONIC */
exit:
return retval;
} }
/* Returns the number of 100ns ticks from unspecified time: this should be monotonic */ /* Returns the number of 100ns ticks from unspecified time: this should be monotonic */

BIN
po/mcs/de.gmo
View File

Binary file not shown.

2
po/mcs/de.po.REMOVED.git-id
View File

@ -1 +1 @@
6cf6f2210ec4a21fd2ee54151620ab5755280e16 8e7491b65992cbfc838b99016086596f2525e087

BIN
po/mcs/es.gmo
View File

Binary file not shown.

2
po/mcs/es.po.REMOVED.git-id
View File

@ -1 +1 @@
bdc5472e5725fbd40711d72a9b664e5511b4c9d4 21324a200c24c7bb0a359b587188fdd41862c93d

BIN
po/mcs/ja.gmo
View File

Binary file not shown.

2
po/mcs/ja.po.REMOVED.git-id
View File

@ -1 +1 @@
3c687d35289e5d749f66884ff92d3f0ade36db0d 7a339f2c16e1288f7b2b1da34fea9c2c657d9676

4
po/mcs/mcs.pot
View File

@ -6,9 +6,9 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: mono 5.10.1.2\n" "Project-Id-Version: mono 5.10.1.4\n"
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
"POT-Creation-Date: 2018-03-20 08:32+0000\n" "POT-Creation-Date: 2018-03-21 08:45+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"

BIN
po/mcs/pt_BR.gmo
View File

Binary file not shown.

2
po/mcs/pt_BR.po.REMOVED.git-id
View File

@ -1 +1 @@
130a38c1cd091db0a16920934c97c2bd25620cb7 00910a452b11f7bda00762ecf15da1aaacd3631b