Imported Upstream version 5.10.0.178
Former-commit-id: dab1362055e98f3d44b4a3a3961552eb6791ada9
This commit is contained in:
parent
a9f14082a2
commit
0eb07a23ab
15
config.h.in
15
config.h.in
@ -219,6 +219,12 @@
|
||||
/* Use classic Windows API 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. */
|
||||
#undef HAVE_CLOCK_NANOSLEEP
|
||||
|
||||
@ -383,6 +389,9 @@
|
||||
/* Define to 1 if you have the `gethostid' function. */
|
||||
#undef HAVE_GETHOSTID
|
||||
|
||||
/* gethrtime */
|
||||
#undef HAVE_GETHRTIME
|
||||
|
||||
/* Have getifaddrs */
|
||||
#undef HAVE_GETIFADDRS
|
||||
|
||||
@ -533,6 +542,9 @@
|
||||
/* Define to 1 if you have the <machine/endian.h> header file. */
|
||||
#undef HAVE_MACHINE_ENDIAN_H
|
||||
|
||||
/* mach_absolute_time */
|
||||
#undef HAVE_MACH_ABSOLUTE_TIME
|
||||
|
||||
/* Define to 1 if you have the `madvise' function. */
|
||||
#undef HAVE_MADVISE
|
||||
|
||||
@ -657,6 +669,9 @@
|
||||
/* Define to 1 if you have the `readv' function. */
|
||||
#undef HAVE_READV
|
||||
|
||||
/* read_real_time */
|
||||
#undef HAVE_READ_REAL_TIME
|
||||
|
||||
/* Define to 1 if you have the `remap_file_pages' function. */
|
||||
#undef HAVE_REMAP_FILE_PAGES
|
||||
|
||||
|
@ -1 +1 @@
|
||||
9774f14a084c7940953e8aa66678e69a2f477362
|
||||
65c2b7afb2139236b5a126aef6305884e188c3fa
|
@ -1 +1 @@
|
||||
957cb149fe4cc671a3dc90079b0db6edbe6c323c
|
||||
b7e93aad1f52da63e7269ccaa0e73d452eff9124
|
@ -34,7 +34,7 @@ static class Consts
|
||||
// Use these assembly version constants to make code more maintainable.
|
||||
//
|
||||
|
||||
public const string MonoVersion = "5.10.0.176";
|
||||
public const string MonoVersion = "5.10.0.178";
|
||||
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 @@
|
||||
06926744392e85001870650a3a257006a0e76492
|
||||
9847362daff6478b1edf20438f9b2a8bfc900583
|
@ -1 +1 @@
|
||||
d3f4cd77dc60ca7c340191278359f61b823c8607
|
||||
f9feb988dc0a4d8c01ace8978dd6a30127f1a6fa
|
@ -1 +1 @@
|
||||
982f8c43712ec5333cc3acb603344267a51b8d1d
|
||||
5debb727a120862b6c76cda3a9a16e1f8361d9d4
|
@ -1 +1 @@
|
||||
896a1e419453152496e2d64acce1175ce2897a2a
|
||||
ee4a72daf6c384947b1274da57d0ef971ed4a550
|
@ -1 +1 @@
|
||||
0394570fb69b53a0aa3eea23e6b750f5b746024e
|
||||
e0556af7c76bba7d4b418d710858aaa21ae1643e
|
@ -1 +1 @@
|
||||
b9a5181cb8d8405bb006a98f4d5497fef0aedf21
|
||||
2e7a08ba7258340ed503ab6dde8a74952e161525
|
@ -1 +1 @@
|
||||
18fec44a585ccb0719117b956086dfe7fb9177b8
|
||||
01589d9c2ce85ea1d816ff6911422c3db7c9653d
|
@ -1 +1 @@
|
||||
06926744392e85001870650a3a257006a0e76492
|
||||
9847362daff6478b1edf20438f9b2a8bfc900583
|
@ -1 +1 @@
|
||||
d3f4cd77dc60ca7c340191278359f61b823c8607
|
||||
f9feb988dc0a4d8c01ace8978dd6a30127f1a6fa
|
@ -1 +1 @@
|
||||
982f8c43712ec5333cc3acb603344267a51b8d1d
|
||||
5debb727a120862b6c76cda3a9a16e1f8361d9d4
|
@ -1 +1 @@
|
||||
896a1e419453152496e2d64acce1175ce2897a2a
|
||||
ee4a72daf6c384947b1274da57d0ef971ed4a550
|
@ -1 +1 @@
|
||||
0394570fb69b53a0aa3eea23e6b750f5b746024e
|
||||
e0556af7c76bba7d4b418d710858aaa21ae1643e
|
@ -1 +1 @@
|
||||
b9a5181cb8d8405bb006a98f4d5497fef0aedf21
|
||||
2e7a08ba7258340ed503ab6dde8a74952e161525
|
@ -1 +1 @@
|
||||
18fec44a585ccb0719117b956086dfe7fb9177b8
|
||||
01589d9c2ce85ea1d816ff6911422c3db7c9653d
|
@ -1 +1 @@
|
||||
06926744392e85001870650a3a257006a0e76492
|
||||
9847362daff6478b1edf20438f9b2a8bfc900583
|
@ -1 +1 @@
|
||||
d3f4cd77dc60ca7c340191278359f61b823c8607
|
||||
f9feb988dc0a4d8c01ace8978dd6a30127f1a6fa
|
@ -1 +1 @@
|
||||
982f8c43712ec5333cc3acb603344267a51b8d1d
|
||||
5debb727a120862b6c76cda3a9a16e1f8361d9d4
|
@ -1 +1 @@
|
||||
896a1e419453152496e2d64acce1175ce2897a2a
|
||||
ee4a72daf6c384947b1274da57d0ef971ed4a550
|
@ -1 +1 @@
|
||||
0394570fb69b53a0aa3eea23e6b750f5b746024e
|
||||
e0556af7c76bba7d4b418d710858aaa21ae1643e
|
@ -1 +1 @@
|
||||
b9a5181cb8d8405bb006a98f4d5497fef0aedf21
|
||||
2e7a08ba7258340ed503ab6dde8a74952e161525
|
@ -1 +1 @@
|
||||
18fec44a585ccb0719117b956086dfe7fb9177b8
|
||||
01589d9c2ce85ea1d816ff6911422c3db7c9653d
|
@ -1 +1 @@
|
||||
#define FULL_VERSION "explicit/a7adb18"
|
||||
#define FULL_VERSION "explicit/3141c94"
|
||||
|
@ -9,6 +9,7 @@
|
||||
#include <config.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <errno.h>
|
||||
|
||||
#ifdef HAVE_SYS_TIME_H
|
||||
#include <sys/time.h>
|
||||
@ -19,6 +20,18 @@
|
||||
|
||||
#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
|
||||
mono_msec_ticks (void)
|
||||
{
|
||||
@ -126,16 +139,57 @@ get_boot_time (void)
|
||||
}
|
||||
|
||||
/* 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
|
||||
mono_msec_boottime (void)
|
||||
{
|
||||
static gint64 boot_time = 0;
|
||||
gint64 now;
|
||||
if (!boot_time)
|
||||
boot_time = get_boot_time ();
|
||||
now = mono_100ns_datetime ();
|
||||
/*printf ("now: %llu (boot: %llu) ticks: %llu\n", (gint64)now, (gint64)boot_time, (gint64)(now - boot_time));*/
|
||||
return (now - boot_time)/10000;
|
||||
gint64 retval = 0;
|
||||
|
||||
#if HAVE_CLOCK_MONOTONIC_COARSE || HAVE_CLOCK_MONOTONIC
|
||||
clockid_t clockType =
|
||||
#if HAVE_CLOCK_MONOTONIC_COARSE
|
||||
CLOCK_MONOTONIC_COARSE; /* good enough resolution, fastest speed */
|
||||
#else
|
||||
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 */
|
||||
|
BIN
po/mcs/de.gmo
BIN
po/mcs/de.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
4e01d91e31b437a394eff1fcf5560b63f28e1728
|
||||
415567d8b8d880910bf879ed4d437261a8264987
|
BIN
po/mcs/es.gmo
BIN
po/mcs/es.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
4cd17e5bac01af45159832ee36a0119dc40fcbb9
|
||||
7b55088d4248431c71c41a19998d69b0c3bf28e9
|
BIN
po/mcs/ja.gmo
BIN
po/mcs/ja.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
affe3ef0e44a1f27bf8e8744ac6a7ec2e4f9a996
|
||||
e50455f7dac884489db10347574917ac31c716fd
|
@ -6,9 +6,9 @@
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: mono 5.10.0.176\n"
|
||||
"Project-Id-Version: mono 5.10.0.178\n"
|
||||
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
|
||||
"POT-Creation-Date: 2018-03-15 08:27+0000\n"
|
||||
"POT-Creation-Date: 2018-03-16 08:19+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 @@
|
||||
58f992293a2875916343fc7faea707a922268cf8
|
||||
e59fb7a28535f32301788a51fb23af424b26e115
|
Loading…
x
Reference in New Issue
Block a user