mirror of
https://github.com/BepInEx/mono.git
synced 2026-11-15 17:10:51 -10:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
57239e923f | ||
|
|
1fb43ec60d | ||
|
|
e7d4a0e1f7 | ||
|
|
d90075ff7c | ||
|
|
e5de7dacf9 | ||
|
|
abd2d39d6b | ||
|
|
f1a9bc25a1 | ||
|
|
1418f0d58b | ||
|
|
aaf9d40318 | ||
|
|
37ff0bcb9d | ||
|
|
167d1a6c19 | ||
|
|
4de1501831 | ||
|
|
1025d82b3e | ||
|
|
ed0cefd19a | ||
|
|
70c7f2ef1d | ||
|
|
fd5843e964 | ||
|
|
4d35043211 | ||
|
|
b0057f2259 | ||
|
|
3a7874cd61 | ||
|
|
57962479d7 | ||
|
|
076e44ac27 | ||
|
|
f84179d397 | ||
|
|
beabfddefb | ||
|
|
8417f42847 | ||
|
|
4ceda0772d | ||
|
|
75d5e92311 | ||
|
|
936697aa97 | ||
|
|
745a6bec4a | ||
|
|
8aaf80d011 | ||
|
|
21fb262df5 | ||
|
|
5abf30d893 | ||
|
|
ea4e4a9ef6 | ||
|
|
dc2e330a9f | ||
|
|
cfc5d4fb3d | ||
|
|
1f93e5326c | ||
|
|
ee6c6efcfc | ||
|
|
178bb86b7e | ||
|
|
727cf39986 | ||
|
|
098de0b8e8 | ||
|
|
92a45afd7b | ||
|
|
0c6932a985 | ||
|
|
ddb061f776 | ||
|
|
f7c9be4890 | ||
|
|
13aeb8836a | ||
|
|
6295559e04 | ||
|
|
025ee6399b | ||
|
|
8e88de76bb | ||
|
|
cbc43ad527 | ||
|
|
2efd64587f | ||
|
|
9e91b6687e | ||
|
|
ca55ce871f | ||
|
|
b3e3e4cc40 | ||
|
|
2d9f497748 | ||
|
|
86ccab6997 | ||
|
|
5ad055154b | ||
|
|
2247603bd8 | ||
|
|
18dc4ebcd0 | ||
|
|
2ceb6e9402 | ||
|
|
d2a26c9595 | ||
|
|
bb99b3ef99 | ||
|
|
39af47841f | ||
|
|
bb0e787f60 | ||
|
|
83832615fa | ||
|
|
6559b16c14 | ||
|
|
225848bd65 | ||
|
|
fa6194cc19 | ||
|
|
a1eb52aa13 | ||
|
|
a2ee7059d0 | ||
|
|
572f79d0f3 | ||
|
|
30223ad01d | ||
|
|
6221c90f95 | ||
|
|
27ce756030 | ||
|
|
51d1c47c8b | ||
|
|
57ae95d7aa | ||
|
|
810e4a15dd | ||
|
|
ed6183c2b9 | ||
|
|
cd39375a39 | ||
|
|
87c125c435 | ||
|
|
07959b40bb | ||
|
|
94dcde7291 | ||
|
|
b59125ca81 | ||
|
|
6c37483822 | ||
|
|
616ea50718 | ||
|
|
1a8bdd5aff | ||
|
|
6d88df8d82 | ||
|
|
6ca11b76d6 | ||
|
|
6400a71595 | ||
|
|
a12daa47e0 | ||
|
|
90ca313240 | ||
|
|
505695fcd1 | ||
|
|
3298fe7f21 | ||
|
|
17d4227002 | ||
|
|
85a3e77247 | ||
|
|
71c58f8fb0 | ||
|
|
08559f8a29 | ||
|
|
af2b3eb197 | ||
|
|
4aa28ede12 | ||
|
|
67f753a893 | ||
|
|
492438a431 | ||
|
|
bebd8dc438 | ||
|
|
13d0bab910 | ||
|
|
f892c7c574 | ||
|
|
5e6e6df993 | ||
|
|
5d69157964 | ||
|
|
fd185fb454 | ||
|
|
a8c53ebf16 | ||
|
|
f068fb6b66 | ||
|
|
1db2001526 | ||
|
|
7ccddf9832 | ||
|
|
52d9a55a86 | ||
|
|
80165d2117 | ||
|
|
8724ace98a | ||
|
|
4ea3122758 | ||
|
|
0c9eb70a46 | ||
|
|
ff285585d4 | ||
|
|
14867dbabe | ||
|
|
27b67e3586 | ||
|
|
e693ce5077 | ||
|
|
606677431a | ||
|
|
271c88f8a8 | ||
|
|
506d5d4049 | ||
|
|
6bb78cace3 | ||
|
|
5348325a64 | ||
|
|
d181fe7194 | ||
|
|
26eacdc3dc | ||
|
|
87d8bdef08 | ||
|
|
04b6339bd1 | ||
|
|
c7b19b52fd | ||
|
|
5b2437d62f | ||
|
|
3ea09f9c8f | ||
|
|
abd1bd5d8f | ||
|
|
86968831ec | ||
|
|
af835fc6de | ||
|
|
ab5220be93 | ||
|
|
32801300d1 | ||
|
|
1ec9117f63 | ||
|
|
adc4d3c471 | ||
|
|
0279b08ccb | ||
|
|
2602f25eb7 | ||
|
|
de3fa74e12 | ||
|
|
522c8b69f5 | ||
|
|
f8a1ab5d75 | ||
|
|
6f43750475 | ||
|
|
e0e341c7d1 | ||
|
|
b0be338837 | ||
|
|
9df453295e | ||
|
|
e40724e169 | ||
|
|
310be7a2fb | ||
|
|
824b01d4fc | ||
|
|
fec0e65560 | ||
|
|
55293097e1 | ||
|
|
d1aa491294 | ||
|
|
32a5d1fc3b | ||
|
|
18f2255ecd | ||
|
|
f44ff23078 | ||
|
|
c738a606d2 | ||
|
|
983b5a8cbe | ||
|
|
21192c8424 | ||
|
|
7ed46ff6e1 | ||
|
|
d2b64bb5cf | ||
|
|
3454feb426 | ||
|
|
5acc6be700 | ||
|
|
3e514ce907 | ||
|
|
1f85a462e9 | ||
|
|
51c97ade65 | ||
|
|
c2f95645ca | ||
|
|
3611e8ec48 | ||
|
|
6344d4be9f | ||
|
|
1334748e5a | ||
|
|
b5d64ebd0a | ||
|
|
ef29b9fbfa | ||
|
|
7ee123b1e2 | ||
|
|
5831edbc3f | ||
|
|
68f5463685 | ||
|
|
f4346ebc54 | ||
|
|
4cf3f02cac | ||
|
|
afa9a853fb | ||
|
|
10ba222234 | ||
|
|
ccd373f429 | ||
|
|
bdfa3ef2ca | ||
|
|
9aaa0083d0 | ||
|
|
333c6665a2 | ||
|
|
1ebb4e4cbd | ||
|
|
1448821251 | ||
|
|
37ddfb1da4 | ||
|
|
ce31c277fb | ||
|
|
38d0080cf5 | ||
|
|
a08574bf9e | ||
|
|
3765f987d5 | ||
|
|
523e9ff615 | ||
|
|
8da9924557 | ||
|
|
fbb36d5500 | ||
|
|
bcd8b38b57 | ||
|
|
a308a7cd22 | ||
|
|
7ef2b4f919 | ||
|
|
33db577741 | ||
|
|
1fc8f5631c | ||
|
|
c4c6a9373d | ||
|
|
1520a7aaba | ||
|
|
533bcc0c49 | ||
|
|
26cad094ee | ||
|
|
bee68ad79f | ||
|
|
b5d36a9abb | ||
|
|
ca7b288837 | ||
|
|
f99700a264 | ||
|
|
df203f3532 | ||
|
|
f98b92ea6c | ||
|
|
dbaab5d01a | ||
|
|
e5207856a0 | ||
|
|
1aef35403d | ||
|
|
68130ebec9 | ||
|
|
9e469d7b9e | ||
|
|
d421ee95b0 | ||
|
|
6fc58f529b | ||
|
|
5c06650885 | ||
|
|
77a8ed1b39 | ||
|
|
cf39a9cd43 | ||
|
|
7e220bf4ff | ||
|
|
d4bd4f0091 | ||
|
|
afd9c96b3f | ||
|
|
6c6ab73705 | ||
|
|
aaceb6f0cf | ||
|
|
cfa6ff88d1 | ||
|
|
ff3a3a6fad | ||
|
|
9285e189c1 | ||
|
|
5a0573df99 | ||
|
|
c329548380 | ||
|
|
9549385e47 | ||
|
|
3f899a3198 | ||
|
|
dd15ef7b68 | ||
|
|
a427893839 | ||
|
|
866ad511fe | ||
|
|
86f8dd621a | ||
|
|
daa673f978 | ||
|
|
a21319d1ca | ||
|
|
cfe36830d4 | ||
|
|
831381caa9 | ||
|
|
e33294bf22 | ||
|
|
762ac3d618 | ||
|
|
259afc7850 | ||
|
|
c238778b63 | ||
|
|
4a054b40ae | ||
|
|
be684e09b4 | ||
|
|
3830eca92c | ||
|
|
aa59a09fd7 | ||
|
|
e600333511 | ||
|
|
581b46d90d | ||
|
|
17af65a784 | ||
|
|
5ebdc64ef8 | ||
|
|
6f740b5bc3 | ||
|
|
cfe5263372 | ||
|
|
c23173ee4b | ||
|
|
7c284c8c2b | ||
|
|
acf546b1ba | ||
|
|
89fa700441 | ||
|
|
2e68bc17e3 | ||
|
|
f97b7bd2a2 | ||
|
|
7f28de8559 | ||
|
|
3307394dba | ||
|
|
fb4877a8d7 | ||
|
|
d31ccce651 | ||
|
|
348ec2cf7a | ||
|
|
b85f34d763 | ||
|
|
466c00b8f0 | ||
|
|
a0bf70a140 | ||
|
|
d720e3368c | ||
|
|
1ebd866eaa | ||
|
|
39d1e1889f | ||
|
|
5f0dd2998d | ||
|
|
87714d8a45 | ||
|
|
258efac3c6 | ||
|
|
1a4ce67a49 | ||
|
|
e68c3b8027 | ||
|
|
2640a8d862 | ||
|
|
aa8605d0eb | ||
|
|
4b9d0677c9 | ||
|
|
6ccea37726 | ||
|
|
56d5fce7f4 | ||
|
|
00f7811683 | ||
|
|
c5b00568ba | ||
|
|
27bf99ebed | ||
|
|
2015a4ab21 | ||
|
|
2eb33cebf5 | ||
|
|
ccda92d896 | ||
|
|
69f8abf794 | ||
|
|
a4d6fccef9 | ||
|
|
c98b69bc05 | ||
|
|
382a9b3679 | ||
|
|
bd9b4e9b24 | ||
|
|
eab4b7e67b | ||
|
|
b9e7bcabe4 | ||
|
|
e6e0331cde | ||
|
|
540ef7fb38 | ||
|
|
76e9739a43 | ||
|
|
e1b061052d | ||
|
|
5f26cd5416 | ||
|
|
db758b9f85 | ||
|
|
1890aa6ec3 | ||
|
|
a497e40075 | ||
|
|
d8dab47fd0 | ||
|
|
60d58d9128 | ||
|
|
a5fcc9413d | ||
|
|
1d1069575d | ||
|
|
57d7457da5 | ||
|
|
128e454ad2 | ||
|
|
61f32e7f14 | ||
|
|
74695b9d03 | ||
|
|
f8a969aae9 | ||
|
|
417389513f | ||
|
|
e871e6f844 | ||
|
|
a3e6b2cd8b | ||
|
|
310192e3cb | ||
|
|
468339deb6 | ||
|
|
826558a4af | ||
|
|
334d05b1e7 | ||
|
|
dd0eab4247 | ||
|
|
8a1db7bb93 | ||
|
|
64d523c524 | ||
|
|
6b1529a15c | ||
|
|
8a10c623f3 | ||
|
|
fc53acc968 | ||
|
|
edffe785ba | ||
|
|
850f2df48b | ||
|
|
5e3ffa5a51 | ||
|
|
230a43461c | ||
|
|
501e77f912 | ||
|
|
fe06971e14 | ||
|
|
e686d39489 | ||
|
|
b1000f0b2e | ||
|
|
1f0ad125dd | ||
|
|
d87817c174 | ||
|
|
51125153e5 | ||
|
|
d4f922abce | ||
|
|
7ca4c72cc8 | ||
|
|
2e78636ac7 | ||
|
|
0ddf58fe64 | ||
|
|
6baf669349 | ||
|
|
522d027663 | ||
|
|
dc58d950f2 | ||
|
|
83f74c4123 | ||
|
|
fff41905e9 | ||
|
|
44a2d35676 | ||
|
|
1d6a8ed6ea | ||
|
|
4ede66b950 | ||
|
|
2b84f5bc33 | ||
|
|
42311595ae | ||
|
|
0526617e0a | ||
|
|
9b63661c15 | ||
|
|
a46742dcb6 | ||
|
|
a4f960311e | ||
|
|
c64f332016 | ||
|
|
6320fcb16b | ||
|
|
21d5c9c346 | ||
|
|
d0b0e2b880 | ||
|
|
ff0a6e77ff | ||
|
|
e2340cd101 | ||
|
|
bfa744e645 | ||
|
|
9c412c0b91 | ||
|
|
11ec98cacd | ||
|
|
23058b943f | ||
|
|
65b981632c | ||
|
|
6544bcfda8 | ||
|
|
2251178eac | ||
|
|
7daf4b739e | ||
|
|
bd9fa57b81 | ||
|
|
68bff52cae | ||
|
|
8873c44400 | ||
|
|
b603482343 | ||
|
|
d30c17f44e | ||
|
|
2ca4575eeb | ||
|
|
51b93b6c23 | ||
|
|
ed9fb93c62 | ||
|
|
5ea6b70ca1 | ||
|
|
7d1644d234 | ||
|
|
010fce60af | ||
|
|
c3667fa861 | ||
|
|
8716b46c87 | ||
|
|
cfdbdfc9eb | ||
|
|
077582d3f9 | ||
|
|
db51810499 | ||
|
|
5e23a773b4 | ||
|
|
1ca679877e | ||
|
|
9cb34c2a76 | ||
|
|
03c7f4f63b | ||
|
|
869a2b0121 | ||
|
|
0e409c5558 | ||
|
|
010fcfb9ec | ||
|
|
045232ef52 | ||
|
|
a560146b7c | ||
|
|
b64dd253b6 | ||
|
|
75343422a5 | ||
|
|
02db562b69 | ||
|
|
1b35e551d5 | ||
|
|
65b5d9b115 | ||
|
|
76f0a58429 | ||
|
|
572e868f97 | ||
|
|
313d06b169 | ||
|
|
74524d8b92 | ||
|
|
5b88ecbe0b | ||
|
|
a17afc056b | ||
|
|
d5eb1e5aed | ||
|
|
74c86ff4cc | ||
|
|
4ad2d48197 | ||
|
|
cbf2e5be18 | ||
|
|
135e4ddf27 | ||
|
|
6d298d47f9 | ||
|
|
a75c5db541 | ||
|
|
34a4ffcc45 | ||
|
|
798a08c1f1 | ||
|
|
cbd180afe6 | ||
|
|
c4aa50d2e1 | ||
|
|
84fe1a5774 | ||
|
|
819026f391 | ||
|
|
45e66c5362 | ||
|
|
cef99c3837 | ||
|
|
f7e0f70b7d | ||
|
|
feb90c6d43 | ||
|
|
b1b5ab0524 | ||
|
|
fd201644a0 | ||
|
|
97e9bbae7e | ||
|
|
d466cb5fa5 | ||
|
|
828d2adff9 | ||
|
|
37fe83f6ea | ||
|
|
e06781fb7a | ||
|
|
1782b291f8 | ||
|
|
7b51e84dc5 | ||
|
|
0f00eb3e59 | ||
|
|
2769d84822 | ||
|
|
966d8f2a57 | ||
|
|
b3901be2f6 | ||
|
|
ee90fc601e | ||
|
|
621faafcaf | ||
|
|
4e72eaacaa | ||
|
|
3a0d3e1169 | ||
|
|
da76a7b803 | ||
|
|
a7c31c9805 | ||
|
|
73f3ee63cc | ||
|
|
5c7f10154f | ||
|
|
992525a6df | ||
|
|
76e2c3227f | ||
|
|
5b4ccf033f | ||
|
|
071c3f5697 | ||
|
|
9a08e45324 | ||
|
|
574f482506 | ||
|
|
500eec69c7 | ||
|
|
5d50b36c5f | ||
|
|
89ceb247c4 | ||
|
|
2d57bab36b | ||
|
|
ed0b9b227b | ||
|
|
0cac21043d | ||
|
|
44b7efbee0 | ||
|
|
0a0da6cbe1 | ||
|
|
310b69ce3d | ||
|
|
0a3a12b9aa | ||
|
|
30f9a22f08 | ||
|
|
93e74ce434 | ||
|
|
f48e4357c9 | ||
|
|
a377fa737c | ||
|
|
aa7df40d0c | ||
|
|
414e98156a | ||
|
|
565d626c05 | ||
|
|
31ec985a6f | ||
|
|
b9b72e5947 | ||
|
|
b4b33c06e6 | ||
|
|
091181ba1d | ||
|
|
1516837c58 | ||
|
|
48d1ebf570 | ||
|
|
5e5e381907 | ||
|
|
11917e41a8 | ||
|
|
b79a891772 | ||
|
|
8884492839 | ||
|
|
eec0a66009 | ||
|
|
e05343ddf5 | ||
|
|
45f1fb7d50 | ||
|
|
414b5fc644 | ||
|
|
0fd8ecd055 | ||
|
|
28a16d28a0 | ||
|
|
32eb3111ee |
No files matched your search
@@ -26,9 +26,6 @@
|
||||
[submodule "external/nuget-buildtasks"]
|
||||
path = external/nuget-buildtasks
|
||||
url = git://github.com/mono/NuGet.BuildTasks
|
||||
[submodule "external/buildtools"]
|
||||
path = external/buildtools
|
||||
url = git://github.com/mono/buildtools.git
|
||||
[submodule "external/cecil-legacy"]
|
||||
path = external/cecil-legacy
|
||||
url = git://github.com/mono/cecil.git
|
||||
|
||||
@@ -44,6 +44,26 @@ namespace Mono.Profiling.Tests.Stress {
|
||||
|
||||
static class Program {
|
||||
|
||||
static readonly string[] _options = new [] {
|
||||
"domain",
|
||||
"assembly",
|
||||
"module",
|
||||
"class",
|
||||
"jit",
|
||||
"exception",
|
||||
"gcalloc",
|
||||
"gc",
|
||||
"thread",
|
||||
// "calls", // Way too heavy.
|
||||
"monitor",
|
||||
"gcmove",
|
||||
"gcroot",
|
||||
"context",
|
||||
"finalization",
|
||||
"counter",
|
||||
"gchandle",
|
||||
};
|
||||
|
||||
static readonly TimeSpan _timeout = TimeSpan.FromHours (6);
|
||||
|
||||
static string FilterInvalidXmlChars (string text) {
|
||||
@@ -75,14 +95,22 @@ namespace Mono.Profiling.Tests.Stress {
|
||||
for (var i = 0; i < benchmarks.Length; i++) {
|
||||
var bench = benchmarks [i];
|
||||
|
||||
var sampleFreq = rand.Next (0, 1001);
|
||||
var sampleFreq = rand.Next (-1000, 1001);
|
||||
var sampleMode = rand.Next (0, 2) == 1 ? "real" : "process";
|
||||
var maxSamples = rand.Next (0, cpus * 2000 + 1);
|
||||
var heapShotFreq = rand.Next (0, 11);
|
||||
var heapShotFreq = rand.Next (-10, 11);
|
||||
var maxFrames = rand.Next (0, 33);
|
||||
var allocMode = rand.Next (0, 2) == 1 ? "alloc" : "noalloc";
|
||||
var options = _options.ToDictionary (x => x, _ => rand.Next (0, 2) == 1)
|
||||
.Select (x => (x.Value ? string.Empty : "no") + x.Key)
|
||||
.ToArray ();
|
||||
|
||||
var profOptions = $"sample=cycles/{sampleFreq},sampling-{sampleMode},maxsamples={maxSamples},heapshot={heapShotFreq}gc,maxframes={maxFrames},{allocMode},output=/dev/null";
|
||||
var profOptions = $"maxframes={maxFrames},{string.Join (",", options)},output=/dev/null";
|
||||
|
||||
if (sampleFreq > 0)
|
||||
profOptions += $",sample={sampleFreq},sampling-{sampleMode},maxsamples={maxSamples}";
|
||||
|
||||
if (heapShotFreq > 0)
|
||||
profOptions += $",heapshot={heapShotFreq}gc";
|
||||
|
||||
var info = new ProcessStartInfo {
|
||||
UseShellExecute = false,
|
||||
|
||||
+36
-110
@@ -1,7 +1,7 @@
|
||||
# Process this file with autoconf to produce a configure script.
|
||||
#AC_PREREQ([2.62])
|
||||
|
||||
AC_INIT(mono, [5.3.0],
|
||||
AC_INIT(mono, [5.5.0],
|
||||
[http://bugzilla.xamarin.com/enter_bug.cgi?classification=Mono])
|
||||
|
||||
AC_CONFIG_SRCDIR([README.md])
|
||||
@@ -264,17 +264,8 @@ case "$host" in
|
||||
with_sgen_default_concurrent=yes
|
||||
;;
|
||||
*-*-nacl*)
|
||||
CPPFLAGS="$CPPFLAGS -DGC_LINUX_THREADS -D_GNU_SOURCE -D_REENTRANT -DUSE_MMAP"
|
||||
if test "x$disable_munmap" != "xyes"; then
|
||||
CPPFLAGS="$CPPFLAGS -DUSE_MUNMAP"
|
||||
fi
|
||||
libmono_cflags="-D_REENTRANT"
|
||||
libdl=
|
||||
libgc_threads=pthreads
|
||||
use_sigposix=yes
|
||||
ikvm_native=no
|
||||
AC_DEFINE(DISABLE_SOCKETS,1,[Disable sockets support])
|
||||
AC_DEFINE(DISABLE_ATTACH, 1, [Disable agent attach support])
|
||||
echo "nacl no longer supported."
|
||||
exit 1
|
||||
;;
|
||||
*-*-hpux*)
|
||||
CPPFLAGS="$CPPFLAGS -DGC_HPUX_THREADS -D_HPUX_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_REENTRANT"
|
||||
@@ -743,10 +734,6 @@ fi
|
||||
|
||||
AM_CONDITIONAL(DISABLE_LIBRARIES, test x$enable_libraries = xno)
|
||||
|
||||
case $host in
|
||||
*nacl* ) with_shared_mono=yes;;
|
||||
esac
|
||||
|
||||
if test "x$host_win32" = "xyes"; then
|
||||
# Boehm GC requires the runtime to be in its own dll
|
||||
with_static_mono=no
|
||||
@@ -825,7 +812,8 @@ AC_ARG_WITH(xammac, [ --with-xammac=yes,no If you w
|
||||
AC_ARG_WITH(testing_aot_hybrid, [ --with-testing_aot_hybrid=yes,no If you want to build the testing_aot_hybrid assemblies (defaults to no)], [], [with_testing_aot_hybrid=default])
|
||||
AC_ARG_WITH(testing_aot_full, [ --with-testing_aot_full=yes,no If you want to build the testing_aot_full assemblies (defaults to no)], [], [with_testing_aot_full=default])
|
||||
AC_ARG_WITH(winaot, [ --with-winaot=yes,no If you want to build the Windows friendly AOT assemblies (defaults to no)], [], [with_winaot=default])
|
||||
AC_ARG_WITH(orbis, [ --with-orbis=yes,no If you want to build the Orbis assemblies (defaults to no)], [], [with_orbis=default])
|
||||
AC_ARG_WITH(orbis, [ --with-orbis=yes,no If you want to build the Orbis assemblies (defaults to no)], [], [with_orbis=default])
|
||||
AC_ARG_WITH(unreal, [ --with-unreal=yes,no If you want to build the Unreal assemblies (defaults to no)], [], [with_unreal=default])
|
||||
|
||||
|
||||
AC_ARG_WITH(runtime_preset, [ --with-runtime_preset=net_4_x,all,aot,hybridaot,fullaot,bitcode Which default profile to build (defaults to net_4_x)], [], [with_runtime_preset=net_4_x])
|
||||
@@ -846,6 +834,7 @@ with_testing_aot_hybrid_default=no
|
||||
with_testing_aot_full_default=no
|
||||
with_winaot_default=no
|
||||
with_orbis_default=no
|
||||
with_unreal_default=no
|
||||
|
||||
with_bitcode_default=no
|
||||
with_cooperative_gc_default=no
|
||||
@@ -865,6 +854,7 @@ elif test x$with_runtime_preset = xall; then
|
||||
with_xammac_default=yes
|
||||
with_winaot_default=yes
|
||||
with_orbis_default=yes
|
||||
with_unreal_default=yes
|
||||
elif test x$with_runtime_preset = xfullaot; then
|
||||
DISABLE_MCS_DOCS_default=yes
|
||||
with_testing_aot_full_default=yes
|
||||
@@ -935,6 +925,17 @@ elif test x$with_runtime_preset = xorbis; then
|
||||
|
||||
AOT_BUILD_FLAGS="--runtime=mobile --aot=full,$INVARIANT_AOT_OPTIONS"
|
||||
AOT_RUN_FLAGS="--runtime=mobile --full-aot"
|
||||
elif test x$with_runtime_preset = xunreal; then
|
||||
DISABLE_MCS_DOCS_default=yes
|
||||
with_unreal_default=yes
|
||||
TEST_PROFILE=ounreal
|
||||
|
||||
mono_feature_disable_com='yes'
|
||||
mono_feature_disable_remoting='yes'
|
||||
mono_feature_disable_appdomains='yes'
|
||||
|
||||
AOT_BUILD_FLAGS="--runtime=mobile --aot=hybrid,$INVARIANT_AOT_OPTIONS"
|
||||
AOT_RUN_FLAGS="--runtime=mobile --hybrid-aot"
|
||||
else
|
||||
with_profile4_x_default=yes
|
||||
fi
|
||||
@@ -981,6 +982,9 @@ fi
|
||||
if test "x$with_orbis" = "xdefault"; then
|
||||
with_orbis=$with_orbis_default
|
||||
fi
|
||||
if test "x$with_unreal" = "xdefault"; then
|
||||
with_unreal=$with_unreal_default
|
||||
fi
|
||||
|
||||
|
||||
AM_CONDITIONAL(INSTALL_4_x, [test "x$with_profile4_x" = "xyes"])
|
||||
@@ -994,8 +998,9 @@ AM_CONDITIONAL(INSTALL_TESTING_AOT_HYBRID, [test "x$with_testing_aot_hybrid" !=
|
||||
AM_CONDITIONAL(INSTALL_TESTING_AOT_FULL, [test "x$with_testing_aot_full" != "xno"])
|
||||
AM_CONDITIONAL(INSTALL_WINAOT, [test "x$with_winaot" != "xno"])
|
||||
AM_CONDITIONAL(INSTALL_ORBIS, [test "x$with_orbis" != "xno"])
|
||||
AM_CONDITIONAL(INSTALL_UNREAL, [test "x$with_unreal" != "xno"])
|
||||
AM_CONDITIONAL(FULL_AOT_TESTS, [test "x$TEST_PROFILE" = "xtesting_aot_full"] || [test "x$TEST_PROFILE" = "xwinaot"] || [test "x$TEST_PROFILE" = "xorbis"])
|
||||
AM_CONDITIONAL(HYBRID_AOT_TESTS, [test "x$TEST_PROFILE" = "xtesting_aot_hybrid"])
|
||||
AM_CONDITIONAL(HYBRID_AOT_TESTS, [test "x$TEST_PROFILE" = "xtesting_aot_hybrid"] || [test "x$TEST_PROFILE" = "xunreal"])
|
||||
|
||||
default_profile=net_4_x
|
||||
if test -z "$INSTALL_MONODROID_TRUE"; then :
|
||||
@@ -1019,6 +1024,9 @@ fi
|
||||
if test -z "$INSTALL_ORBIS_TRUE"; then :
|
||||
default_profile=orbis
|
||||
fi
|
||||
if test -z "$INSTALL_UNREAL_TRUE"; then :
|
||||
default_profile=unreal
|
||||
fi
|
||||
if test -z "$INSTALL_4_x_TRUE"; then :
|
||||
default_profile=net_4_x
|
||||
fi
|
||||
@@ -1275,7 +1283,7 @@ dnl
|
||||
dnl Boehm GC configuration
|
||||
dnl
|
||||
|
||||
AC_ARG_WITH(libgc, [ --with-libgc=included,none Controls the Boehm GC config, default=included],[libgc=$with_gc],[libgc=included])
|
||||
AC_ARG_WITH(libgc, [ --with-libgc=included,none Controls the Boehm GC config, default=included],[libgc=$with_libgc],[libgc=included])
|
||||
|
||||
AC_ARG_ENABLE(boehm, [ --disable-boehm Disable the Boehm GC.], support_boehm=$enableval,support_boehm=${support_boehm:-yes})
|
||||
AM_CONDITIONAL(SUPPORT_BOEHM, test x$support_boehm = xyes)
|
||||
@@ -1333,7 +1341,7 @@ if test "x$support_boehm" = "xyes"; then
|
||||
gc_msg="none"
|
||||
;;
|
||||
*)
|
||||
AC_MSG_ERROR([Invalid argument to --with-libgc.])
|
||||
AC_MSG_ERROR([Invalid argument $libgc to --with-libgc.])
|
||||
;;
|
||||
esac
|
||||
|
||||
@@ -1349,6 +1357,7 @@ if test "x$support_boehm" = "xyes"; then
|
||||
AC_SUBST(BOEHM_DEFINES)
|
||||
|
||||
fi
|
||||
AM_CONDITIONAL(SUPPORT_NULLGC, test "x$libgc" = "xnone")
|
||||
|
||||
dnl
|
||||
dnl End of Boehm GC Configuration
|
||||
@@ -1371,8 +1380,6 @@ AC_TRY_COMPILE([
|
||||
AC_DEFINE_UNQUOTED(MONO_ZERO_LEN_ARRAY, 1, [Length of zero length arrays])
|
||||
])
|
||||
|
||||
AC_CHECK_HEADERS(nacl/nacl_dyncode.h)
|
||||
|
||||
dnl ***********************************
|
||||
dnl *** Checks for signals
|
||||
dnl ***********************************
|
||||
@@ -1949,7 +1956,7 @@ if test x$host_win32 = xno; then
|
||||
AC_CHECK_HEADERS(pthread.h)
|
||||
AC_CHECK_HEADERS(pthread_np.h)
|
||||
AC_CHECK_FUNCS(pthread_mutex_timedlock)
|
||||
AC_CHECK_FUNCS(pthread_getattr_np pthread_attr_get_np pthread_setname_np)
|
||||
AC_CHECK_FUNCS(pthread_getattr_np pthread_attr_get_np pthread_setname_np pthread_cond_timedwait_relative_np)
|
||||
AC_CHECK_FUNCS(pthread_kill)
|
||||
AC_MSG_CHECKING(for PTHREAD_MUTEX_RECURSIVE)
|
||||
AC_TRY_COMPILE([ #include <pthread.h>], [
|
||||
@@ -2220,13 +2227,11 @@ if test x$host_win32 = xno; then
|
||||
dnl **********************************
|
||||
dnl *** epoll ***
|
||||
dnl **********************************
|
||||
if test "x$ac_cv_header_nacl_nacl_dyncode_h" = "xno"; then
|
||||
AC_CHECK_HEADERS(sys/epoll.h)
|
||||
haveepoll=no
|
||||
AC_CHECK_FUNCS(epoll_ctl, [haveepoll=yes], )
|
||||
if test "x$haveepoll" = "xyes" -a "x$ac_cv_header_sys_epoll_h" = "xyes"; then
|
||||
AC_DEFINE(HAVE_EPOLL, 1, [epoll supported])
|
||||
fi
|
||||
AC_CHECK_HEADERS(sys/epoll.h)
|
||||
haveepoll=no
|
||||
AC_CHECK_FUNCS(epoll_ctl, [haveepoll=yes], )
|
||||
if test "x$haveepoll" = "xyes" -a "x$ac_cv_header_sys_epoll_h" = "xyes"; then
|
||||
AC_DEFINE(HAVE_EPOLL, 1, [epoll supported])
|
||||
fi
|
||||
|
||||
havekqueue=no
|
||||
@@ -2859,40 +2864,6 @@ fi
|
||||
AM_CONDITIONAL(ENABLE_DTRACE, [test x$enable_dtrace = xyes])
|
||||
AM_CONDITIONAL(DTRACE_G_REQUIRED, [test x$dtrace_g = xyes])
|
||||
|
||||
dnl **************
|
||||
dnl *** NaCl ***
|
||||
dnl **************
|
||||
|
||||
AC_ARG_ENABLE(nacl_codegen, [ --enable-nacl-codegen Enable Native Client code generation], enable_nacl_codegen=$enableval, enable_nacl_codegen=no)
|
||||
AC_ARG_ENABLE(nacl_gc, [ --enable-nacl-gc Enable Native Client garbage collection], enable_nacl_gc=$enableval, enable_nacl_gc=no)
|
||||
|
||||
AM_CONDITIONAL(NACL_CODEGEN, test x$enable_nacl_codegen != xno)
|
||||
|
||||
dnl
|
||||
dnl Hack to use system mono for operations in build/install not allowed in NaCl.
|
||||
dnl
|
||||
nacl_self_host=""
|
||||
if test "x$ac_cv_header_nacl_nacl_dyncode_h" = "xyes"; then
|
||||
nacl_self_host="nacl_self_host"
|
||||
fi
|
||||
AC_SUBST(nacl_self_host)
|
||||
|
||||
if test "x$enable_nacl_codegen" = "xyes"; then
|
||||
MONO_NACL_ALIGN_MASK_OFF=1
|
||||
AC_DEFINE(TARGET_NACL, 1, [...])
|
||||
AC_DEFINE(__native_client_codegen__, 1, [...])
|
||||
fi
|
||||
if test "x$enable_nacl_gc" = "xyes"; then
|
||||
if test "x$TARGET" = "xAMD64" -o "x$TARGET" = "xX86"; then
|
||||
INSTRUMENT_CFLAG="-finstrument-for-thread-suspension"
|
||||
else
|
||||
# Not yet implemented
|
||||
INSTRUMENT_CFLAG=""
|
||||
fi
|
||||
CPPFLAGS="$CPPFLAGS $INSTRUMENT_CFLAG -D__native_client_gc__"
|
||||
fi
|
||||
AC_SUBST(MONO_NACL_ALIGN_MASK_OFF)
|
||||
|
||||
dnl **************************
|
||||
dnl *** AOT cross offsets ***
|
||||
dnl **************************
|
||||
@@ -3155,12 +3126,6 @@ case "$host" in
|
||||
mingw*)
|
||||
;;
|
||||
esac
|
||||
case "$host" in
|
||||
x86_64-*-nacl*)
|
||||
AC_DEFINE(__mono_ilp32__, 1, [64 bit mode with 4 byte longs and pointers])
|
||||
sizeof_register=8
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
sparc*-*-*)
|
||||
if test "x$ac_cv_sizeof_void_p" = "x8"; then
|
||||
@@ -3241,13 +3206,6 @@ case "$host" in
|
||||
ACCESS_UNALIGNED="no"
|
||||
CPPFLAGS="$CPPFLAGS -D__ARM_EABI__"
|
||||
;;
|
||||
# TODO: make proper support for NaCl host.
|
||||
# arm*-*nacl)
|
||||
# TARGET=ARM;
|
||||
# arch_target=arm;
|
||||
# ACCESS_UNALIGNED="no"
|
||||
# AOT_SUPPORTED="no"
|
||||
# ;;
|
||||
aarch64-*)
|
||||
# https://lkml.org/lkml/2012/7/15/133
|
||||
TARGET=ARM64
|
||||
@@ -3308,38 +3266,6 @@ if test "x$host" != "x$target"; then
|
||||
sizeof_register=8
|
||||
target_byte_order=G_BIG_ENDIAN
|
||||
;;
|
||||
x86_64-*-nacl)
|
||||
TARGET=AMD64
|
||||
arch_target=amd64
|
||||
AC_DEFINE(TARGET_AMD64, 1, [...])
|
||||
AC_DEFINE(__mono_ilp32__, 1, [64 bit mode with 4 byte longs and pointers])
|
||||
sizeof_register=8
|
||||
;;
|
||||
# TODO: make proper support for NaCl target.
|
||||
# arm*-*nacl)
|
||||
# TARGET=ARM
|
||||
# arch_target=arm
|
||||
# AC_DEFINE(TARGET_ARM, 1, [...])
|
||||
# ACCESS_UNALIGNED="no"
|
||||
# sizeof_register=4
|
||||
# CPPFLAGS="$CPPFLAGS \
|
||||
# -D__ARM_EABI__ \
|
||||
# -D__arm__ \
|
||||
# -D__portable_native_client__ \
|
||||
# -Dtimezone=_timezone \
|
||||
# -DDISABLE_SOCKETS \
|
||||
# -DDISABLE_ATTACH \
|
||||
# -DUSE_NEWLIB"
|
||||
# Can't use tls, since it depends on the runtime detection of tls offsets
|
||||
# in mono-compiler.h
|
||||
# with_tls=pthread
|
||||
# ;;
|
||||
i686-*-nacl)
|
||||
TARGET=X86
|
||||
arch_target=x86
|
||||
AC_DEFINE(TARGET_X86, 1, [...])
|
||||
sizeof_register=4
|
||||
;;
|
||||
arm*-linux-*)
|
||||
TARGET=ARM;
|
||||
arch_target=arm;
|
||||
@@ -3630,7 +3556,6 @@ fi
|
||||
|
||||
AM_CONDITIONAL(ENABLE_INTERPRETER, [test x$enable_interpreter = xyes])
|
||||
|
||||
|
||||
dnl
|
||||
dnl Simple Generational checks (sgen)
|
||||
dnl
|
||||
@@ -4653,6 +4578,7 @@ echo "
|
||||
Xamarin.Mac: $with_xammac
|
||||
Windows AOT: $with_winaot
|
||||
Orbis: $with_orbis
|
||||
Unreal: $with_unreal
|
||||
Test profiles: AOT Full ($with_testing_aot_full), AOT Hybrid ($with_testing_aot_hybrid)
|
||||
JNI support: $jdk_headers_found
|
||||
libgdiplus: $libgdiplus_msg
|
||||
|
||||
+1
-1
@@ -141,7 +141,7 @@ AC_CHECK_SIZEOF(int)
|
||||
AC_CHECK_SIZEOF(void *)
|
||||
AC_CHECK_SIZEOF(long)
|
||||
AC_CHECK_SIZEOF(long long)
|
||||
AC_CHECK_FUNCS(strlcpy stpcpy strtok_r rewinddir vasprintf)
|
||||
AC_CHECK_FUNCS(strlcpy stpcpy strtok_r rewinddir vasprintf strerror_r)
|
||||
AC_CHECK_FUNCS(getrlimit)
|
||||
AC_CHECK_FUNCS(fork execv execve)
|
||||
|
||||
|
||||
@@ -32,7 +32,7 @@ typedef signed @GSIZE@ gssize;
|
||||
#define G_HAVE_ISO_VARARGS
|
||||
#endif
|
||||
|
||||
#if defined (__native_client__) || defined (HOST_WATCHOS)
|
||||
#if defined (HOST_WATCHOS)
|
||||
#undef G_BREAKPOINT
|
||||
#define G_BREAKPOINT()
|
||||
#endif
|
||||
|
||||
@@ -154,15 +154,6 @@ g_file_open_tmp (const gchar *tmpl, gchar **name_used, GError **error)
|
||||
gchar *
|
||||
g_get_current_dir (void)
|
||||
{
|
||||
#ifdef __native_client__
|
||||
char *buffer;
|
||||
if ((buffer = g_getenv("NACL_PWD"))) {
|
||||
buffer = g_strdup(buffer);
|
||||
} else {
|
||||
buffer = g_strdup(".");
|
||||
}
|
||||
return buffer;
|
||||
#else
|
||||
int s = 32;
|
||||
char *buffer = NULL, *r;
|
||||
gboolean fail;
|
||||
@@ -181,5 +172,4 @@ g_get_current_dir (void)
|
||||
* so we return the buffer here since it has a pointer to the valid string
|
||||
*/
|
||||
return buffer;
|
||||
#endif
|
||||
}
|
||||
@@ -14,6 +14,7 @@
|
||||
#endif
|
||||
|
||||
#include <stdint.h>
|
||||
#include <inttypes.h>
|
||||
|
||||
#include <eglib-config.h>
|
||||
#ifndef EGLIB_NO_REMAP
|
||||
|
||||
+69
-1
@@ -32,6 +32,12 @@
|
||||
#include <ctype.h>
|
||||
#include <glib.h>
|
||||
|
||||
#ifndef G_OS_WIN32
|
||||
#include <pthread.h>
|
||||
#endif
|
||||
|
||||
#include <errno.h>
|
||||
|
||||
/*
|
||||
* g_strndup and g_vasprintf need to allocate memory with g_malloc if
|
||||
* ENABLE_OVERRIDABLE_ALLOCATORS is defined so that it can be safely freed with g_free
|
||||
@@ -191,10 +197,72 @@ g_strdup_printf (const gchar *format, ...)
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
Max error number we support. It's empirically found by looking at our target OS.
|
||||
|
||||
Last this was checked was June-2017.
|
||||
|
||||
Apple is at 106.
|
||||
Android is at 133.
|
||||
*/
|
||||
#define MONO_ERRNO_MAX 200
|
||||
#define str(s) #s
|
||||
|
||||
#ifndef G_OS_WIN32
|
||||
static pthread_mutex_t strerror_lock = PTHREAD_MUTEX_INITIALIZER;
|
||||
#endif
|
||||
|
||||
static char *error_messages [MONO_ERRNO_MAX];
|
||||
|
||||
const gchar *
|
||||
g_strerror (gint errnum)
|
||||
{
|
||||
return strerror (errnum);
|
||||
if (errnum < 0)
|
||||
errnum = -errnum;
|
||||
if (errnum >= MONO_ERRNO_MAX)
|
||||
return ("Error number higher than " str (MONO_ERRNO_MAX));
|
||||
|
||||
if (!error_messages [errnum]) {
|
||||
#ifndef G_OS_WIN32
|
||||
pthread_mutex_lock (&strerror_lock);
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_STRERROR_R
|
||||
char tmp_buff [128]; //Quite arbitrary, should be large enough
|
||||
char *buff = tmp_buff;
|
||||
int buff_len = sizeof (tmp_buff);
|
||||
int r;
|
||||
buff [0] = 0;
|
||||
|
||||
while ((r = strerror_r (errnum, buff, buff_len - 1))) {
|
||||
if (r != ERANGE) {
|
||||
buff = g_strdup_printf ("Invalid Error code '%d'", errnum);
|
||||
break;
|
||||
}
|
||||
if (buff == tmp_buff)
|
||||
buff = g_malloc (buff_len * 2);
|
||||
else
|
||||
buff = g_realloc (buff, buff_len * 2);
|
||||
buff_len *= 2;
|
||||
//Spec is not clean on whether size argument includes space for null terminator or not
|
||||
}
|
||||
if (!error_messages [errnum])
|
||||
error_messages [errnum] = g_strdup (buff);
|
||||
if (buff != tmp_buff)
|
||||
g_free (buff);
|
||||
#else
|
||||
if (!error_messages [errnum])
|
||||
error_messages [errnum] = g_strdup_printf ("Error code '%d'", errnum);
|
||||
#endif
|
||||
|
||||
|
||||
#ifndef G_OS_WIN32
|
||||
pthread_mutex_unlock (&strerror_lock);
|
||||
#endif
|
||||
|
||||
}
|
||||
return error_messages [errnum];
|
||||
}
|
||||
|
||||
gchar *
|
||||
|
||||
Vendored
+1
-1
Submodule external/api-snapshot updated: 366b5e92d7...1cd7cc5a14.
Vendored
+1
-1
Submodule external/bockbuild updated: c783777342...4ae08e8dd6.
Vendored
-1
Submodule external/buildtools deleted from b5cc6e6ab5.
Vendored
+1
-1
Submodule external/cecil updated: 0b523fa7e0...c76ba7b410.
Vendored
+1
-1
Submodule external/corefx updated: 5b7e0d739f...7e70a4e923.
Vendored
+1
-1
Submodule external/corert updated: 814f76de6a...48dba73801.
Vendored
+1
-1
Submodule external/ikdasm updated: 88b67c42ca...1d7d436037.
Vendored
+1
-1
Submodule external/roslyn-binaries updated: 98069dbb17...dcb0a0534d.
Vendored
+1
-1
Submodule external/xunit-binaries updated: b8e20d265b...d4433b0972.
+29
-13
@@ -181,6 +181,16 @@ Gives the path for the temporary LLVM bitcode file created during AOT.
|
||||
.I info
|
||||
Print the architecture the AOT in this copy of Mono targets and quit.
|
||||
.TP
|
||||
.I interp
|
||||
Generates all required wrappers, so that it is possible to run --interpreter without
|
||||
any code generation at runtime. This option only makes sense with \fBmscorlib.dll\fR.
|
||||
Embedders can set
|
||||
|
||||
.nf
|
||||
mono_jit_set_aot_mode (MONO_AOT_MODE_INTERP);
|
||||
.fi
|
||||
.ne
|
||||
.TP
|
||||
.I ld-flags
|
||||
Additional flags to pass to the C linker (if the current AOT mode calls for invoking it).
|
||||
.TP
|
||||
@@ -290,7 +300,7 @@ mono_aot_register_module (mono_aot_module_hello_info);
|
||||
.I stats
|
||||
Print various stats collected during AOT compilation.
|
||||
.TP
|
||||
.I temp_path=[path]
|
||||
.I temp-path=[path]
|
||||
Explicitly specify path to store temporary files created during AOT compilation.
|
||||
.TP
|
||||
.I threads=[number]
|
||||
@@ -1091,11 +1101,6 @@ code generation backend. For example \fBLLVM_COUNT=10\fR would only
|
||||
compile 10 methods with LLVM and then switch to the Mono JIT engine.
|
||||
\fBLLVM_COUNT=0\fR would disable the LLVM engine altogether.
|
||||
.TP
|
||||
\fBMONO_AOT_CACHE\fR
|
||||
If set, this variable will instruct Mono to ahead-of-time compile new
|
||||
assemblies on demand and store the result into a cache in
|
||||
~/.mono/aot-cache.
|
||||
.TP
|
||||
\fBMONO_ASPNET_INHIBIT_SETTINGSMAP\fR
|
||||
Mono contains a feature which allows modifying settings in the .config files shipped
|
||||
with Mono by using config section mappers. The mappers and the mapping rules are
|
||||
@@ -1304,10 +1309,19 @@ first generation (of two). A larger nursery will usually speed up the
|
||||
program but will obviously use more memory. The default nursery size
|
||||
4 MB.
|
||||
.TP
|
||||
\fBmajor=\fIcollector\fR Specifies which major collector to use.
|
||||
Options are `marksweep' for the Mark&Sweep collector, and
|
||||
`marksweep-conc' for concurrent Mark&Sweep. The non-concurrent
|
||||
Mark&Sweep collector is the default.
|
||||
\fBmajor=\fIcollector\fR
|
||||
Specifies which major collector to use.
|
||||
Options are `marksweep' for the Mark&Sweep collector, `marksweep-conc'
|
||||
for concurrent Mark&Sweep and `marksweep-conc-par' for parallel and
|
||||
concurrent Mark&Sweep. The concurrent Mark&Sweep collector is the default.
|
||||
.TP
|
||||
\fBmode=balanced|throughput|pause\fR[:\fImax-pause\fR]
|
||||
Specifies what should be the garbage collector's target. The `throughput'
|
||||
mode aims to reduce time spent in the garbage collector and improve
|
||||
application speed, the `pause' mode aims to keep pause times to a minimum
|
||||
and it receives the argument \fImax-pause\fR which specifies the maximum
|
||||
pause time in milliseconds that is acceptable and the `balanced' mode
|
||||
which is a general purpose optimal mode.
|
||||
.TP
|
||||
\fBsoft-heap-limit=\fIsize\fR
|
||||
Once the heap size gets larger than this size, ignore what the default
|
||||
@@ -1370,9 +1384,11 @@ more memory when it reaches a stable size.
|
||||
This option is EXPERIMENTAL, so it might disappear in later versions of mono.
|
||||
.TP
|
||||
\fBminor=\fIminor-collector\fR
|
||||
Specifies which minor collector to use. Options are 'simple' which
|
||||
promotes all objects from the nursery directly to the old generation
|
||||
and 'split' which lets object stay longer on the nursery before promoting.
|
||||
Specifies which minor collector to use. Options are `simple' which
|
||||
promotes all objects from the nursery directly to the old generation,
|
||||
`simple-par' which has same promotion behavior as `simple' but using
|
||||
multiple workers and `split' which lets objects stay longer on the nursery
|
||||
before promoting.
|
||||
.TP
|
||||
\fBalloc-ratio=\fIratio\fR
|
||||
Specifies the ratio of memory from the nursery to be use by the alloc space.
|
||||
|
||||
+3
-1
@@ -23,6 +23,7 @@ xbuild_12_SUBDIRS := build class tools/xbuild
|
||||
xbuild_14_SUBDIRS := build class tools/xbuild
|
||||
winaot_SUBDIRS := build class
|
||||
orbis_SUBDIRS := build class
|
||||
unreal_SUBDIRS := build class
|
||||
|
||||
include build/rules.make
|
||||
|
||||
@@ -77,6 +78,7 @@ $(_boot_:%=profile-do--testing_aot_hybrid--%): profile-do--testing_aot_hy
|
||||
$(_boot_:%=profile-do--testing_aot_full--%): profile-do--testing_aot_full--%: profile-do--build--%
|
||||
$(_boot_:%=profile-do--winaot--%): profile-do--winaot--%: profile-do--build--%
|
||||
$(_boot_:%=profile-do--orbis--%): profile-do--orbis--%: profile-do--build--%
|
||||
$(_boot_:%=profile-do--unreal--%): profile-do--unreal--%: profile-do--build--%
|
||||
$(_boot_:%=profile-do--build--%): profile-do--build--%: profile-do--basic--%
|
||||
|
||||
testcorlib:
|
||||
@@ -142,7 +144,7 @@ distcheck: dist-tarball
|
||||
MONO_API_SNAPSHOT_PATH := $(topdir)../external/api-snapshot/
|
||||
GENAPI := $(MONO_API_SNAPSHOT_PATH)tools/genapi/GenAPI.exe
|
||||
MONO_API_SNAPSHOT_PROFILE_PATH := $(MONO_API_SNAPSHOT_PATH)profiles/$(PROFILE)/
|
||||
MONO_API_ASSEMBLIES_IGNORED := $(addprefix $(topdir)class/lib/$(PROFILE)/, Mono.CSharp.dll SystemWebTestShim.dll standalone-runner-support.dll nunit.core.dll nunit.core.extensions.dll nunit.core.interfaces.dll nunit.framework.dll nunit.framework.extensions.dll nunit.mocks.dll nunit.util.dll nunit-console-runner.dll nunitlite.dll)
|
||||
MONO_API_ASSEMBLIES_IGNORED := $(addprefix $(topdir)class/lib/$(PROFILE)/, Mono.CSharp.dll SystemWebTestShim.dll standalone-runner-support.dll nunit.core.dll nunit.core.extensions.dll nunit.core.interfaces.dll nunit.framework.dll nunit.framework.extensions.dll nunit.mocks.dll nunit.util.dll nunit-console-runner.dll nunitlite.dll Mono.Profiler.Log.dll)
|
||||
MONO_API_ASSEMBLIES := $(filter-out $(MONO_API_ASSEMBLIES_IGNORED), $(wildcard $(topdir)class/lib/$(PROFILE)/*.dll)) $(wildcard $(topdir)class/lib/$(PROFILE)/Facades/*.dll)
|
||||
MONO_API_ASSEMBLIES_CS := $(MONO_API_ASSEMBLIES:$(topdir)class/lib/$(PROFILE)/%.dll=$(MONO_API_SNAPSHOT_PROFILE_PATH)%.cs)
|
||||
|
||||
|
||||
@@ -40,7 +40,14 @@ class X {
|
||||
if (!Version.TryParse (field.GetValue (null) as string, out version))
|
||||
return 4;
|
||||
|
||||
if (version < new Version (4, 9))
|
||||
Version min_mono_version;
|
||||
#if __MonoCS__
|
||||
min_mono_version = new Version (5, 4);
|
||||
#else
|
||||
min_mono_version = new Version (4, 9);
|
||||
#endif
|
||||
|
||||
if (version < min_mono_version)
|
||||
return 5;
|
||||
|
||||
return 0;
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
#! -*- makefile -*-
|
||||
|
||||
BOOTSTRAP_PROFILE = build
|
||||
|
||||
BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_CSC)
|
||||
MCS = $(BOOTSTRAP_MCS)
|
||||
|
||||
profile-check:
|
||||
@:
|
||||
|
||||
DEFAULT_REFERENCES = -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll
|
||||
|
||||
PROFILE_MCS_FLAGS = \
|
||||
-d:NET_1_1 \
|
||||
-d:NET_2_0 \
|
||||
-d:NET_2_1 \
|
||||
-d:MOBILE \
|
||||
-d:MOBILE_DYNAMIC \
|
||||
-d:NET_3_5 \
|
||||
-d:NET_4_0 \
|
||||
-d:NET_4_5 \
|
||||
-d:MONO \
|
||||
-nowarn:1699 \
|
||||
-nostdlib \
|
||||
$(DEFAULT_REFERENCES) \
|
||||
$(PLATFORM_DEBUG_FLAGS)
|
||||
|
||||
FRAMEWORK_VERSION = 2.1
|
||||
|
||||
NO_INSTALL = yes
|
||||
MOBILE_DYNAMIC = yes
|
||||
MOBILE_PROFILE = yes
|
||||
NO_CONSOLE = yes
|
||||
@@ -20,9 +20,10 @@ TEST_RUNTIME_WRAPPERS_PATH = $(shell dirname $(RUNTIME))/_tmpinst/bin
|
||||
ifndef NO_TEST
|
||||
|
||||
test_nunit_lib = nunitlite.dll
|
||||
xunit_core := xunit.core xunit.abstractions xunit.assert
|
||||
xunit_core := xunit.core xunit.abstractions xunit.assert Xunit.NetCore.Extensions
|
||||
xunit_deps := System.Runtime
|
||||
xunit_class_deps := Xunit.NetCore.Extensions
|
||||
xunit_src := $(patsubst %,$(topdir)/../external/xunit-binaries/%,BenchmarkAttribute.cs BenchmarkDiscover.cs)
|
||||
xunit_class_deps :=
|
||||
|
||||
xunit_libs_ref = $(patsubst %,-r:$(topdir)/../external/xunit-binaries/%.dll,$(xunit_core))
|
||||
xunit_libs_ref += $(patsubst %,-r:$(topdir)/class/lib/$(PROFILE)/Facades/%.dll,$(xunit_deps))
|
||||
@@ -89,9 +90,6 @@ endif
|
||||
|
||||
tests_CLEAN_FILES += $(topdir)/build/deps/nunit-$(PROFILE).stamp
|
||||
|
||||
$(topdir)/class/lib/$(PROFILE)/$(PARENT_PROFILE)Xunit.NetCore.Extensions.dll:
|
||||
$(MAKE) -C $(topdir)/class/Xunit.NetCore.Extensions
|
||||
|
||||
endif
|
||||
|
||||
test_assemblies :=
|
||||
@@ -222,8 +220,8 @@ run-xunit-test-lib: xunit-test-local
|
||||
$$ok
|
||||
@rm -f xunit.execution.desktop.dll
|
||||
|
||||
$(xunit_test_lib): $(the_assembly) $(xtest_response) $(xunit_libs_dep)
|
||||
$(TEST_COMPILE) $(LIBRARY_FLAGS) $(XTEST_LIB_FLAGS) -target:library -out:$@ $(xtest_flags) @$(xtest_response)
|
||||
$(xunit_test_lib): $(the_assembly) $(xtest_response) $(xunit_libs_dep) $(xunit_src)
|
||||
$(TEST_COMPILE) $(LIBRARY_FLAGS) $(XTEST_LIB_FLAGS) -target:library -out:$@ $(xtest_flags) @$(xtest_response) $(xunit_src)
|
||||
|
||||
xtest_response_preprocessed = $(xtest_response)_preprocessed
|
||||
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
static Read() method of RelaxngPattern class:
|
||||
|
||||
RelaxngPattern pattern = RelaxngPattern.Read (
|
||||
new XmlTextReader ("relaxng.rng");
|
||||
new XmlTextReader ("relaxng.rng"));
|
||||
|
||||
You can also use RelaxngPattern class to reuse grammar instance, as
|
||||
already described (see Grammar Object Model).
|
||||
|
||||
@@ -30,6 +30,6 @@ using System.Runtime.CompilerServices;
|
||||
[assembly: AssemblyCompany ("Xamarin, Inc.")]
|
||||
[assembly: AssemblyProduct ("Mono Common Language Infrastructure")]
|
||||
[assembly: AssemblyCopyright ("Copyright (c) 2015 Xamarin Inc. (http://www.xamarin.com)")]
|
||||
[assembly: AssemblyVersion ("4.1.0.0")]
|
||||
[assembly: AssemblyVersion ("4.2.1.0")]
|
||||
[assembly: AssemblyInformationalVersion ("4.0.0.0")]
|
||||
[assembly: AssemblyFileVersion ("4.0.0.0")]
|
||||
@@ -21,39 +21,159 @@
|
||||
//
|
||||
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.DBNull))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.AcceptRejectRule))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.CommandBehavior))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.CommandType))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.CatalogLocation))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DataAdapter))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DataColumnMapping))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DataColumnMappingCollection))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DataTableMapping))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DataTableMappingCollection))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbColumn))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbCommand))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbCommandBuilder))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbConnection))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbConnectionStringBuilder))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbDataAdapter))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbDataReader))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbDataReaderExtensions))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbDataRecord))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbDataSourceEnumerator))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbEnumerator))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbException))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbMetaDataCollectionNames))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbMetaDataColumnNames))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbParameter))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbParameterCollection))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbProviderFactory))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbProviderSpecificTypePropertyAttribute))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbTransaction))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.GroupByBehavior))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.IDbColumnSchemaGenerator))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.IdentifierCase))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.RowUpdatedEventArgs))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.RowUpdatingEventArgs))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.SchemaTableColumn))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.SchemaTableOptionalColumn))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.SupportedJoinOperators))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.ConflictOption))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.ConnectionState))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Constraint))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.ConstraintCollection))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.ConstraintException))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DBConcurrencyException))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataColumn))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataColumnChangeEventArgs))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataColumnChangeEventHandler))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataColumnCollection))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataException))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataRelation))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataRelationCollection))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataRow))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataRowAction))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataRowBuilder))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataRowChangeEventArgs))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataRowChangeEventHandler))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataRowCollection))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataRowState))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataRowVersion))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataRowView))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataSet))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataSetDateTime))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataSysDescriptionAttribute))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataTable))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataTableClearEventArgs))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataTableClearEventHandler))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataTableCollection))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataTableNewRowEventArgs))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataTableNewRowEventHandler))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataTableReader))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataView))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataViewManager))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataViewRowState))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataViewSetting))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataViewSettingCollection))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DbType))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DeletedRowInaccessibleException))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DuplicateNameException))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.EvaluateException))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.FillErrorEventArgs))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.FillErrorEventHandler))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.ForeignKeyConstraint))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.IColumnMapping))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.IColumnMappingCollection))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.IDataAdapter))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.IDataParameter))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.IDataParameterCollection))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.IDataReader))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.IDataRecord))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.IDbCommand))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.IDbConnection))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.IDbDataAdapter))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.IDbDataParameter))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.IDbTransaction))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.ITableMapping))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.ITableMappingCollection))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.InRowChangingEventException))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.InternalDataCollectionBase))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.InvalidConstraintException))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.InvalidExpressionException))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.IsolationLevel))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.KeyRestrictionBehavior))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.LoadOption))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.MappingType))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.MergeFailedEventArgs))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.MergeFailedEventHandler))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.MissingMappingAction))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.MissingPrimaryKeyException))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.MissingSchemaAction))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.NoNullAllowedException))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.ParameterDirection))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.PropertyCollection))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.ReadOnlyException))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.RowNotInTableException))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Rule))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SchemaSerializationMode))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SchemaType))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SerializationFormat))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlDbType))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.INullable))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlAlreadyFilledException))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlBinary))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlBoolean))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlByte))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlBytes))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlChars))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlCompareOptions))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlDateTime))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlDecimal))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlDouble))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlGuid))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlInt16))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlInt32))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlInt64))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlMoney))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlNotFilledException))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlNullValueException))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlSingle))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlString))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlTruncateException))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlTypeException))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlXml))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.StorageState))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.StateChangeEventArgs))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.StateChangeEventHandler))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.StatementCompletedEventArgs))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.StatementCompletedEventHandler))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.StatementType))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.StrongTypingException))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SyntaxErrorException))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.UniqueConstraint))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.UpdateRowSource))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.UpdateStatus))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.VersionNotFoundException))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.XmlReadMode))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.XmlWriteMode))]
|
||||
|
||||
|
||||
@@ -30,6 +30,6 @@ using System.Runtime.CompilerServices;
|
||||
[assembly: AssemblyCompany ("Xamarin, Inc.")]
|
||||
[assembly: AssemblyProduct ("Mono Common Language Infrastructure")]
|
||||
[assembly: AssemblyCopyright ("Copyright (c) 2015 Xamarin Inc. (http://www.xamarin.com)")]
|
||||
[assembly: AssemblyVersion ("4.0.2.0")]
|
||||
[assembly: AssemblyVersion ("4.1.1.0")]
|
||||
[assembly: AssemblyInformationalVersion ("4.0.0.0")]
|
||||
[assembly: AssemblyFileVersion ("4.0.0.0")]
|
||||
@@ -22,4 +22,19 @@
|
||||
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.StackFrame))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.StackTrace))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.SymbolStore.ISymbolBinder))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.SymbolStore.ISymbolBinder1))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.SymbolStore.ISymbolDocument))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.SymbolStore.ISymbolDocumentWriter))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.SymbolStore.ISymbolMethod))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.SymbolStore.ISymbolNamespace))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.SymbolStore.ISymbolReader))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.SymbolStore.ISymbolScope))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.SymbolStore.ISymbolVariable))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.SymbolStore.ISymbolWriter))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.SymbolStore.SymAddressKind))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.SymbolStore.SymDocumentType))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.SymbolStore.SymLanguageType))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.SymbolStore.SymLanguageVendor))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.SymbolStore.SymbolToken))]
|
||||
|
||||
@@ -30,6 +30,6 @@ using System.Runtime.CompilerServices;
|
||||
[assembly: AssemblyCompany ("Xamarin, Inc.")]
|
||||
[assembly: AssemblyProduct ("Mono Common Language Infrastructure")]
|
||||
[assembly: AssemblyCopyright ("Copyright (c) 2013 Xamarin Inc. (http://www.xamarin.com)")]
|
||||
[assembly: AssemblyVersion ("4.1.0.0")]
|
||||
[assembly: AssemblyVersion ("4.2.1.0")]
|
||||
[assembly: AssemblyInformationalVersion ("4.0.0.0")]
|
||||
[assembly: AssemblyFileVersion ("4.0.0.0")]
|
||||
@@ -23,7 +23,7 @@ EMBEDDED_DRAWING_DEP := $(filter xammac_net_4_5 testing_aot_full testing_aot_hyb
|
||||
ifndef EMBEDDED_DRAWING_DEP
|
||||
|
||||
# profiles which build a System.Drawing.dll in the repo
|
||||
REPO_DRAWING_DEP := $(filter net_4_x orbis winaot, $(PROFILE))
|
||||
REPO_DRAWING_DEP := $(filter net_4_x orbis winaot unreal, $(PROFILE))
|
||||
|
||||
ifdef REPO_DRAWING_DEP
|
||||
LIB_REFS += System.Drawing
|
||||
|
||||
@@ -30,6 +30,6 @@ using System.Runtime.CompilerServices;
|
||||
[assembly: AssemblyCompany ("Xamarin, Inc.")]
|
||||
[assembly: AssemblyProduct ("Mono Common Language Infrastructure")]
|
||||
[assembly: AssemblyCopyright ("Copyright (c) 2015 Xamarin Inc. (http://www.xamarin.com)")]
|
||||
[assembly: AssemblyVersion ("4.0.1.0")]
|
||||
[assembly: AssemblyVersion ("4.1.1.0")]
|
||||
[assembly: AssemblyInformationalVersion ("4.0.0.0")]
|
||||
[assembly: AssemblyFileVersion ("4.0.0.0")]
|
||||
@@ -30,6 +30,6 @@ using System.Runtime.CompilerServices;
|
||||
[assembly: AssemblyCompany ("Xamarin, Inc.")]
|
||||
[assembly: AssemblyProduct ("Mono Common Language Infrastructure")]
|
||||
[assembly: AssemblyCopyright ("Copyright (c) 2016 Xamarin Inc. (http://www.xamarin.com)")]
|
||||
[assembly: AssemblyVersion ("4.0.0.0")]
|
||||
[assembly: AssemblyVersion ("4.0.1.0")]
|
||||
[assembly: AssemblyInformationalVersion ("4.0.0.0")]
|
||||
[assembly: AssemblyFileVersion ("4.0.0.0")]
|
||||
@@ -30,6 +30,6 @@ using System.Runtime.CompilerServices;
|
||||
[assembly: AssemblyCompany ("Xamarin, Inc.")]
|
||||
[assembly: AssemblyProduct ("Mono Common Language Infrastructure")]
|
||||
[assembly: AssemblyCopyright ("Copyright (c) 2015 Xamarin Inc. (http://www.xamarin.com)")]
|
||||
[assembly: AssemblyVersion ("4.1.0.0")]
|
||||
[assembly: AssemblyVersion ("4.2.1.0")]
|
||||
[assembly: AssemblyInformationalVersion ("4.0.0.0")]
|
||||
[assembly: AssemblyFileVersion ("4.0.0.0")]
|
||||
@@ -27,6 +27,7 @@
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Net.Sockets.LingerOption))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Net.Sockets.MulticastOption))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Net.Sockets.NetworkStream))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Net.Sockets.ProtocolFamily))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Net.Sockets.ProtocolType))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Net.Sockets.SelectMode))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Net.Sockets.SendPacketsElement))]
|
||||
|
||||
+1
-1
@@ -39,7 +39,7 @@ using System.Runtime.CompilerServices;
|
||||
[assembly: AssemblyCompany ("Xamarin, Inc.")]
|
||||
[assembly: AssemblyProduct ("Mono Common Language Infrastructure")]
|
||||
[assembly: AssemblyCopyright ("Copyright (c) 2016 Xamarin Inc. (http://www.xamarin.com)")]
|
||||
[assembly: AssemblyVersion ("4.0.1.0")]
|
||||
[assembly: AssemblyVersion ("4.0.3.0")]
|
||||
[assembly: AssemblyInformationalVersion ("4.0.0.0")]
|
||||
[assembly: AssemblyFileVersion ("4.0.0.0")]
|
||||
|
||||
|
||||
+3
-3
@@ -8,7 +8,7 @@
|
||||
<SchemaVersion>2.0</SchemaVersion>
|
||||
<ProjectGuid>{71D02788-3AD8-4C43-BDEB-1A3D277496BA}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<NoWarn>1699,1616,1699</NoWarn>
|
||||
<NoWarn>1699,1616,1699,436</NoWarn>
|
||||
<HostPlatform Condition=" '$(HostPlatform)' == '' and '$(OS)' == 'Windows_NT'">win32</HostPlatform>
|
||||
<HostPlatform Condition=" '$(HostPlatform)' == '' and '$(OS)' == 'Unix' and $([System.IO.File]::Exists('/usr/lib/libc.dylib'))">darwin</HostPlatform>
|
||||
<HostPlatform Condition=" '$(HostPlatform)' == '' and '$(OS)' == 'Unix'">linux</HostPlatform>
|
||||
@@ -36,7 +36,7 @@
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<NoWarn>1699,1616,1699</NoWarn>
|
||||
<NoWarn>1699,1616,1699,436</NoWarn>
|
||||
<Optimize>false</Optimize>
|
||||
<DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
@@ -44,7 +44,7 @@
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<NoWarn>1699,1616,1699</NoWarn>
|
||||
<NoWarn>1699,1616,1699,436</NoWarn>
|
||||
<Optimize>true</Optimize>
|
||||
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
|
||||
@@ -12,7 +12,7 @@ LIBRARY = System.Runtime.InteropServices.RuntimeInformation.dll
|
||||
RESX_RESOURCE_STRING = ../../../../external/corefx/src/System.Runtime.InteropServices.RuntimeInformation/src/Resources/Strings.resx
|
||||
|
||||
KEY_FILE = ../../msfinal.pub
|
||||
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
|
||||
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699,436
|
||||
LIB_REFS = System
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /unsafe
|
||||
|
||||
|
||||
+1
-4
@@ -35,12 +35,9 @@ namespace System.Runtime.InteropServices
|
||||
{
|
||||
public static class RuntimeInformation
|
||||
{
|
||||
[DllImport ("__Internal")]
|
||||
extern static string mono_get_runtime_build_info ();
|
||||
|
||||
public static string FrameworkDescription {
|
||||
get {
|
||||
return mono_get_runtime_build_info ();
|
||||
return "Mono " + Mono.Runtime.GetDisplayName ();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -30,6 +30,6 @@ using System.Runtime.CompilerServices;
|
||||
[assembly: AssemblyCompany ("Xamarin, Inc.")]
|
||||
[assembly: AssemblyProduct ("Mono Common Language Infrastructure")]
|
||||
[assembly: AssemblyCopyright ("Copyright (c) 2013 Xamarin Inc. (http://www.xamarin.com)")]
|
||||
[assembly: AssemblyVersion ("4.1.1.0")]
|
||||
[assembly: AssemblyVersion ("4.2.1.0")]
|
||||
[assembly: AssemblyInformationalVersion ("4.0.0.0")]
|
||||
[assembly: AssemblyFileVersion ("4.0.0.0")]
|
||||
@@ -25,7 +25,11 @@
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.DataContractAttribute))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.DataMemberAttribute))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.EnumMemberAttribute))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.ExportOptions))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.ExtensionDataObject))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.IExtensibleDataObject))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.IgnoreDataMemberAttribute))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.InvalidDataContractException))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.KnownTypeAttribute))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.OnDeserializedAttribute))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.OnDeserializingAttribute))]
|
||||
@@ -33,4 +37,13 @@
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.OnSerializingAttribute))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.SerializationException))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.StreamingContext))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.InvalidDataContractException))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.StreamingContextStates))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.XmlSerializableServices))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.XPathQueryGenerator))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.XsdDataContractExporter))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Xml.IFragmentCapableXmlDictionaryWriter))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Xml.IStreamProvider))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Xml.IXmlBinaryReaderInitializer))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Xml.IXmlBinaryWriterInitializer))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Xml.IXmlTextReaderInitializer))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Xml.IXmlTextWriterInitializer))]
|
||||
@@ -30,6 +30,6 @@ using System.Runtime.CompilerServices;
|
||||
[assembly: AssemblyCompany ("Xamarin, Inc.")]
|
||||
[assembly: AssemblyProduct ("Mono Common Language Infrastructure")]
|
||||
[assembly: AssemblyCopyright ("Copyright (c) 2016 Xamarin Inc. (http://www.xamarin.com)")]
|
||||
[assembly: AssemblyVersion ("4.2.0.0")]
|
||||
[assembly: AssemblyVersion ("4.3.1.0")]
|
||||
[assembly: AssemblyInformationalVersion ("4.0.0.0")]
|
||||
[assembly: AssemblyFileVersion ("4.0.0.0")]
|
||||
@@ -21,27 +21,55 @@
|
||||
//
|
||||
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.Aes))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.AesManaged))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.AsymmetricKeyExchangeDeformatter))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.AsymmetricKeyExchangeFormatter))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.AsymmetricSignatureDeformatter))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.AsymmetricSignatureFormatter))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.CryptoConfig))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.DeriveBytes))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.DES))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.DSA))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.DSAParameters))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.DSASignatureDeformatter))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.DSASignatureFormatter))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.ECCurve))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.ECDiffieHellmanPublicKey))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.ECDsa))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.ECParameters))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.ECPoint))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.HMACMD5))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.HMACSHA1))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.HMACSHA256))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.HMACSHA384))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.HMACSHA512))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.MaskGenerationMethod))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.MD5))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.PKCS1MaskGenerationMethod))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.RandomNumberGenerator))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.RC2))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.Rfc2898DeriveBytes))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.Rijndael))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.RijndaelManaged))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.RSA))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.RSAEncryptionPadding))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.RSAEncryptionPaddingMode))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.RSAOAEPKeyExchangeDeformatter))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.RSAOAEPKeyExchangeFormatter))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.RSAParameters))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.RSAPKCS1KeyExchangeDeformatter))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.RSAPKCS1KeyExchangeFormatter))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.RSAPKCS1SignatureDeformatter))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.RSAPKCS1SignatureFormatter))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.RSASignaturePadding))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.RSASignaturePaddingMode))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.SHA1))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.SHA1Managed))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.SHA256))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.SHA256Managed))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.SHA384))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.SHA384Managed))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.SHA512))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.SHA512Managed))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.SignatureDescription))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.TripleDES))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.ECCurve))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.ECParameters))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.ECPoint))]
|
||||
@@ -30,6 +30,6 @@ using System.Runtime.CompilerServices;
|
||||
[assembly: AssemblyCompany ("Xamarin, Inc.")]
|
||||
[assembly: AssemblyProduct ("Mono Common Language Infrastructure")]
|
||||
[assembly: AssemblyCopyright ("Copyright (c) 2015 Xamarin Inc. (http://www.xamarin.com)")]
|
||||
[assembly: AssemblyVersion ("4.0.0.0")]
|
||||
[assembly: AssemblyVersion ("4.1.1.0")]
|
||||
[assembly: AssemblyInformationalVersion ("4.0.0.0")]
|
||||
[assembly: AssemblyFileVersion ("4.0.0.0")]
|
||||
@@ -30,6 +30,6 @@ using System.Runtime.CompilerServices;
|
||||
[assembly: AssemblyCompany ("Xamarin, Inc.")]
|
||||
[assembly: AssemblyProduct ("Mono Common Language Infrastructure")]
|
||||
[assembly: AssemblyCopyright ("Copyright (c) 2015 Xamarin Inc. (http://www.xamarin.com)")]
|
||||
[assembly: AssemblyVersion ("4.0.1.0")]
|
||||
[assembly: AssemblyVersion ("4.1.1.0")]
|
||||
[assembly: AssemblyInformationalVersion ("4.0.0.0")]
|
||||
[assembly: AssemblyFileVersion ("4.0.0.0")]
|
||||
@@ -22,5 +22,6 @@
|
||||
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.IOCompletionCallback))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.NativeOverlapped))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.Overlapped))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.PreAllocatedOverlapped))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.ThreadPoolBoundHandle))]
|
||||
@@ -30,6 +30,6 @@ using System.Runtime.CompilerServices;
|
||||
[assembly: AssemblyCompany ("Xamarin, Inc.")]
|
||||
[assembly: AssemblyProduct ("Mono Common Language Infrastructure")]
|
||||
[assembly: AssemblyCopyright ("Copyright (c) 2016 Xamarin Inc. (http://www.xamarin.com)")]
|
||||
[assembly: AssemblyVersion ("4.0.1.0")]
|
||||
[assembly: AssemblyVersion ("4.0.3.0")]
|
||||
[assembly: AssemblyInformationalVersion ("4.0.0.0")]
|
||||
[assembly: AssemblyFileVersion ("4.0.0.0")]
|
||||
@@ -30,7 +30,7 @@ using System.Runtime.CompilerServices;
|
||||
[assembly: AssemblyCompany ("Xamarin, Inc.")]
|
||||
[assembly: AssemblyProduct ("Mono Common Language Infrastructure")]
|
||||
[assembly: AssemblyCopyright ("Copyright (c) 2015 Xamarin Inc. (http://www.xamarin.com)")]
|
||||
[assembly: AssemblyVersion ("4.0.1.0")]
|
||||
[assembly: AssemblyVersion ("4.1.1.0")]
|
||||
[assembly: AssemblyInformationalVersion ("4.0.0.0")]
|
||||
[assembly: AssemblyFileVersion ("4.0.0.0")]
|
||||
|
||||
@@ -29,7 +29,7 @@ LIB_REFS += System.Web
|
||||
endif
|
||||
|
||||
# profiles which build a System.Drawing.dll in the repo
|
||||
REPO_DRAWING_DEP := $(filter net_4_x orbis winaot, $(PROFILE))
|
||||
REPO_DRAWING_DEP := $(filter net_4_x orbis winaot unreal, $(PROFILE))
|
||||
|
||||
ifdef REPO_DRAWING_DEP
|
||||
LIB_REFS += System.Drawing
|
||||
|
||||
@@ -83,6 +83,9 @@ winaot_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS)
|
||||
orbis_SUBDIRS = $(common_DEPS_SUBDIRS) $(netstandard_drawing_SUBDIRS) $(mobile_only_DEPS_SUBDIRS)
|
||||
orbis_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS)
|
||||
|
||||
unreal_SUBDIRS = $(common_DEPS_SUBDIRS) $(netstandard_drawing_SUBDIRS) $(mobile_only_DEPS_SUBDIRS)
|
||||
unreal_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS)
|
||||
|
||||
mobile_only_SUBDIRS = System.Net.Ping System.Runtime.Serialization.Formatters System.Security.Cryptography.Csp System.Security.Cryptography.Pkcs \
|
||||
System.Security.Cryptography.Cng System.Runtime.Loader System.Xml.XPath.XmlDocument System.Reflection.DispatchProxy
|
||||
|
||||
|
||||
+8
-1
@@ -130,6 +130,11 @@ winaot_dirs := \
|
||||
System.Drawing \
|
||||
$(pcl_facade_dirs)
|
||||
|
||||
unreal_dirs := \
|
||||
$(mobile_common_dirs) \
|
||||
System.Drawing \
|
||||
$(pcl_facade_dirs)
|
||||
|
||||
xammac_4_5_dirs := \
|
||||
corlib \
|
||||
Mono.Security \
|
||||
@@ -315,6 +320,7 @@ net_4_x_parallel_dirs := \
|
||||
System.Workflow.ComponentModel \
|
||||
System.Workflow.Runtime \
|
||||
System.Reflection.Context \
|
||||
Mono.Profiler.Log \
|
||||
legacy/Mono.Cecil \
|
||||
$(pcl_facade_dirs)
|
||||
|
||||
@@ -352,10 +358,11 @@ xbuild_12_SUBDIRS := $(xbuild_4_0_dirs)
|
||||
xbuild_14_SUBDIRS := $(xbuild_4_0_dirs) Microsoft.NuGet.Build.Tasks
|
||||
winaot_SUBDIRS := $(winaot_dirs)
|
||||
orbis_SUBDIRS := $(orbis_dirs)
|
||||
unreal_SUBDIRS := $(unreal_dirs)
|
||||
|
||||
include ../build/rules.make
|
||||
|
||||
SUBDIRS = $(testing_aot_full_dirs) $(testing_aot_hybrid_dirs) $(monotouch_dirs) $(monodroid_dirs) $(xammac_dirs) $(net_4_x_dirs) $(net_4_x_parallel_dirs) $(xammac_net_4_5_SUBDIRS)
|
||||
SUBDIRS = $(testing_aot_full_dirs) $(testing_aot_hybrid_dirs) $(monotouch_dirs) $(monodroid_dirs) $(xammac_dirs) $(net_4_x_dirs) $(net_4_x_parallel_dirs) $(xammac_net_4_5_SUBDIRS) $(unreal_dirs)
|
||||
|
||||
DIST_ONLY_SUBDIRS = dlr aot-compiler reference-assemblies $(xbuild_4_0_dirs) Microsoft.NuGet.Build.Tasks
|
||||
|
||||
|
||||
@@ -150,18 +150,18 @@ namespace MonoTests.Microsoft.Build.Execution
|
||||
var bm = new BuildManager ();
|
||||
bm.BeginBuild (new BuildParameters () { Loggers = new ILogger [] {new ConsoleLogger (LoggerVerbosity.Diagnostic, TextWriter.Null.WriteLine, null, null)} });
|
||||
DateTime waitDone = DateTime.MinValue;
|
||||
DateTime beforeExec = DateTime.Now;
|
||||
DateTime beforeExec = DateTime.UtcNow;
|
||||
var l = new List<BuildSubmission> ();
|
||||
for (int i = 0; i < 10; i++) {
|
||||
var sub = bm.PendBuildRequest (new BuildRequestData (proj, new string [] { "Wait1Sec" }));
|
||||
l.Add (sub);
|
||||
sub.ExecuteAsync (delegate { waitDone = DateTime.Now; }, null);
|
||||
sub.ExecuteAsync (delegate { waitDone = DateTime.UtcNow; }, null);
|
||||
}
|
||||
bm.EndBuild ();
|
||||
Assert.IsTrue (l.All (s => s.BuildResult.OverallResult == BuildResultCode.Success), "#1");
|
||||
DateTime endBuildDone = DateTime.Now;
|
||||
Assert.IsTrue (endBuildDone - beforeExec >= TimeSpan.FromSeconds (1), "#2");
|
||||
Assert.IsTrue (endBuildDone > waitDone, "#3");
|
||||
DateTime endBuildDone = DateTime.UtcNow;
|
||||
AssertHelper.GreaterOrEqual (endBuildDone - beforeExec, TimeSpan.FromSeconds (1), "#2");
|
||||
AssertHelper.Greater (endBuildDone, waitDone, "#3");
|
||||
}
|
||||
|
||||
[Test]
|
||||
|
||||
@@ -101,15 +101,15 @@ namespace MonoTests.Microsoft.Build.Execution
|
||||
var bm = new BuildManager ();
|
||||
bm.BeginBuild (new BuildParameters ());
|
||||
DateTime waitDone = DateTime.MinValue;
|
||||
DateTime beforeExec = DateTime.Now;
|
||||
DateTime beforeExec = DateTime.UtcNow;
|
||||
var sub = bm.PendBuildRequest (new BuildRequestData (proj, new string [] { "Wait1Sec" }));
|
||||
sub.ExecuteAsync (delegate { waitDone = DateTime.Now; }, null);
|
||||
sub.ExecuteAsync (delegate { waitDone = DateTime.UtcNow; }, null);
|
||||
bm.EndBuild ();
|
||||
Assert.IsTrue (sub.BuildResult.OverallResult == BuildResultCode.Success, "#1");
|
||||
DateTime endBuildDone = DateTime.Now;
|
||||
Assert.IsTrue (endBuildDone - beforeExec >= TimeSpan.FromSeconds (1), "#2");
|
||||
Assert.IsTrue (waitDone >= beforeExec, "#3");
|
||||
Assert.IsTrue (endBuildDone >= waitDone, "#4");
|
||||
Assert.AreEqual (BuildResultCode.Success, sub.BuildResult.OverallResult, "#1");
|
||||
DateTime endBuildDone = DateTime.UtcNow;
|
||||
AssertHelper.GreaterOrEqual (endBuildDone - beforeExec, TimeSpan.FromSeconds (1), "#2");
|
||||
AssertHelper.GreaterOrEqual (waitDone, beforeExec, "#3");
|
||||
AssertHelper.GreaterOrEqual (endBuildDone, waitDone, "#4");
|
||||
}
|
||||
|
||||
[Test]
|
||||
|
||||
@@ -106,9 +106,6 @@
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Conversions.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\COperators.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Declarations\AggregateDeclaration.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Declarations\Declaration.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Declarations\GlobalAttributeDeclaration.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Declarations\NamespaceDeclaration.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\ExplicitConversion.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\ExpressionBinder.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\ExpressionKind.cs" />
|
||||
@@ -139,7 +136,6 @@
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\EventSymbol.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\FieldSymbol.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\IndexerSymbol.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\LabelSymbol.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\LocalVariableSymbol.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\MethodOrPropertySymbol.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\MethodSymbol.cs" />
|
||||
@@ -157,13 +153,11 @@
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\SymbolTable.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\SymFactory.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\SymFactoryBase.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\TransparentIdentifierMemberSymbol.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\TypeParameterSymbol.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\UnresolvedAggregateSymbol.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\VariableSymbol.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\ArrayIndex.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\ArrayInitialization.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\ArrayLength.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\Assignment.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\BinaryOperator.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\Block.cs" />
|
||||
@@ -173,7 +167,6 @@
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\Class.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\CompoundOperator.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\Concatenate.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\ConditionalOperator.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\Constant.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\Event.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\EXPR.cs" />
|
||||
|
||||
@@ -58,9 +58,6 @@ corefx/SR.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Conversions.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/COperators.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Declarations/AggregateDeclaration.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Declarations/Declaration.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Declarations/GlobalAttributeDeclaration.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Declarations/NamespaceDeclaration.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/ExplicitConversion.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/ExpressionBinder.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/ExpressionKind.cs
|
||||
@@ -91,7 +88,6 @@ corefx/SR.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/EventSymbol.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/FieldSymbol.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/IndexerSymbol.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/LabelSymbol.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/LocalVariableSymbol.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/MethodOrPropertySymbol.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/MethodSymbol.cs
|
||||
@@ -109,13 +105,11 @@ corefx/SR.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/SymbolTable.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/SymFactory.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/SymFactoryBase.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/TransparentIdentifierMemberSymbol.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/TypeParameterSymbol.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/UnresolvedAggregateSymbol.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/VariableSymbol.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/ArrayIndex.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/ArrayInitialization.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/ArrayLength.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Assignment.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/BinaryOperator.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Block.cs
|
||||
@@ -125,7 +119,6 @@ corefx/SR.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Class.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/CompoundOperator.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Concatenate.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/ConditionalOperator.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Constant.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Event.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/EXPR.cs
|
||||
|
||||
@@ -104,6 +104,7 @@
|
||||
<Compile Include="..\..\mcs\settings.cs" />
|
||||
<Compile Include="..\..\mcs\statement.cs" />
|
||||
<Compile Include="..\..\mcs\support.cs" />
|
||||
<Compile Include="..\..\mcs\tuples.cs" />
|
||||
<Compile Include="..\..\mcs\typemanager.cs" />
|
||||
<Compile Include="..\..\mcs\typespec.cs" />
|
||||
<Compile Include="..\..\mcs\visit.cs" />
|
||||
|
||||
@@ -49,6 +49,7 @@ aot.cs
|
||||
../../mcs/support.cs
|
||||
../../mcs/typemanager.cs
|
||||
../../mcs/typespec.cs
|
||||
../../mcs/tuples.cs
|
||||
../../mcs/visit.cs
|
||||
../../class/Mono.CompilerServices.SymbolWriter/MonoSymbolFile.cs
|
||||
../../class/Mono.CompilerServices.SymbolWriter/MonoSymbolTable.cs
|
||||
|
||||
@@ -2214,7 +2214,7 @@ namespace Mono.Debugger.Soft
|
||||
internal ValueImpl[] Type_GetValues (long id, long[] fields, long thread_id) {
|
||||
int len = fields.Length;
|
||||
PacketReader r;
|
||||
if (thread_id != 0)
|
||||
if (thread_id != 0 && Version.AtLeast(2, 3))
|
||||
r = SendReceive (CommandSet.TYPE, (int)CmdType.GET_VALUES_2, new PacketWriter ().WriteId (id).WriteId (thread_id).WriteInt (len).WriteIds (fields));
|
||||
else
|
||||
r = SendReceive (CommandSet.TYPE, (int)CmdType.GET_VALUES, new PacketWriter ().WriteId (id).WriteInt (len).WriteIds (fields));
|
||||
|
||||
@@ -30,6 +30,11 @@ namespace Mono.Debugger.Soft
|
||||
if (args != null && args.Length != 0)
|
||||
throw new NotSupportedException ();
|
||||
|
||||
//If method is virtual we can't optimize(execute IL) because it's maybe
|
||||
//overriden... call runtime to invoke overriden version...
|
||||
if (method.IsVirtual)
|
||||
throw new NotSupportedException ();
|
||||
|
||||
if (method.IsStatic || method.DeclaringType.IsValueType || this_val == null || !(this_val is ObjectMirror))
|
||||
throw new NotSupportedException ();
|
||||
|
||||
@@ -350,6 +355,12 @@ namespace Mono.Debugger.Soft
|
||||
} catch {
|
||||
throw new NotSupportedException ();
|
||||
}
|
||||
} else if (method.ReturnType.IsEnum && primitive != null) {
|
||||
try {
|
||||
res = method.VirtualMachine.CreateEnumMirror (method.ReturnType, primitive);
|
||||
} catch {
|
||||
throw new NotSupportedException ();
|
||||
}
|
||||
}
|
||||
|
||||
return res;
|
||||
|
||||
@@ -59,7 +59,7 @@ namespace Mono.Debugger.Soft
|
||||
sb.Append (ReturnType.Name);
|
||||
sb.Append (' ');
|
||||
if (type_namespace != String.Empty)
|
||||
sb.Append (type_namespace + ".");
|
||||
sb.Append (type_namespace).Append (".");
|
||||
sb.Append(type_name);
|
||||
sb.Append(":");
|
||||
sb.Append(Name);
|
||||
|
||||
@@ -102,6 +102,18 @@ namespace Mono.Debugger.Soft
|
||||
}
|
||||
}
|
||||
|
||||
public int EndLineNumber {
|
||||
get {
|
||||
return Location.EndLineNumber;
|
||||
}
|
||||
}
|
||||
|
||||
public int EndColumnNumber {
|
||||
get {
|
||||
return Location.EndColumnNumber;
|
||||
}
|
||||
}
|
||||
|
||||
public bool IsDebuggerInvoke {
|
||||
get {
|
||||
return (flags & StackFrameFlags.DEBUGGER_INVOKE) != 0;
|
||||
|
||||
@@ -13,6 +13,8 @@ namespace Mono.Debugger.Soft
|
||||
ManualResetEvent fetchingEvent = new ManualResetEvent (false);
|
||||
ThreadInfo info;
|
||||
StackFrame[] frames;
|
||||
bool threadStateInvalid = true;
|
||||
ThreadState threadState;
|
||||
|
||||
internal ThreadMirror (VirtualMachine vm, long id) : base (vm, id) {
|
||||
}
|
||||
@@ -30,6 +32,7 @@ namespace Mono.Debugger.Soft
|
||||
|
||||
internal void InvalidateFrames () {
|
||||
cacheInvalid = true;
|
||||
threadStateInvalid = true;
|
||||
}
|
||||
|
||||
internal void FetchFrames (bool mustFetch = false) {
|
||||
@@ -91,7 +94,11 @@ namespace Mono.Debugger.Soft
|
||||
|
||||
public ThreadState ThreadState {
|
||||
get {
|
||||
return (ThreadState)vm.conn.Thread_GetState (id);
|
||||
if (threadStateInvalid) {
|
||||
threadState = (ThreadState) vm.conn.Thread_GetState (id);
|
||||
threadStateInvalid = false;
|
||||
}
|
||||
return threadState;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -665,7 +665,7 @@ namespace Mono.Debugger.Soft
|
||||
return res;
|
||||
}
|
||||
|
||||
internal ValueImpl EncodeValue (Value v) {
|
||||
internal ValueImpl EncodeValue (Value v, List<Value> duplicates = null) {
|
||||
if (v is PrimitiveValue) {
|
||||
object val = (v as PrimitiveValue).Value;
|
||||
if (val == null)
|
||||
@@ -675,16 +675,22 @@ namespace Mono.Debugger.Soft
|
||||
} else if (v is ObjectMirror) {
|
||||
return new ValueImpl { Type = ElementType.Object, Objid = (v as ObjectMirror).Id };
|
||||
} else if (v is StructMirror) {
|
||||
return new ValueImpl { Type = ElementType.ValueType, Klass = (v as StructMirror).Type.Id, Fields = EncodeValues ((v as StructMirror).Fields) };
|
||||
if (duplicates == null)
|
||||
duplicates = new List<Value> ();
|
||||
if (duplicates.Contains (v))
|
||||
return new ValueImpl { Type = (ElementType)ValueTypeId.VALUE_TYPE_ID_NULL, Objid = 0 };
|
||||
duplicates.Add (v);
|
||||
|
||||
return new ValueImpl { Type = ElementType.ValueType, Klass = (v as StructMirror).Type.Id, Fields = EncodeValues ((v as StructMirror).Fields, duplicates) };
|
||||
} else {
|
||||
throw new NotSupportedException ();
|
||||
}
|
||||
}
|
||||
|
||||
internal ValueImpl[] EncodeValues (IList<Value> values) {
|
||||
internal ValueImpl[] EncodeValues (IList<Value> values, List<Value> duplicates = null) {
|
||||
ValueImpl[] res = new ValueImpl [values.Count];
|
||||
for (int i = 0; i < values.Count; ++i)
|
||||
res [i] = EncodeValue (values [i]);
|
||||
res [i] = EncodeValue (values [i], duplicates);
|
||||
return res;
|
||||
}
|
||||
|
||||
@@ -724,6 +730,7 @@ namespace Mono.Debugger.Soft
|
||||
l.Add (new ThreadStartEvent (vm, req_id, id));
|
||||
break;
|
||||
case EventType.ThreadDeath:
|
||||
vm.GetThread (id).InvalidateFrames ();
|
||||
vm.InvalidateThreadCache ();
|
||||
l.Add (new ThreadDeathEvent (vm, req_id, id));
|
||||
break;
|
||||
|
||||
@@ -5,6 +5,7 @@ using System.IO;
|
||||
using System.Net;
|
||||
using System.Net.Sockets;
|
||||
using System.Runtime.Remoting.Messaging;
|
||||
using System.Text;
|
||||
|
||||
namespace Mono.Debugger.Soft
|
||||
{
|
||||
@@ -95,6 +96,12 @@ namespace Mono.Debugger.Soft
|
||||
info.FileName = "valgrind";
|
||||
info.UseShellExecute = false;
|
||||
|
||||
if (info.RedirectStandardError)
|
||||
info.StandardErrorEncoding = Encoding.UTF8;
|
||||
|
||||
if (info.RedirectStandardOutput)
|
||||
info.StandardOutputEncoding = Encoding.UTF8;
|
||||
|
||||
ITargetProcess p;
|
||||
if (options != null && options.CustomProcessLauncher != null)
|
||||
p = new ProcessWrapper (options.CustomProcessLauncher (info));
|
||||
|
||||
@@ -1165,10 +1165,18 @@ public class Tests : TestsBase, ITest2
|
||||
return 42;
|
||||
}
|
||||
|
||||
public int invoke_pass_nullable (int? i) {
|
||||
return (int)i;
|
||||
}
|
||||
|
||||
public int? invoke_return_nullable_null () {
|
||||
return null;
|
||||
}
|
||||
|
||||
public int invoke_pass_nullable_null (int? i) {
|
||||
return i.HasValue ? 1 : 2;
|
||||
}
|
||||
|
||||
public void invoke_type_load () {
|
||||
new Class3 ();
|
||||
}
|
||||
|
||||
@@ -2617,6 +2617,11 @@ public class DebuggerTests
|
||||
m = s.Type.GetMethod ("ToString");
|
||||
v = s.InvokeMethod (e.Thread, m, null);
|
||||
|
||||
// pass nullable as argument
|
||||
m = t.GetMethod ("invoke_pass_nullable");
|
||||
v = this_obj.InvokeMethod (e.Thread, m, new Value [] { s });
|
||||
AssertValue (42, v);
|
||||
|
||||
// return nullable null
|
||||
m = t.GetMethod ("invoke_return_nullable_null");
|
||||
v = this_obj.InvokeMethod (e.Thread, m, null);
|
||||
@@ -2630,6 +2635,11 @@ public class DebuggerTests
|
||||
m = s.Type.GetMethod ("ToString");
|
||||
v = s.InvokeMethod (e.Thread, m, null);
|
||||
|
||||
// pass nullable null as argument
|
||||
m = t.GetMethod ("invoke_pass_nullable_null");
|
||||
v = this_obj.InvokeMethod (e.Thread, m, new Value [] { s });
|
||||
AssertValue (2, v);
|
||||
|
||||
// pass primitive
|
||||
m = t.GetMethod ("invoke_pass_primitive");
|
||||
Value[] args = new Value [] {
|
||||
@@ -2723,6 +2733,17 @@ public class DebuggerTests
|
||||
task = t.InvokeMethodAsync (e.Thread, m, new Value [] { vm.RootDomain.CreateString ("ABC") });
|
||||
AssertValue ("ABC", task.Result);
|
||||
|
||||
// string constructor
|
||||
var stringType = vm.RootDomain.Corlib.GetType ("System.String");
|
||||
var stringConstructor = stringType.GetMethods ().Single (c=>
|
||||
c.Name == ".ctor" &&
|
||||
c.GetParameters ().Length == 2 &&
|
||||
c.GetParameters ()[0].ParameterType.Name == "Char" &&
|
||||
c.GetParameters ()[1].ParameterType.Name == "Int32");
|
||||
var str = stringType.NewInstance (e.Thread, stringConstructor, new Value [] { vm.CreateValue ('a'), vm.CreateValue (3)});
|
||||
|
||||
AssertValue("aaa", str);
|
||||
|
||||
// Argument checking
|
||||
|
||||
// null thread
|
||||
@@ -4122,7 +4143,7 @@ public class DebuggerTests
|
||||
|
||||
frames = thread.GetFrames ();
|
||||
Assert.AreEqual (8, frames.Length, "#7");
|
||||
Assert.AreEqual ("WaitOne_internal", frames [0].Method.Name, "#8.0");
|
||||
Assert.AreEqual ("Wait_internal", frames [0].Method.Name, "#8.0");
|
||||
Assert.AreEqual ("WaitOneNative", frames [1].Method.Name, "#8.1");
|
||||
Assert.AreEqual ("InternalWaitOne", frames [2].Method.Name, "#8.2");
|
||||
Assert.AreEqual ("WaitOne", frames [3].Method.Name, "#8.3");
|
||||
|
||||
@@ -228,7 +228,7 @@ namespace MonoTests.Mono.Options
|
||||
e.Run = (args) => e.CommandSet.Out.WriteLine (string.Join (" ", args));
|
||||
|
||||
var o = new StringWriter ();
|
||||
var c = new CommandSet ("set", output:o) {
|
||||
var c = new CommandSet ("set", output:o, error: Console.Error) {
|
||||
e,
|
||||
};
|
||||
Assert.AreEqual (0, c.Run (new [] { "help", "echo" }));
|
||||
|
||||
@@ -56,7 +56,7 @@ namespace MonoTests.Mono.Options
|
||||
c, v => { string ignore = v.OptionValues [0]; });
|
||||
c.Option = p [0];
|
||||
Utils.AssertException (typeof(ArgumentOutOfRangeException),
|
||||
"Specified argument was out of the range of valid values.\nParameter name: index",
|
||||
$"Specified argument was out of the range of valid values.{Environment.NewLine}Parameter name: index",
|
||||
c, v => { string ignore = v.OptionValues [2]; });
|
||||
c.OptionName = "-a";
|
||||
Utils.AssertException (typeof(OptionException),
|
||||
|
||||
@@ -374,10 +374,10 @@ namespace MonoTests.Mono.Options
|
||||
p, v => { v.Parse (_("-a", "-b")); });
|
||||
Assert.AreEqual (a, "-b");
|
||||
Utils.AssertException (typeof(ArgumentNullException),
|
||||
"Value cannot be null.\nParameter name: option",
|
||||
$"Value cannot be null.{Environment.NewLine}Parameter name: option",
|
||||
p, v => { v.Add ((Option) null); });
|
||||
Utils.AssertException (typeof(ArgumentNullException),
|
||||
"Value cannot be null.\nParameter name: header",
|
||||
$"Value cannot be null.{Environment.NewLine}Parameter name: header",
|
||||
p, v => { v.Add ((string) null); });
|
||||
|
||||
// bad type
|
||||
@@ -394,10 +394,10 @@ namespace MonoTests.Mono.Options
|
||||
p, v => { v.Parse (_("-cz", "extra")); });
|
||||
|
||||
Utils.AssertException (typeof(ArgumentNullException),
|
||||
"Value cannot be null.\nParameter name: action",
|
||||
$"Value cannot be null.{Environment.NewLine}Parameter name: action",
|
||||
p, v => { v.Add ("foo", (Action<string>) null); });
|
||||
Utils.AssertException (typeof(ArgumentException),
|
||||
"Cannot provide maxValueCount of 2 for OptionValueType.None.\nParameter name: maxValueCount",
|
||||
$"Cannot provide maxValueCount of 2 for OptionValueType.None.{Environment.NewLine}Parameter name: maxValueCount",
|
||||
p, v => { v.Add ("foo", (k, val) => {/* ignore */}); });
|
||||
}
|
||||
|
||||
@@ -772,7 +772,7 @@ namespace MonoTests.Mono.Options
|
||||
Utils.AssertException (typeof(ArgumentException), "prototypes must be null!",
|
||||
p, v => { v.Add ("N|NUM=", (int n) => {}); });
|
||||
Utils.AssertException (typeof(ArgumentNullException),
|
||||
"Value cannot be null.\nParameter name: option",
|
||||
$"Value cannot be null.{Environment.NewLine}Parameter name: option",
|
||||
p, v => { v.GetOptionForName (null); });
|
||||
}
|
||||
|
||||
|
||||
@@ -66,60 +66,60 @@ namespace MonoTests.Mono.Options
|
||||
{
|
||||
object p = null;
|
||||
Utils.AssertException (typeof(ArgumentNullException),
|
||||
"Value cannot be null.\nParameter name: prototype",
|
||||
$"Value cannot be null.{Environment.NewLine}Parameter name: prototype",
|
||||
p, v => { new DefaultOption (null, null); });
|
||||
Utils.AssertException (typeof(ArgumentException),
|
||||
"Cannot be the empty string.\nParameter name: prototype",
|
||||
$"Cannot be the empty string.{Environment.NewLine}Parameter name: prototype",
|
||||
p, v => { new DefaultOption ("", null); });
|
||||
Utils.AssertException (typeof(ArgumentException),
|
||||
"Empty option names are not supported.\nParameter name: prototype",
|
||||
$"Empty option names are not supported.{Environment.NewLine}Parameter name: prototype",
|
||||
p, v => { new DefaultOption ("a|b||c=", null); });
|
||||
Utils.AssertException (typeof(ArgumentException),
|
||||
"Conflicting option types: '=' vs. ':'.\nParameter name: prototype",
|
||||
$"Conflicting option types: '=' vs. ':'.{Environment.NewLine}Parameter name: prototype",
|
||||
p, v => { new DefaultOption ("a=|b:", null); });
|
||||
Utils.AssertException (typeof(ArgumentException),
|
||||
"The default option handler '<>' cannot require values.\nParameter name: prototype",
|
||||
$"The default option handler '<>' cannot require values.{Environment.NewLine}Parameter name: prototype",
|
||||
p, v => { new DefaultOption ("<>=", null); });
|
||||
Utils.AssertException (typeof(ArgumentException),
|
||||
"The default option handler '<>' cannot require values.\nParameter name: prototype",
|
||||
$"The default option handler '<>' cannot require values.{Environment.NewLine}Parameter name: prototype",
|
||||
p, v => { new DefaultOption ("<>:", null); });
|
||||
Utils.AssertException (null, null,
|
||||
p, v => { new DefaultOption ("t|<>=", null, 1); });
|
||||
Utils.AssertException (typeof(ArgumentException),
|
||||
"The default option handler '<>' cannot require values.\nParameter name: prototype",
|
||||
$"The default option handler '<>' cannot require values.{Environment.NewLine}Parameter name: prototype",
|
||||
p, v => { new DefaultOption ("t|<>=", null, 2); });
|
||||
Utils.AssertException (null, null,
|
||||
p, v => { new DefaultOption ("a|b=", null, 2); });
|
||||
Utils.AssertException (typeof(ArgumentOutOfRangeException),
|
||||
"Specified argument was out of the range of valid values.\nParameter name: maxValueCount",
|
||||
$"Specified argument was out of the range of valid values.{Environment.NewLine}Parameter name: maxValueCount",
|
||||
p, v => { new DefaultOption ("a", null, -1); });
|
||||
Utils.AssertException (typeof(ArgumentException),
|
||||
"Cannot provide maxValueCount of 0 for OptionValueType.Required or " +
|
||||
"OptionValueType.Optional.\nParameter name: maxValueCount",
|
||||
$"OptionValueType.Optional.{Environment.NewLine}Parameter name: maxValueCount",
|
||||
p, v => { new DefaultOption ("a=", null, 0); });
|
||||
Utils.AssertException (typeof(ArgumentException),
|
||||
"Ill-formed name/value separator found in \"a={\".\nParameter name: prototype",
|
||||
"Ill-formed name/value separator found in \"a={\"." + Environment.NewLine + "Parameter name: prototype",
|
||||
p, v => { new DefaultOption ("a={", null); });
|
||||
Utils.AssertException (typeof(ArgumentException),
|
||||
"Ill-formed name/value separator found in \"a=}\".\nParameter name: prototype",
|
||||
"Ill-formed name/value separator found in \"a=}\"." + Environment.NewLine + "Parameter name: prototype",
|
||||
p, v => { new DefaultOption ("a=}", null); });
|
||||
Utils.AssertException (typeof(ArgumentException),
|
||||
"Ill-formed name/value separator found in \"a={{}}\".\nParameter name: prototype",
|
||||
"Ill-formed name/value separator found in \"a={{}}\"." + Environment.NewLine + "Parameter name: prototype",
|
||||
p, v => { new DefaultOption ("a={{}}", null); });
|
||||
Utils.AssertException (typeof(ArgumentException),
|
||||
"Ill-formed name/value separator found in \"a={}}\".\nParameter name: prototype",
|
||||
"Ill-formed name/value separator found in \"a={}}\"." + Environment.NewLine + "Parameter name: prototype",
|
||||
p, v => { new DefaultOption ("a={}}", null); });
|
||||
Utils.AssertException (typeof(ArgumentException),
|
||||
"Ill-formed name/value separator found in \"a={}{\".\nParameter name: prototype",
|
||||
"Ill-formed name/value separator found in \"a={}{\"." + Environment.NewLine + "Parameter name: prototype",
|
||||
p, v => { new DefaultOption ("a={}{", null); });
|
||||
Utils.AssertException (typeof(ArgumentException),
|
||||
"Cannot provide key/value separators for Options taking 1 value(s).\nParameter name: prototype",
|
||||
$"Cannot provide key/value separators for Options taking 1 value(s).{Environment.NewLine}Parameter name: prototype",
|
||||
p, v => { new DefaultOption ("a==", null); });
|
||||
Utils.AssertException (typeof(ArgumentException),
|
||||
"Cannot provide key/value separators for Options taking 1 value(s).\nParameter name: prototype",
|
||||
$"Cannot provide key/value separators for Options taking 1 value(s).{Environment.NewLine}Parameter name: prototype",
|
||||
p, v => { new DefaultOption ("a={}", null); });
|
||||
Utils.AssertException (typeof(ArgumentException),
|
||||
"Cannot provide key/value separators for Options taking 1 value(s).\nParameter name: prototype",
|
||||
$"Cannot provide key/value separators for Options taking 1 value(s).{Environment.NewLine}Parameter name: prototype",
|
||||
p, v => { new DefaultOption ("a=+-*/", null); });
|
||||
Utils.AssertException (null, null,
|
||||
p, v => { new DefaultOption ("a", null, 0); });
|
||||
|
||||
@@ -34,9 +34,16 @@ using System.Reflection;
|
||||
using System.Runtime.InteropServices;
|
||||
using System.Security.Permissions;
|
||||
|
||||
[assembly: AssemblyVersion (Consts.FxVersion)]
|
||||
|
||||
|
||||
#if MONO_POSIX_NETSTANDARD_BUILD
|
||||
[assembly: AssemblyVersion ("1.0.0.0")]
|
||||
[assembly: AssemblyTitle("Mono.Posix.NETStandard.dll")]
|
||||
#else
|
||||
[assembly: AssemblyVersion (Consts.FxVersion)]
|
||||
[assembly: AssemblyTitle("Mono.Posix.dll")]
|
||||
#endif
|
||||
|
||||
[assembly: AssemblyDescription("Unix Integration Classes")]
|
||||
|
||||
[assembly: CLSCompliant (true)]
|
||||
@@ -48,9 +55,11 @@ using System.Security.Permissions;
|
||||
|
||||
*/
|
||||
|
||||
#if !MONO_POSIX_NETSTANDARD_BUILD
|
||||
// We are using ../Open.snk for MONO_POSIX_NETSTANDARD_BUILD
|
||||
[assembly: AssemblyDelaySign (true)]
|
||||
[assembly: AssemblyKeyFile ("../mono.pub")]
|
||||
|
||||
#endif
|
||||
/*
|
||||
* TODO:
|
||||
*
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netstandard2.0</TargetFramework>
|
||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||
<AssemblyName>Mono.Posix.NETStandard</AssemblyName>
|
||||
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
|
||||
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
|
||||
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
|
||||
<EnableDefaultItems>false</EnableDefaultItems>
|
||||
<SignAssembly>true</SignAssembly>
|
||||
<DelaySign>true</DelaySign>
|
||||
<AssemblyOriginatorKeyFile>..\Open.snk</AssemblyOriginatorKeyFile>
|
||||
<!--<BaseIntermediateOutputPath>obj-netstandard2.0</BaseIntermediateOutputPath>
|
||||
<IntermediateOutputPath>obj-netstandard2.0</IntermediateOutputPath>-->
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<DefineConstants>$(DefineConstants);MONO_POSIX_NETSTANDARD_BUILD</DefineConstants>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(ForceUseLibC)' == 'true'">
|
||||
<DefineConstants>$(DefineConstants);FORCE_USE_LIBC_NOT_MSVC</DefineConstants>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Compile Include=".\Assembly\**\*.cs" />
|
||||
<Compile Include=".\Mono.Posix\**\*.cs" />
|
||||
<Compile Include=".\Mono.Unix\**\*.cs" />
|
||||
<Compile Include=".\Mono.Unix.Native\**\*.cs" />
|
||||
<Compile Include="..\..\build\common\Locale.cs" />
|
||||
<Compile Remove=".\Mono.Unix.Native\CdeclFunction.cs" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
@@ -153,7 +153,7 @@ namespace Mono.Remoting.Channels.Unix
|
||||
_pool = pool;
|
||||
_client = client;
|
||||
_stream = new BufferedStream (client.GetStream());
|
||||
_controlTime = DateTime.Now;
|
||||
_controlTime = DateTime.UtcNow;
|
||||
_buffer = new byte[UnixMessageIO.DefaultStreamBufferSize];
|
||||
}
|
||||
|
||||
@@ -270,7 +270,7 @@ namespace Mono.Remoting.Channels.Unix
|
||||
{
|
||||
lock (_pool)
|
||||
{
|
||||
entry.ControlTime = DateTime.Now; // Initialize timeout
|
||||
entry.ControlTime = DateTime.UtcNow; // Initialize timeout
|
||||
_pool.Add (entry);
|
||||
Monitor.Pulse (_pool);
|
||||
}
|
||||
@@ -295,7 +295,7 @@ namespace Mono.Remoting.Channels.Unix
|
||||
for (int n=0; n < _pool.Count; n++)
|
||||
{
|
||||
UnixConnection entry = (UnixConnection)_pool[n];
|
||||
if ( (DateTime.Now - entry.ControlTime).TotalSeconds > UnixConnectionPool.KeepAliveSeconds)
|
||||
if ( (DateTime.UtcNow - entry.ControlTime).TotalSeconds > UnixConnectionPool.KeepAliveSeconds)
|
||||
{
|
||||
CancelConnection (entry);
|
||||
_pool.RemoveAt(n);
|
||||
|
||||
@@ -309,6 +309,7 @@ namespace Mono.Unix.Native {
|
||||
public delegate void SignalHandler (int signal);
|
||||
|
||||
|
||||
#if !NETSTANDARD2_0
|
||||
internal class XPrintfFunctions
|
||||
{
|
||||
internal delegate object XPrintf (object[] parameters);
|
||||
@@ -335,6 +336,7 @@ namespace Mono.Unix.Native {
|
||||
syslog = new XPrintf (_syslog.Invoke);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
//
|
||||
// Convention: Functions that are part of the C standard library go here.
|
||||
@@ -378,7 +380,11 @@ namespace Mono.Unix.Native {
|
||||
//
|
||||
public class Stdlib
|
||||
{
|
||||
#if FORCE_USE_LIBC_NOT_MSVC
|
||||
internal const string LIBC = "c";
|
||||
#else
|
||||
internal const string LIBC = "msvcrt";
|
||||
#endif
|
||||
internal const string MPH = "MonoPosixHelper";
|
||||
|
||||
// It is possible for Mono.Posix and MonoPosixHelper to get out of sync,
|
||||
@@ -771,6 +777,7 @@ namespace Mono.Unix.Native {
|
||||
return sys_fprintf (stream, "%s", message);
|
||||
}
|
||||
|
||||
#if !NETSTANDARD2_0
|
||||
[Obsolete ("Not necessarily portable due to cdecl restrictions.\n" +
|
||||
"Use fprintf (IntPtr, string) instead.")]
|
||||
public static int fprintf (IntPtr stream, string format, params object[] parameters)
|
||||
@@ -781,6 +788,7 @@ namespace Mono.Unix.Native {
|
||||
Array.Copy (parameters, 0, _parameters, 2, parameters.Length);
|
||||
return (int) XPrintfFunctions.fprintf (_parameters);
|
||||
}
|
||||
#endif
|
||||
|
||||
/* SKIP: fscanf(3) */
|
||||
|
||||
@@ -793,6 +801,7 @@ namespace Mono.Unix.Native {
|
||||
return sys_printf ("%s", message);
|
||||
}
|
||||
|
||||
#if !NETSTANDARD2_0
|
||||
[Obsolete ("Not necessarily portable due to cdecl restrictions.\n" +
|
||||
"Use printf (string) instead.")]
|
||||
public static int printf (string format, params object[] parameters)
|
||||
@@ -802,6 +811,7 @@ namespace Mono.Unix.Native {
|
||||
Array.Copy (parameters, 0, _parameters, 1, parameters.Length);
|
||||
return (int) XPrintfFunctions.printf (_parameters);
|
||||
}
|
||||
#endif
|
||||
|
||||
/* SKIP: scanf(3) */
|
||||
|
||||
@@ -823,6 +833,7 @@ namespace Mono.Unix.Native {
|
||||
return sys_snprintf (s, (ulong) s.Capacity, "%s", message);
|
||||
}
|
||||
|
||||
#if !NETSTANDARD2_0
|
||||
[CLSCompliant (false)]
|
||||
[Obsolete ("Not necessarily portable due to cdecl restrictions.\n" +
|
||||
"Use snprintf (StringBuilder, string) instead.")]
|
||||
@@ -853,6 +864,7 @@ namespace Mono.Unix.Native {
|
||||
Array.Copy (parameters, 0, _parameters, 3, parameters.Length);
|
||||
return (int) XPrintfFunctions.snprintf (_parameters);
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
* SKIP:
|
||||
|
||||
@@ -4387,6 +4387,7 @@ namespace Mono.Unix.Native {
|
||||
return UnixMarshal.EscapeFormatString (message, new char[]{'m'});
|
||||
}
|
||||
|
||||
#if !NETSTANDARD2_0
|
||||
[Obsolete ("Not necessarily portable due to cdecl restrictions.\n" +
|
||||
"Use syslog(SyslogFacility, SyslogLevel, string) instead.")]
|
||||
public static int syslog (SyslogFacility facility, SyslogLevel level,
|
||||
@@ -4415,6 +4416,7 @@ namespace Mono.Unix.Native {
|
||||
Array.Copy (parameters, 0, _parameters, 2, parameters.Length);
|
||||
return (int) XPrintfFunctions.syslog (_parameters);
|
||||
}
|
||||
#endif
|
||||
|
||||
[DllImport (MPH, SetLastError=true,
|
||||
EntryPoint="Mono_Posix_Syscall_closelog")]
|
||||
|
||||
@@ -300,17 +300,35 @@ public class UnixEncoding : Encoding
|
||||
throw new ArgumentOutOfRangeException ("byteIndex", _("ArgRange_Array"));
|
||||
}
|
||||
|
||||
unsafe {
|
||||
fixed (char* p = s) {
|
||||
fixed (byte* b = bytes) {
|
||||
return GetBytes (p + charIndex, charCount, b + byteIndex, bytes.Length - byteIndex);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public unsafe override int GetBytes(char* chars, int charCount, byte* bytes, int byteCount)
|
||||
{
|
||||
if (bytes == null || chars == null)
|
||||
throw new ArgumentNullException (bytes == null ? "bytes" : "chars");
|
||||
|
||||
if (charCount < 0 || byteCount < 0)
|
||||
throw new ArgumentOutOfRangeException (charCount < 0 ? "charCount" : "byteCount");
|
||||
|
||||
// Convert the characters into bytes.
|
||||
char ch;
|
||||
int length = bytes.Length;
|
||||
int length = byteCount;
|
||||
uint pair;
|
||||
int posn = byteIndex;
|
||||
int posn = 0;
|
||||
int charIndex = 0;
|
||||
while (charCount > 0) {
|
||||
// Fetch the next UTF-16 character pair value.
|
||||
ch = s[charIndex++];
|
||||
ch = chars [charIndex++];
|
||||
if (ch >= '\uD800' && ch <= '\uDBFF' && charCount > 1) {
|
||||
// This may be the start of a surrogate pair.
|
||||
pair = (uint)(s[charIndex]);
|
||||
pair = (uint)(chars[charIndex]);
|
||||
if (pair >= (uint)0xDC00 && pair <= (uint)0xDFFF) {
|
||||
pair = (pair - (uint)0xDC00) +
|
||||
((((uint)ch) - (uint)0xD800) << 10) +
|
||||
@@ -326,7 +344,7 @@ public class UnixEncoding : Encoding
|
||||
}
|
||||
charCount -= 2;
|
||||
if (charCount >= 0) {
|
||||
bytes[posn++] = (byte) s [charIndex++];
|
||||
bytes[posn++] = (byte)chars [charIndex++];
|
||||
}
|
||||
continue;
|
||||
} else {
|
||||
@@ -365,7 +383,7 @@ public class UnixEncoding : Encoding
|
||||
}
|
||||
|
||||
// Return the final count to the caller.
|
||||
return posn - byteIndex;
|
||||
return posn;
|
||||
}
|
||||
|
||||
// Internal version of "GetCharCount" which can handle a rolling
|
||||
@@ -394,7 +412,7 @@ public class UnixEncoding : Encoding
|
||||
uint leftSoFar = (leftOverCount & (uint)0x0F);
|
||||
uint leftSize = ((leftOverCount >> 4) & (uint)0x0F);
|
||||
while (count > 0) {
|
||||
ch = (uint)(bytes[index++]);
|
||||
ch = (uint)(bytes [index++]);
|
||||
++next_raw;
|
||||
--count;
|
||||
if (leftSize == 0) {
|
||||
|
||||
@@ -325,27 +325,42 @@ namespace Mono.Unix {
|
||||
if (encoding == null)
|
||||
throw new ArgumentNullException ("encoding");
|
||||
|
||||
int min_byte_count = encoding.GetMaxByteCount(1);
|
||||
char[] copy = s.ToCharArray (index, count);
|
||||
byte[] marshal = new byte [encoding.GetByteCount (copy) + min_byte_count];
|
||||
if (index < 0 || count < 0)
|
||||
throw new ArgumentOutOfRangeException ((index < 0 ? "index" : "count"),
|
||||
"Non - negative number required.");
|
||||
|
||||
int bytes_copied = encoding.GetBytes (copy, 0, copy.Length, marshal, 0);
|
||||
if (s.Length - index < count)
|
||||
throw new ArgumentOutOfRangeException ("s", "Index and count must refer to a location within the string.");
|
||||
|
||||
if (bytes_copied != (marshal.Length-min_byte_count))
|
||||
throw new NotSupportedException ("encoding.GetBytes() doesn't equal encoding.GetByteCount()!");
|
||||
int null_terminator_count = encoding.GetMaxByteCount (1);
|
||||
int length_without_null = encoding.GetByteCount (s);
|
||||
int marshalLength = checked (length_without_null + null_terminator_count);
|
||||
|
||||
IntPtr mem = AllocHeap (marshal.Length);
|
||||
IntPtr mem = AllocHeap (marshalLength);
|
||||
if (mem == IntPtr.Zero)
|
||||
throw new UnixIOException (Native.Errno.ENOMEM);
|
||||
|
||||
bool copied = false;
|
||||
try {
|
||||
Marshal.Copy (marshal, 0, mem, marshal.Length);
|
||||
copied = true;
|
||||
}
|
||||
finally {
|
||||
if (!copied)
|
||||
FreeHeap (mem);
|
||||
unsafe {
|
||||
fixed (char* p = s) {
|
||||
byte* marshal = (byte*)mem;
|
||||
int bytes_copied;
|
||||
|
||||
try {
|
||||
bytes_copied = encoding.GetBytes (p + index, count, marshal, marshalLength);
|
||||
} catch {
|
||||
FreeHeap (mem);
|
||||
throw;
|
||||
}
|
||||
|
||||
if (bytes_copied != length_without_null) {
|
||||
FreeHeap (mem);
|
||||
throw new NotSupportedException ("encoding.GetBytes() doesn't equal encoding.GetByteCount()!");
|
||||
}
|
||||
|
||||
marshal += length_without_null;
|
||||
for (int i = 0; i < null_terminator_count; ++i)
|
||||
marshal[i] = 0;
|
||||
}
|
||||
}
|
||||
|
||||
return mem;
|
||||
|
||||
@@ -56,7 +56,7 @@ namespace MonoTests.Mono.Unix.Native {
|
||||
Assert.IsFalse (NativeConvert.ToSignum (st.signalReceived) == Signum.SIGURG,
|
||||
"#IH: Signal Handler invoked when it should have been removed!");
|
||||
}
|
||||
|
||||
#if !NETCOREAPP2_0
|
||||
[Test]
|
||||
// MSVCRT.DLL doesn't export snprintf(3).
|
||||
[Category ("NotDotNet")]
|
||||
@@ -92,6 +92,7 @@ namespace MonoTests.Mono.Unix.Native {
|
||||
Assert.AreEqual (s.ToString(), expected,
|
||||
"#SNPF: printf of many builtin types failed");
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
using NUnit.Framework;
|
||||
|
||||
using System;
|
||||
using System.Diagnostics;
|
||||
using System.Text;
|
||||
using System.Threading;
|
||||
using Mono.Unix;
|
||||
@@ -25,12 +26,12 @@ namespace MonoTests.Mono.Unix {
|
||||
static Thread CreateWaitSignalThread (UnixSignal signal, int timeout)
|
||||
{
|
||||
Thread t1 = new Thread(delegate() {
|
||||
DateTime start = DateTime.Now;
|
||||
var sw = Stopwatch.StartNew ();
|
||||
bool r = signal.WaitOne (timeout, false);
|
||||
DateTime end = DateTime.Now;
|
||||
sw.Stop ();
|
||||
Assert.AreEqual (signal.Count, 1);
|
||||
Assert.AreEqual (r, true);
|
||||
if ((end - start) > new TimeSpan (0, 0, timeout/1000))
|
||||
if (sw.Elapsed > new TimeSpan (0, 0, timeout/1000))
|
||||
throw new InvalidOperationException ("Signal slept too long");
|
||||
});
|
||||
return t1;
|
||||
@@ -248,12 +249,12 @@ namespace MonoTests.Mono.Unix {
|
||||
{
|
||||
Thread t1 = new Thread (delegate () {
|
||||
using (UnixSignal a = new UnixSignal (Signum.SIGINT)) {
|
||||
DateTime start = DateTime.Now;
|
||||
var sw = Stopwatch.StartNew ();
|
||||
bool r = a.WaitOne (5000, false);
|
||||
DateTime end = DateTime.Now;
|
||||
sw.Stop ();
|
||||
Assert.AreEqual (a.Count, 1);
|
||||
Assert.AreEqual (r, true);
|
||||
if ((end - start) > new TimeSpan (0, 0, 5))
|
||||
if (sw.Elapsed > new TimeSpan (0, 0, 5))
|
||||
throw new InvalidOperationException ("Signal slept too long");
|
||||
}
|
||||
});
|
||||
@@ -272,12 +273,12 @@ namespace MonoTests.Mono.Unix {
|
||||
{
|
||||
Thread t1 = new Thread (delegate () {
|
||||
using (UnixSignal a = new UnixSignal (Signum.SIGINT)) {
|
||||
DateTime start = DateTime.Now;
|
||||
var sw = Stopwatch.StartNew ();
|
||||
int idx = UnixSignal.WaitAny (new UnixSignal[]{a}, 5000);
|
||||
DateTime end = DateTime.Now;
|
||||
sw.Stop ();
|
||||
Assert.AreEqual (idx, 0);
|
||||
Assert.AreEqual (a.Count, 1);
|
||||
if ((end - start) > new TimeSpan (0, 0, 5))
|
||||
if (sw.Elapsed > new TimeSpan (0, 0, 5))
|
||||
throw new InvalidOperationException ("Signal slept too long");
|
||||
}
|
||||
});
|
||||
@@ -297,13 +298,13 @@ namespace MonoTests.Mono.Unix {
|
||||
Thread t1 = new Thread (delegate () {
|
||||
using (UnixSignal a = new UnixSignal (Signum.SIGINT))
|
||||
using (UnixSignal b = new UnixSignal (Signum.SIGTERM)) {
|
||||
DateTime start = DateTime.Now;
|
||||
var sw = Stopwatch.StartNew ();
|
||||
int idx = UnixSignal.WaitAny (new UnixSignal[]{a, b}, 5000);
|
||||
DateTime end = DateTime.Now;
|
||||
sw.Stop ();
|
||||
Assert.AreEqual (idx, 1);
|
||||
Assert.AreEqual (a.Count, 0);
|
||||
Assert.AreEqual (b.Count, 1);
|
||||
if ((end - start) > new TimeSpan (0, 0, 5))
|
||||
if (sw.Elapsed > new TimeSpan (0, 0, 5))
|
||||
throw new InvalidOperationException ("Signal slept too long");
|
||||
}
|
||||
});
|
||||
@@ -321,12 +322,12 @@ namespace MonoTests.Mono.Unix {
|
||||
public void TestNoEmit ()
|
||||
{
|
||||
using (UnixSignal u = new UnixSignal (Signum.SIGINT)) {
|
||||
DateTime start = DateTime.Now;
|
||||
var sw = Stopwatch.StartNew ();
|
||||
bool r = u.WaitOne (5100, false);
|
||||
Assert.AreEqual (r, false);
|
||||
DateTime end = DateTime.Now;
|
||||
if ((end - start) < new TimeSpan (0, 0, 5))
|
||||
throw new InvalidOperationException ("Signal didn't block for 5s; blocked for " + (end-start).ToString());
|
||||
sw.Stop ();
|
||||
if (sw.Elapsed < new TimeSpan (0, 0, 5))
|
||||
throw new InvalidOperationException ("Signal didn't block for 5s; blocked for " + sw.Elapsed.TotalSeconds.ToString());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
// Licensed to the .NET Foundation under one or more agreements.
|
||||
// The .NET Foundation licenses this file to you under the MIT license.
|
||||
// See the LICENSE file in the project root for more information.
|
||||
|
||||
using System.Reflection;
|
||||
using System.Resources;
|
||||
using System.Runtime.InteropServices;
|
||||
|
||||
[assembly: AssemblyTitle ("Mono.Profiler.Log")]
|
||||
[assembly: AssemblyDescription ("Mono Log Profiler API Library")]
|
||||
|
||||
[assembly: AssemblyCompany (Consts.MonoCompany)]
|
||||
[assembly: AssemblyProduct (Consts.MonoProduct)]
|
||||
[assembly: AssemblyCopyright (Consts.MonoCopyright)]
|
||||
|
||||
[assembly: AssemblyVersion (Consts.FxVersion)]
|
||||
[assembly: SatelliteContractVersion (Consts.FxVersion)]
|
||||
[assembly: AssemblyInformationalVersion (Consts.FxFileVersion)]
|
||||
[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
|
||||
|
||||
[assembly: ComVisible (false)]
|
||||
@@ -0,0 +1,12 @@
|
||||
thisdir = class/Mono.Profiler.Log
|
||||
include ../../build/rules.make
|
||||
|
||||
LIBRARY = Mono.Profiler.Log.dll
|
||||
LIBRARY_SNK = ../mono.snk
|
||||
|
||||
LIB_REFS = System System.Core
|
||||
LIB_MCS_FLAGS = /unsafe /keyfile:$(LIBRARY_SNK) /publicsign
|
||||
|
||||
NO_TEST = yes
|
||||
|
||||
include ../../build/library.make
|
||||
@@ -0,0 +1,113 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- WARNING: this file is autogenerated, don't modify it. Edit the .sources file of the corresponding assembly instead if you want to add/remove C# source files. -->
|
||||
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProductVersion>9.0.30729</ProductVersion>
|
||||
<SchemaVersion>2.0</SchemaVersion>
|
||||
<ProjectGuid>{58A188CE-DED8-48B0-98B7-065A260D21DF}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<NoWarn>1699</NoWarn>
|
||||
<HostPlatform Condition=" '$(HostPlatform)' == '' and '$(OS)' == 'Windows_NT'">win32</HostPlatform>
|
||||
<HostPlatform Condition=" '$(HostPlatform)' == '' and '$(OS)' == 'Unix' and $([System.IO.File]::Exists('/usr/lib/libc.dylib'))">darwin</HostPlatform>
|
||||
<HostPlatform Condition=" '$(HostPlatform)' == '' and '$(OS)' == 'Unix'">linux</HostPlatform>
|
||||
<OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>
|
||||
<IntermediateOutputPath>obj-net_4_x-$(HostPlatform)</IntermediateOutputPath>
|
||||
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
|
||||
<NoStdLib>True</NoStdLib>
|
||||
|
||||
<NoConfig>True</NoConfig>
|
||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>
|
||||
</RootNamespace>
|
||||
<AssemblyName>Mono.Profiler.Log</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<SignAssembly>true</SignAssembly>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<AssemblyOriginatorKeyFile>../mono.snk</AssemblyOriginatorKeyFile>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<NoWarn>1699</NoWarn>
|
||||
<Optimize>false</Optimize>
|
||||
<DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<NoWarn>1699</NoWarn>
|
||||
<Optimize>true</Optimize>
|
||||
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
|
||||
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
|
||||
is a problem to compile the Mono mscorlib.dll -->
|
||||
<PropertyGroup>
|
||||
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<ItemGroup>
|
||||
<Compile Include="..\..\build\common\Consts.cs" />
|
||||
<Compile Include="..\..\build\common\Locale.cs" />
|
||||
<Compile Include="Assembly\AssemblyInfo.cs" />
|
||||
<Compile Include="Mono.Profiler.Log\LogBufferHeader.cs" />
|
||||
<Compile Include="Mono.Profiler.Log\LogEnums.cs" />
|
||||
<Compile Include="Mono.Profiler.Log\LogEvent.cs" />
|
||||
<Compile Include="Mono.Profiler.Log\LogEvents.cs" />
|
||||
<Compile Include="Mono.Profiler.Log\LogEventVisitor.cs" />
|
||||
<Compile Include="Mono.Profiler.Log\LogException.cs" />
|
||||
<Compile Include="Mono.Profiler.Log\LogProcessor.cs" />
|
||||
<Compile Include="Mono.Profiler.Log\LogReader.cs" />
|
||||
<Compile Include="Mono.Profiler.Log\LogRuntimeProfiler.cs" />
|
||||
<Compile Include="Mono.Profiler.Log\LogStream.cs" />
|
||||
<Compile Include="Mono.Profiler.Log\LogStreamHeader.cs" />␍ </ItemGroup>
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
Other similar extension points exist, see Microsoft.Common.targets.
|
||||
<Target Name="BeforeBuild">
|
||||
</Target>
|
||||
<Target Name="AfterBuild">
|
||||
</Target>
|
||||
-->
|
||||
<PropertyGroup>
|
||||
<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
|
||||
|
||||
</PreBuildEvent>
|
||||
<PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
|
||||
|
||||
</PreBuildEvent>
|
||||
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
|
||||
|
||||
</PostBuildEvent>
|
||||
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
|
||||
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="../corlib/corlib-net_4_x.csproj">
|
||||
<Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
|
||||
<Name>corlib-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../System/System-net_4_x.csproj">
|
||||
<Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
|
||||
<Name>System-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../System.Core/System.Core-net_4_x.csproj">
|
||||
<Project>{359142A1-D80F-401E-AA64-7167C9317649}</Project>
|
||||
<Name>System.Core-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="Properties\" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
Assembly/AssemblyInfo.cs
|
||||
../../build/common/Consts.cs
|
||||
../../build/common/Locale.cs
|
||||
Mono.Profiler.Log/LogBufferHeader.cs
|
||||
Mono.Profiler.Log/LogEnums.cs
|
||||
Mono.Profiler.Log/LogEvent.cs
|
||||
Mono.Profiler.Log/LogEventVisitor.cs
|
||||
Mono.Profiler.Log/LogEvents.cs
|
||||
Mono.Profiler.Log/LogException.cs
|
||||
Mono.Profiler.Log/LogProcessor.cs
|
||||
Mono.Profiler.Log/LogReader.cs
|
||||
Mono.Profiler.Log/LogRuntimeProfiler.cs
|
||||
Mono.Profiler.Log/LogStream.cs
|
||||
Mono.Profiler.Log/LogStreamHeader.cs
|
||||
@@ -0,0 +1,46 @@
|
||||
// Licensed to the .NET Foundation under one or more agreements.
|
||||
// The .NET Foundation licenses this file to you under the MIT license.
|
||||
// See the LICENSE file in the project root for more information.
|
||||
|
||||
namespace Mono.Profiler.Log {
|
||||
|
||||
public sealed class LogBufferHeader {
|
||||
|
||||
const int Id = 0x4d504c01;
|
||||
|
||||
public LogStreamHeader StreamHeader { get; }
|
||||
|
||||
public int Length { get; }
|
||||
|
||||
public ulong TimeBase { get; }
|
||||
|
||||
public long PointerBase { get; }
|
||||
|
||||
public long ObjectBase { get; }
|
||||
|
||||
public long ThreadId { get; }
|
||||
|
||||
public long MethodBase { get; }
|
||||
|
||||
internal ulong CurrentTime { get; set; }
|
||||
|
||||
internal long CurrentMethod { get; set; }
|
||||
|
||||
internal LogBufferHeader (LogStreamHeader streamHeader, LogReader reader)
|
||||
{
|
||||
StreamHeader = streamHeader;
|
||||
|
||||
var id = reader.ReadInt32 ();
|
||||
|
||||
if (id != Id)
|
||||
throw new LogException ($"Invalid buffer header ID (0x{id:X}).");
|
||||
|
||||
Length = reader.ReadInt32 ();
|
||||
TimeBase = CurrentTime = reader.ReadUInt64 ();
|
||||
PointerBase = reader.ReadInt64 ();
|
||||
ObjectBase = reader.ReadInt64 ();
|
||||
ThreadId = reader.ReadInt64 ();
|
||||
MethodBase = CurrentMethod = reader.ReadInt64 ();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,212 @@
|
||||
// Licensed to the .NET Foundation under one or more agreements.
|
||||
// The .NET Foundation licenses this file to you under the MIT license.
|
||||
// See the LICENSE file in the project root for more information.
|
||||
|
||||
using System;
|
||||
|
||||
namespace Mono.Profiler.Log {
|
||||
|
||||
// mono/profiler/log.h : TYPE_*
|
||||
enum LogEventType {
|
||||
Allocation = 0,
|
||||
GC = 1,
|
||||
Metadata = 2,
|
||||
Method = 3,
|
||||
Exception = 4,
|
||||
Monitor = 5,
|
||||
Heap = 6,
|
||||
Sample = 7,
|
||||
Runtime = 8,
|
||||
Coverage = 9,
|
||||
Meta = 10,
|
||||
|
||||
AllocationNoBacktrace = 0 << 4,
|
||||
AllocationBacktrace = 1 << 4,
|
||||
|
||||
GCEvent = 1 << 4,
|
||||
GCResize = 2 << 4,
|
||||
GCMove = 3 << 4,
|
||||
GCHandleCreationNoBacktrace = 4 << 4,
|
||||
GCHandleDeletionNoBacktrace = 5 << 4,
|
||||
GCHandleCreationBacktrace = 6 << 4,
|
||||
GCHandleDeletionBacktrace = 7 << 4,
|
||||
GCFinalizeBegin = 8 << 4,
|
||||
GCFinalizeEnd = 9 << 4,
|
||||
GCFinalizeObjectBegin = 10 << 4,
|
||||
GCFinalizeObjectEnd = 11 << 4,
|
||||
|
||||
MetadataExtra = 0 << 4,
|
||||
MetadataEndLoad = 2 << 4,
|
||||
MetadataEndUnload = 4 << 4,
|
||||
|
||||
MethodLeave = 1 << 4,
|
||||
MethodEnter = 2 << 4,
|
||||
MethodLeaveExceptional = 3 << 4,
|
||||
MethodJit = 4 << 4,
|
||||
|
||||
ExceptionThrowNoBacktrace = 0 << 7,
|
||||
ExceptionThrowBacktrace = 1 << 7,
|
||||
ExceptionClause = 1 << 4,
|
||||
|
||||
MonitorNoBacktrace = 0 << 7,
|
||||
MonitorBacktrace = 1 << 7,
|
||||
|
||||
HeapBegin = 0 << 4,
|
||||
HeapEnd = 1 << 4,
|
||||
HeapObject = 2 << 4,
|
||||
HeapRoots = 3 << 4,
|
||||
|
||||
SampleHit = 0 << 4,
|
||||
SampleUnmanagedSymbol = 1 << 4,
|
||||
SampleUnmanagedBinary = 2 << 4,
|
||||
SampleCounterDescriptions = 3 << 4,
|
||||
SampleCounters = 4 << 4,
|
||||
|
||||
RuntimeJitHelper = 1 << 4,
|
||||
|
||||
CoverageAssembly = 0 << 4,
|
||||
CoverageMethod = 1 << 4,
|
||||
CoverageStatement = 2 << 4,
|
||||
CoverageClass = 3 << 4,
|
||||
|
||||
MetaSynchronizationPoint = 0 << 4,
|
||||
}
|
||||
|
||||
// mono/profiler/log.h : TYPE_*
|
||||
enum LogMetadataType {
|
||||
Class = 1,
|
||||
Image = 2,
|
||||
Assembly = 3,
|
||||
AppDomain = 4,
|
||||
Thread = 5,
|
||||
Context = 6,
|
||||
}
|
||||
|
||||
// mono/utils/mono-counters.h : MONO_COUNTER_*
|
||||
public enum LogCounterType {
|
||||
Int32 = 0,
|
||||
UInt32 = 1,
|
||||
Word = 2,
|
||||
Int64 = 3,
|
||||
UInt64 = 4,
|
||||
Double = 5,
|
||||
String = 6,
|
||||
Interval = 7,
|
||||
}
|
||||
|
||||
// mono/utils/mono-counters.h : MONO_COUNTER_*
|
||||
public enum LogCounterSection {
|
||||
Jit = 1 << 8,
|
||||
GC = 1 << 9,
|
||||
Metadata = 1 << 10,
|
||||
Generics = 1 << 11,
|
||||
Security = 1 << 12,
|
||||
Runtime = 1 << 13,
|
||||
System = 1 << 14,
|
||||
User = 1 << 15,
|
||||
Profiler = 1 << 16,
|
||||
}
|
||||
|
||||
// mono/utils/mono-counters.h : MONO_COUNTER_*
|
||||
public enum LogCounterUnit {
|
||||
Raw = 0 << 24,
|
||||
Bytes = 1 << 24,
|
||||
Time = 2 << 24,
|
||||
Count = 3 << 24,
|
||||
Percentage = 4 << 24,
|
||||
}
|
||||
|
||||
// mono/utils/mono-counters.h : MONO_COUNTER_*
|
||||
public enum LogCounterVariance {
|
||||
Monotonic = 1 << 28,
|
||||
Constant = 1 << 29,
|
||||
Variable = 1 << 30,
|
||||
}
|
||||
|
||||
// mono/metadata/profiler.h : MonoProfilerCodeBufferType
|
||||
public enum LogJitHelper {
|
||||
Unknown = 0,
|
||||
Method = 1,
|
||||
MethodTrampoline = 2,
|
||||
UnboxTrampoline = 3,
|
||||
ImtTrampoline = 4,
|
||||
GenericsTrampoline = 5,
|
||||
SpecificTrampoline = 6,
|
||||
Helper = 7,
|
||||
Monitor = 8,
|
||||
DelegateInvoke = 9,
|
||||
ExceptionHandling = 10,
|
||||
}
|
||||
|
||||
// mono/profiler/log.h : SAMPLE_*
|
||||
public enum LogSampleHitType {
|
||||
Cycles = 1,
|
||||
Instructions = 2,
|
||||
CacheMisses = 3,
|
||||
CacheHits = 4,
|
||||
Branches = 5,
|
||||
BranchMisses = 6,
|
||||
}
|
||||
|
||||
// mono/metadata/profiler.h : MonoProfilerGCRootType
|
||||
[Flags]
|
||||
public enum LogHeapRootAttributes {
|
||||
Pinning = 1 << 8,
|
||||
WeakReference = 2 << 8,
|
||||
Interior = 4 << 8,
|
||||
|
||||
Stack = 0,
|
||||
Finalizer = 1,
|
||||
Handle = 2,
|
||||
Other = 3,
|
||||
Miscellaneous = 4,
|
||||
|
||||
TypeMask = 0xff,
|
||||
}
|
||||
|
||||
// mono/profiler/log.h : MonoProfilerMonitorEvent
|
||||
public enum LogMonitorEvent {
|
||||
Contention = 1,
|
||||
Done = 2,
|
||||
Fail = 3,
|
||||
}
|
||||
|
||||
// mono/metadata/metadata.h : MonoExceptionEnum
|
||||
public enum LogExceptionClause {
|
||||
Catch = 0,
|
||||
Filter = 1,
|
||||
Finally = 2,
|
||||
Fault = 4,
|
||||
}
|
||||
|
||||
// mono/metadata/profiler.h : MonoProfilerGCEvent
|
||||
public enum LogGCEvent {
|
||||
Begin = 0,
|
||||
MarkBegin = 1,
|
||||
MarkEnd = 2,
|
||||
ReclaimBegin = 3,
|
||||
ReclaimEnd = 4,
|
||||
End = 5,
|
||||
PreStopWorld = 6,
|
||||
PostStopWorld = 7,
|
||||
PreStartWorld = 8,
|
||||
PostStartWorld = 9,
|
||||
PreStopWorldLocked = 10,
|
||||
PostStartWorldUnlocked = 11,
|
||||
}
|
||||
|
||||
// mono/metadata/mono-gc.h : MonoGCHandleType
|
||||
public enum LogGCHandleType {
|
||||
Weak = 0,
|
||||
WeakTrackResurrection = 1,
|
||||
Normal = 2,
|
||||
Pinned = 3,
|
||||
}
|
||||
|
||||
// mono/profiler/log.h : MonoProfilerSyncPointType
|
||||
public enum LogSynchronizationPoint {
|
||||
Periodic = 0,
|
||||
WorldStop = 1,
|
||||
WorldStart = 2,
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,75 @@
|
||||
// Licensed to the .NET Foundation under one or more agreements.
|
||||
// The .NET Foundation licenses this file to you under the MIT license.
|
||||
// See the LICENSE file in the project root for more information.
|
||||
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Linq;
|
||||
using System.Reflection;
|
||||
using System.Text;
|
||||
|
||||
namespace Mono.Profiler.Log {
|
||||
|
||||
public abstract class LogEvent {
|
||||
|
||||
const BindingFlags PropertyFlags = BindingFlags.DeclaredOnly | BindingFlags.Instance | BindingFlags.Public;
|
||||
|
||||
const string Indent = " ";
|
||||
|
||||
internal LogEvent ()
|
||||
{
|
||||
}
|
||||
|
||||
public LogBufferHeader Buffer { get; internal set; }
|
||||
|
||||
public ulong Timestamp { get; internal set; }
|
||||
|
||||
public override string ToString ()
|
||||
{
|
||||
var sb = new StringBuilder ();
|
||||
|
||||
ToString (this, sb, string.Empty, GetType ().Name, 0);
|
||||
|
||||
return sb.ToString ();
|
||||
}
|
||||
|
||||
static void ToString (object source, StringBuilder result, string indent, string header, int level)
|
||||
{
|
||||
result.AppendLine ($"{indent}{header} {{");
|
||||
|
||||
foreach (var prop in source.GetType ().GetProperties (PropertyFlags).OrderBy (p => p.MetadataToken)) {
|
||||
var name = prop.Name;
|
||||
var propIndent = indent + Indent;
|
||||
var value = prop.GetValue (source);
|
||||
|
||||
if (value is IList list) {
|
||||
result.AppendLine ($"{propIndent}{name} = [{list.Count}] {{");
|
||||
|
||||
for (var i = 0; i < list.Count; i++) {
|
||||
var elem = list [i];
|
||||
var type = elem.GetType ();
|
||||
var elemIndent = propIndent + Indent;
|
||||
var elemHeader = $"[{i}] = ";
|
||||
|
||||
if (type.IsClass && type != typeof (string))
|
||||
ToString (elem, result, elemIndent, $"{elemHeader}{type.Name}", level + 1);
|
||||
else
|
||||
result.AppendLine ($"{elemIndent}{elemHeader}{elem}");
|
||||
}
|
||||
|
||||
result.AppendLine ($"{propIndent}}}");
|
||||
} else
|
||||
result.AppendLine ($"{propIndent}{name} = {value}");
|
||||
}
|
||||
|
||||
var end = $"{indent}}}";
|
||||
|
||||
if (level == 0)
|
||||
result.Append (end);
|
||||
else
|
||||
result.AppendLine (end);
|
||||
}
|
||||
|
||||
internal abstract void Accept (LogEventVisitor visitor);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,197 @@
|
||||
// Licensed to the .NET Foundation under one or more agreements.
|
||||
// The .NET Foundation licenses this file to you under the MIT license.
|
||||
// See the LICENSE file in the project root for more information.
|
||||
|
||||
namespace Mono.Profiler.Log {
|
||||
|
||||
public abstract class LogEventVisitor {
|
||||
|
||||
public virtual void VisitBefore (LogEvent ev)
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void VisitAfter (LogEvent ev)
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void Visit (AppDomainLoadEvent ev)
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void Visit (AppDomainUnloadEvent ev)
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void Visit (AppDomainNameEvent ev)
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void Visit (ContextLoadEvent ev)
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void Visit (ContextUnloadEvent ev)
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void Visit (ThreadStartEvent ev)
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void Visit (ThreadEndEvent ev)
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void Visit (ThreadNameEvent ev)
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void Visit (ImageLoadEvent ev)
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void Visit (ImageUnloadEvent ev)
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void Visit (AssemblyLoadEvent ev)
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void Visit (AssemblyUnloadEvent ev)
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void Visit (ClassLoadEvent ev)
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void Visit (JitEvent ev)
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void Visit (JitHelperEvent ev)
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void Visit (AllocationEvent ev)
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void Visit (HeapBeginEvent ev)
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void Visit (HeapEndEvent ev)
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void Visit (HeapObjectEvent ev)
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void Visit (HeapRootsEvent ev)
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void Visit (GCEvent ev)
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void Visit (GCResizeEvent ev)
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void Visit (GCMoveEvent ev)
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void Visit (GCHandleCreationEvent ev)
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void Visit (GCHandleDeletionEvent ev)
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void Visit (GCFinalizeBeginEvent ev)
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void Visit (GCFinalizeEndEvent ev)
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void Visit (GCFinalizeObjectBeginEvent ev)
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void Visit (GCFinalizeObjectEndEvent ev)
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void Visit (ThrowEvent ev)
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void Visit (ExceptionClauseEvent ev)
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void Visit (EnterEvent ev)
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void Visit (LeaveEvent ev)
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void Visit (ExceptionalLeaveEvent ev)
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void Visit (MonitorEvent ev)
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void Visit (SampleHitEvent ev)
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void Visit (CounterSamplesEvent ev)
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void Visit (CounterDescriptionsEvent ev)
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void Visit (UnmanagedBinaryEvent ev)
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void Visit (UnmanagedSymbolEvent ev)
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void Visit (AssemblyCoverageEvent ev)
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void Visit (ClassCoverageEvent ev)
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void Visit (MethodCoverageEvent ev)
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void Visit (StatementCoverageEvent ev)
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void Visit (SynchronizationPointEvent ev)
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,625 @@
|
||||
// Licensed to the .NET Foundation under one or more agreements.
|
||||
// The .NET Foundation licenses this file to you under the MIT license.
|
||||
// See the LICENSE file in the project root for more information.
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace Mono.Profiler.Log {
|
||||
|
||||
public sealed class AppDomainLoadEvent : LogEvent {
|
||||
|
||||
public long AppDomainId { get; internal set; }
|
||||
|
||||
internal override void Accept (LogEventVisitor visitor)
|
||||
{
|
||||
visitor.Visit (this);
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class AppDomainUnloadEvent : LogEvent {
|
||||
|
||||
public long AppDomainId { get; internal set; }
|
||||
|
||||
internal override void Accept (LogEventVisitor visitor)
|
||||
{
|
||||
visitor.Visit (this);
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class AppDomainNameEvent : LogEvent {
|
||||
|
||||
public long AppDomainId { get; internal set; }
|
||||
|
||||
public string Name { get; internal set; }
|
||||
|
||||
internal override void Accept (LogEventVisitor visitor)
|
||||
{
|
||||
visitor.Visit (this);
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class ContextLoadEvent : LogEvent {
|
||||
|
||||
public long ContextId { get; internal set; }
|
||||
|
||||
public long AppDomainId { get; internal set; }
|
||||
|
||||
internal override void Accept (LogEventVisitor visitor)
|
||||
{
|
||||
visitor.Visit (this);
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class ContextUnloadEvent : LogEvent {
|
||||
|
||||
public long ContextId { get; internal set; }
|
||||
|
||||
public long AppDomainId { get; internal set; }
|
||||
|
||||
internal override void Accept (LogEventVisitor visitor)
|
||||
{
|
||||
visitor.Visit (this);
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class ThreadStartEvent : LogEvent {
|
||||
|
||||
public long ThreadId { get; internal set; }
|
||||
|
||||
internal override void Accept (LogEventVisitor visitor)
|
||||
{
|
||||
visitor.Visit (this);
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class ThreadEndEvent : LogEvent {
|
||||
|
||||
public long ThreadId { get; internal set; }
|
||||
|
||||
internal override void Accept (LogEventVisitor visitor)
|
||||
{
|
||||
visitor.Visit (this);
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class ThreadNameEvent : LogEvent {
|
||||
|
||||
public long ThreadId { get; internal set; }
|
||||
|
||||
public string Name { get; internal set; }
|
||||
|
||||
internal override void Accept (LogEventVisitor visitor)
|
||||
{
|
||||
visitor.Visit (this);
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class ImageLoadEvent : LogEvent {
|
||||
|
||||
public long ImagePointer { get; internal set; }
|
||||
|
||||
public string Name { get; internal set; }
|
||||
|
||||
internal override void Accept (LogEventVisitor visitor)
|
||||
{
|
||||
visitor.Visit (this);
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class ImageUnloadEvent : LogEvent {
|
||||
|
||||
public long ImagePointer { get; internal set; }
|
||||
|
||||
public string Name { get; internal set; }
|
||||
|
||||
internal override void Accept (LogEventVisitor visitor)
|
||||
{
|
||||
visitor.Visit (this);
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class AssemblyLoadEvent : LogEvent {
|
||||
|
||||
public long AssemblyPointer { get; internal set; }
|
||||
|
||||
public long ImagePointer { get; internal set; }
|
||||
|
||||
public string Name { get; internal set; }
|
||||
|
||||
internal override void Accept (LogEventVisitor visitor)
|
||||
{
|
||||
visitor.Visit (this);
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class AssemblyUnloadEvent : LogEvent {
|
||||
|
||||
public long AssemblyPointer { get; internal set; }
|
||||
|
||||
public long ImagePointer { get; internal set; }
|
||||
|
||||
public string Name { get; internal set; }
|
||||
|
||||
internal override void Accept (LogEventVisitor visitor)
|
||||
{
|
||||
visitor.Visit (this);
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class ClassLoadEvent : LogEvent {
|
||||
|
||||
public long ClassPointer { get; internal set; }
|
||||
|
||||
public long ImagePointer { get; internal set; }
|
||||
|
||||
public string Name { get; internal set; }
|
||||
|
||||
internal override void Accept (LogEventVisitor visitor)
|
||||
{
|
||||
visitor.Visit (this);
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class JitEvent : LogEvent {
|
||||
|
||||
public long MethodPointer { get; internal set; }
|
||||
|
||||
public long CodePointer { get; internal set; }
|
||||
|
||||
public long CodeSize { get; internal set; }
|
||||
|
||||
public string Name { get; internal set; }
|
||||
|
||||
internal override void Accept (LogEventVisitor visitor)
|
||||
{
|
||||
visitor.Visit (this);
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class JitHelperEvent : LogEvent {
|
||||
|
||||
public LogJitHelper Type { get; internal set; }
|
||||
|
||||
public long BufferPointer { get; internal set; }
|
||||
|
||||
public long BufferSize { get; internal set; }
|
||||
|
||||
public string Name { get; internal set; }
|
||||
|
||||
internal override void Accept (LogEventVisitor visitor)
|
||||
{
|
||||
visitor.Visit (this);
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class AllocationEvent : LogEvent {
|
||||
|
||||
public long ClassPointer { get; internal set; }
|
||||
|
||||
public long ObjectPointer { get; internal set; }
|
||||
|
||||
public long ObjectSize { get; internal set; }
|
||||
|
||||
public IReadOnlyList<long> Backtrace { get; internal set; }
|
||||
|
||||
internal override void Accept (LogEventVisitor visitor)
|
||||
{
|
||||
visitor.Visit (this);
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class HeapBeginEvent : LogEvent {
|
||||
|
||||
internal override void Accept (LogEventVisitor visitor)
|
||||
{
|
||||
visitor.Visit (this);
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class HeapEndEvent : LogEvent {
|
||||
|
||||
internal override void Accept (LogEventVisitor visitor)
|
||||
{
|
||||
visitor.Visit (this);
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class HeapObjectEvent : LogEvent {
|
||||
|
||||
public struct HeapObjectReference {
|
||||
|
||||
public long Offset { get; internal set; }
|
||||
|
||||
public long ObjectPointer { get; internal set; }
|
||||
}
|
||||
|
||||
public long ObjectPointer { get; internal set; }
|
||||
|
||||
public long ClassPointer { get; internal set; }
|
||||
|
||||
public long ObjectSize { get; internal set; }
|
||||
|
||||
public IReadOnlyList<HeapObjectReference> References { get; internal set; }
|
||||
|
||||
internal override void Accept (LogEventVisitor visitor)
|
||||
{
|
||||
visitor.Visit (this);
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class HeapRootsEvent : LogEvent {
|
||||
|
||||
public struct HeapRoot {
|
||||
|
||||
public long ObjectPointer { get; internal set; }
|
||||
|
||||
public LogHeapRootAttributes Attributes { get; internal set; }
|
||||
|
||||
public long ExtraInfo { get; internal set; }
|
||||
}
|
||||
|
||||
public long MaxGenerationCollectionCount { get; internal set; }
|
||||
|
||||
public IReadOnlyList<HeapRoot> Roots { get; internal set; }
|
||||
|
||||
internal override void Accept (LogEventVisitor visitor)
|
||||
{
|
||||
visitor.Visit (this);
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class GCEvent : LogEvent {
|
||||
|
||||
public LogGCEvent Type { get; internal set; }
|
||||
|
||||
public byte Generation { get; internal set; }
|
||||
|
||||
internal override void Accept (LogEventVisitor visitor)
|
||||
{
|
||||
visitor.Visit (this);
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class GCResizeEvent : LogEvent {
|
||||
|
||||
public long NewSize { get; internal set; }
|
||||
|
||||
internal override void Accept (LogEventVisitor visitor)
|
||||
{
|
||||
visitor.Visit (this);
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class GCMoveEvent : LogEvent {
|
||||
|
||||
public IReadOnlyList<long> OldObjectPointers { get; internal set; }
|
||||
|
||||
public IReadOnlyList<long> NewObjectPointers { get; internal set; }
|
||||
|
||||
internal override void Accept (LogEventVisitor visitor)
|
||||
{
|
||||
visitor.Visit (this);
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class GCHandleCreationEvent : LogEvent {
|
||||
|
||||
public LogGCHandleType Type { get; internal set; }
|
||||
|
||||
public long Handle { get; internal set; }
|
||||
|
||||
public long ObjectPointer { get; internal set; }
|
||||
|
||||
public IReadOnlyList<long> Backtrace { get; internal set; }
|
||||
|
||||
internal override void Accept (LogEventVisitor visitor)
|
||||
{
|
||||
visitor.Visit (this);
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class GCHandleDeletionEvent : LogEvent {
|
||||
|
||||
public LogGCHandleType Type { get; internal set; }
|
||||
|
||||
public long Handle { get; internal set; }
|
||||
|
||||
public IReadOnlyList<long> Backtrace { get; internal set; }
|
||||
|
||||
internal override void Accept (LogEventVisitor visitor)
|
||||
{
|
||||
visitor.Visit (this);
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class GCFinalizeBeginEvent : LogEvent {
|
||||
|
||||
internal override void Accept (LogEventVisitor visitor)
|
||||
{
|
||||
visitor.Visit (this);
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class GCFinalizeEndEvent : LogEvent {
|
||||
|
||||
internal override void Accept (LogEventVisitor visitor)
|
||||
{
|
||||
visitor.Visit (this);
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class GCFinalizeObjectBeginEvent : LogEvent {
|
||||
|
||||
public long ObjectPointer { get; internal set; }
|
||||
|
||||
internal override void Accept (LogEventVisitor visitor)
|
||||
{
|
||||
visitor.Visit (this);
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class GCFinalizeObjectEndEvent : LogEvent {
|
||||
|
||||
public long ObjectPointer { get; internal set; }
|
||||
|
||||
internal override void Accept (LogEventVisitor visitor)
|
||||
{
|
||||
visitor.Visit (this);
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class ThrowEvent : LogEvent {
|
||||
|
||||
public long ObjectPointer { get; internal set; }
|
||||
|
||||
public IReadOnlyList<long> Backtrace { get; internal set; }
|
||||
|
||||
internal override void Accept (LogEventVisitor visitor)
|
||||
{
|
||||
visitor.Visit (this);
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class ExceptionClauseEvent : LogEvent {
|
||||
|
||||
public LogExceptionClause Type { get; internal set; }
|
||||
|
||||
public long Index { get; internal set; }
|
||||
|
||||
public long MethodPointer { get; internal set; }
|
||||
|
||||
public long ObjectPointer { get; internal set; }
|
||||
|
||||
internal override void Accept (LogEventVisitor visitor)
|
||||
{
|
||||
visitor.Visit (this);
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class EnterEvent : LogEvent {
|
||||
|
||||
public long MethodPointer { get; internal set; }
|
||||
|
||||
internal override void Accept (LogEventVisitor visitor)
|
||||
{
|
||||
visitor.Visit (this);
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class LeaveEvent : LogEvent {
|
||||
|
||||
public long MethodPointer { get; internal set; }
|
||||
|
||||
internal override void Accept (LogEventVisitor visitor)
|
||||
{
|
||||
visitor.Visit (this);
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class ExceptionalLeaveEvent : LogEvent {
|
||||
|
||||
public long MethodPointer { get; internal set; }
|
||||
|
||||
internal override void Accept (LogEventVisitor visitor)
|
||||
{
|
||||
visitor.Visit (this);
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class MonitorEvent : LogEvent {
|
||||
|
||||
public LogMonitorEvent Event { get; internal set; }
|
||||
|
||||
public long ObjectPointer { get; internal set; }
|
||||
|
||||
public IReadOnlyList<long> Backtrace { get; internal set; }
|
||||
|
||||
internal override void Accept (LogEventVisitor visitor)
|
||||
{
|
||||
visitor.Visit (this);
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class SampleHitEvent : LogEvent {
|
||||
|
||||
public LogSampleHitType Type { get; internal set; }
|
||||
|
||||
public long ThreadId { get; internal set; }
|
||||
|
||||
public IReadOnlyList<long> UnmanagedBacktrace { get; internal set; }
|
||||
|
||||
public IReadOnlyList<long> ManagedBacktrace { get; internal set; }
|
||||
|
||||
internal override void Accept (LogEventVisitor visitor)
|
||||
{
|
||||
visitor.Visit (this);
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class CounterSamplesEvent : LogEvent {
|
||||
|
||||
public struct CounterSample {
|
||||
|
||||
public long Index { get; internal set; }
|
||||
|
||||
public LogCounterType Type { get; internal set; }
|
||||
|
||||
public object Value { get; internal set; }
|
||||
}
|
||||
|
||||
public IReadOnlyList<CounterSample> Samples { get; internal set; }
|
||||
|
||||
internal override void Accept (LogEventVisitor visitor)
|
||||
{
|
||||
visitor.Visit (this);
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class CounterDescriptionsEvent : LogEvent {
|
||||
|
||||
public struct CounterDescription {
|
||||
|
||||
public LogCounterSection Section { get; internal set; }
|
||||
|
||||
public string SectionName { get; internal set; }
|
||||
|
||||
public string CounterName { get; internal set; }
|
||||
|
||||
public LogCounterType Type { get; internal set; }
|
||||
|
||||
public LogCounterUnit Unit { get; internal set; }
|
||||
|
||||
public LogCounterVariance Variance { get; internal set; }
|
||||
|
||||
public long Index { get; internal set; }
|
||||
}
|
||||
|
||||
public IReadOnlyList<CounterDescription> Descriptions { get; internal set; }
|
||||
|
||||
internal override void Accept (LogEventVisitor visitor)
|
||||
{
|
||||
visitor.Visit (this);
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class UnmanagedBinaryEvent : LogEvent {
|
||||
|
||||
public long SegmentPointer { get; internal set; }
|
||||
|
||||
public long SegmentOffset { get; internal set; }
|
||||
|
||||
public long SegmentSize { get; internal set; }
|
||||
|
||||
public string FileName { get; internal set; }
|
||||
|
||||
internal override void Accept (LogEventVisitor visitor)
|
||||
{
|
||||
visitor.Visit (this);
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class UnmanagedSymbolEvent : LogEvent {
|
||||
|
||||
public long CodePointer { get; internal set; }
|
||||
|
||||
public long CodeSize { get; internal set; }
|
||||
|
||||
public string Name { get; internal set; }
|
||||
|
||||
internal override void Accept (LogEventVisitor visitor)
|
||||
{
|
||||
visitor.Visit (this);
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class AssemblyCoverageEvent : LogEvent {
|
||||
|
||||
public string AssemblyName { get; internal set; }
|
||||
|
||||
public Guid Guid { get; internal set; }
|
||||
|
||||
public string FileName { get; internal set; }
|
||||
|
||||
public long NumberOfMethods { get; internal set; }
|
||||
|
||||
public long FullyCovered { get; internal set; }
|
||||
|
||||
public long PartiallyCovered { get; internal set; }
|
||||
|
||||
internal override void Accept (LogEventVisitor visitor)
|
||||
{
|
||||
visitor.Visit (this);
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class ClassCoverageEvent : LogEvent {
|
||||
|
||||
public string AssemblyName { get; internal set; }
|
||||
|
||||
public string ClassName { get; internal set; }
|
||||
|
||||
public long NumberOfMethods { get; internal set; }
|
||||
|
||||
public long FullyCovered { get; internal set; }
|
||||
|
||||
public long PartiallyCovered { get; internal set; }
|
||||
|
||||
internal override void Accept (LogEventVisitor visitor)
|
||||
{
|
||||
visitor.Visit (this);
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class MethodCoverageEvent : LogEvent {
|
||||
|
||||
public string AssemblyName { get; internal set; }
|
||||
|
||||
public string ClassName { get; internal set; }
|
||||
|
||||
public string MethodName { get; internal set; }
|
||||
|
||||
public string MethodSignature { get; internal set; }
|
||||
|
||||
public string FileName { get; internal set; }
|
||||
|
||||
public ulong MetadataToken { get; internal set; }
|
||||
|
||||
public long MethodId { get; internal set; }
|
||||
|
||||
public long NumberOfStatements { get; internal set; }
|
||||
|
||||
internal override void Accept (LogEventVisitor visitor)
|
||||
{
|
||||
visitor.Visit (this);
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class StatementCoverageEvent : LogEvent {
|
||||
|
||||
public long MethodId { get; internal set; }
|
||||
|
||||
public long RelativeILOffset { get; internal set; }
|
||||
|
||||
public ulong Counter { get; internal set; }
|
||||
|
||||
public long Line { get; internal set; }
|
||||
|
||||
public long Column { get; internal set; }
|
||||
|
||||
internal override void Accept (LogEventVisitor visitor)
|
||||
{
|
||||
visitor.Visit (this);
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class SynchronizationPointEvent : LogEvent {
|
||||
|
||||
public LogSynchronizationPoint Type { get; internal set; }
|
||||
|
||||
internal override void Accept (LogEventVisitor visitor)
|
||||
{
|
||||
visitor.Visit (this);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
// Licensed to the .NET Foundation under one or more agreements.
|
||||
// The .NET Foundation licenses this file to you under the MIT license.
|
||||
// See the LICENSE file in the project root for more information.
|
||||
|
||||
using System;
|
||||
|
||||
namespace Mono.Profiler.Log {
|
||||
|
||||
public sealed class LogException : Exception {
|
||||
|
||||
public LogException (string message)
|
||||
: base (message)
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,577 @@
|
||||
// Licensed to the .NET Foundation under one or more agreements.
|
||||
// The .NET Foundation licenses this file to you under the MIT license.
|
||||
// See the LICENSE file in the project root for more information.
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Threading;
|
||||
|
||||
namespace Mono.Profiler.Log {
|
||||
|
||||
public sealed class LogProcessor {
|
||||
|
||||
public LogReader Reader { get; }
|
||||
|
||||
public LogEventVisitor ImmediateVisitor { get; }
|
||||
|
||||
public LogEventVisitor SortedVisitor { get; }
|
||||
|
||||
public LogStreamHeader StreamHeader { get; private set; }
|
||||
|
||||
LogBufferHeader _bufferHeader;
|
||||
|
||||
ulong _time;
|
||||
|
||||
bool _used;
|
||||
|
||||
public LogProcessor (LogReader reader, LogEventVisitor immediateVisitor, LogEventVisitor sortedVisitor)
|
||||
{
|
||||
if (reader == null)
|
||||
throw new ArgumentNullException (nameof (reader));
|
||||
|
||||
Reader = reader;
|
||||
ImmediateVisitor = immediateVisitor;
|
||||
SortedVisitor = sortedVisitor;
|
||||
}
|
||||
|
||||
public void Process ()
|
||||
{
|
||||
Process (CancellationToken.None);
|
||||
}
|
||||
|
||||
static void ProcessEvent (LogEventVisitor visitor, LogEvent ev)
|
||||
{
|
||||
if (visitor != null) {
|
||||
visitor.VisitBefore (ev);
|
||||
ev.Accept (visitor);
|
||||
visitor.VisitAfter (ev);
|
||||
}
|
||||
}
|
||||
|
||||
void ProcessEvents (List<LogEvent> events, CancellationToken token)
|
||||
{
|
||||
foreach (var ev in events.OrderBy (x => x.Timestamp)) {
|
||||
token.ThrowIfCancellationRequested ();
|
||||
ProcessEvent (SortedVisitor, ev);
|
||||
}
|
||||
|
||||
events.Clear ();
|
||||
}
|
||||
|
||||
public void Process (CancellationToken token)
|
||||
{
|
||||
if (_used)
|
||||
throw new InvalidOperationException ("This log processor cannot be reused.");
|
||||
|
||||
_used = true;
|
||||
StreamHeader = new LogStreamHeader (Reader);
|
||||
|
||||
var events = new List<LogEvent> (Environment.ProcessorCount * 1000);
|
||||
|
||||
while (!Reader.BaseStream.EndOfStream) {
|
||||
token.ThrowIfCancellationRequested ();
|
||||
|
||||
_bufferHeader = new LogBufferHeader (StreamHeader, Reader);
|
||||
|
||||
// Use the manual position tracking in LogReader so we're
|
||||
// compatible with non-seekable streams.
|
||||
var goal = Reader.Position + _bufferHeader.Length;
|
||||
|
||||
while (Reader.Position < goal) {
|
||||
token.ThrowIfCancellationRequested ();
|
||||
|
||||
var ev = ReadEvent ();
|
||||
|
||||
ProcessEvent (ImmediateVisitor, ev);
|
||||
events.Add (ev);
|
||||
|
||||
if (ev is SynchronizationPointEvent)
|
||||
ProcessEvents (events, token);
|
||||
}
|
||||
}
|
||||
|
||||
ProcessEvents (events, token);
|
||||
}
|
||||
|
||||
LogEvent ReadEvent ()
|
||||
{
|
||||
var type = Reader.ReadByte ();
|
||||
var basicType = (LogEventType) (type & 0xf);
|
||||
var extType = (LogEventType) (type & 0xf0);
|
||||
|
||||
_time = ReadTime ();
|
||||
|
||||
switch (basicType) {
|
||||
case LogEventType.Allocation:
|
||||
switch (extType) {
|
||||
case LogEventType.AllocationBacktrace:
|
||||
case LogEventType.AllocationNoBacktrace:
|
||||
return new AllocationEvent {
|
||||
ClassPointer = ReadPointer (),
|
||||
ObjectPointer = ReadObject (),
|
||||
ObjectSize = (long) Reader.ReadULeb128 (),
|
||||
Backtrace = ReadBacktrace (extType == LogEventType.AllocationBacktrace),
|
||||
};
|
||||
default:
|
||||
throw new LogException ($"Invalid extended event type ({extType}).");
|
||||
}
|
||||
case LogEventType.GC:
|
||||
switch (extType) {
|
||||
case LogEventType.GCEvent:
|
||||
return new GCEvent {
|
||||
Type = (LogGCEvent) Reader.ReadByte (),
|
||||
Generation = Reader.ReadByte (),
|
||||
};
|
||||
case LogEventType.GCResize:
|
||||
return new GCResizeEvent {
|
||||
NewSize = (long) Reader.ReadULeb128 (),
|
||||
};
|
||||
case LogEventType.GCMove: {
|
||||
var list = new long [(int) Reader.ReadULeb128 ()];
|
||||
|
||||
for (var i = 0; i < list.Length; i++)
|
||||
list [i] = ReadObject ();
|
||||
|
||||
return new GCMoveEvent {
|
||||
OldObjectPointers = list.Where ((_, i) => i % 2 == 0).ToArray (),
|
||||
NewObjectPointers = list.Where ((_, i) => i % 2 != 0).ToArray (),
|
||||
};
|
||||
}
|
||||
case LogEventType.GCHandleCreationNoBacktrace:
|
||||
case LogEventType.GCHandleCreationBacktrace:
|
||||
return new GCHandleCreationEvent {
|
||||
Type = (LogGCHandleType) Reader.ReadULeb128 (),
|
||||
Handle = (long) Reader.ReadULeb128 (),
|
||||
ObjectPointer = ReadObject (),
|
||||
Backtrace = ReadBacktrace (extType == LogEventType.GCHandleCreationBacktrace),
|
||||
};
|
||||
case LogEventType.GCHandleDeletionNoBacktrace:
|
||||
case LogEventType.GCHandleDeletionBacktrace:
|
||||
return new GCHandleDeletionEvent {
|
||||
Type = (LogGCHandleType) Reader.ReadULeb128 (),
|
||||
Handle = (long) Reader.ReadULeb128 (),
|
||||
Backtrace = ReadBacktrace (extType == LogEventType.GCHandleDeletionBacktrace),
|
||||
};
|
||||
case LogEventType.GCFinalizeBegin:
|
||||
return new GCFinalizeBeginEvent ();
|
||||
case LogEventType.GCFinalizeEnd:
|
||||
return new GCFinalizeEndEvent ();
|
||||
case LogEventType.GCFinalizeObjectBegin:
|
||||
return new GCFinalizeObjectBeginEvent {
|
||||
ObjectPointer = ReadObject (),
|
||||
};
|
||||
case LogEventType.GCFinalizeObjectEnd:
|
||||
return new GCFinalizeObjectEndEvent {
|
||||
ObjectPointer = ReadObject (),
|
||||
};
|
||||
default:
|
||||
throw new LogException ($"Invalid extended event type ({extType}).");
|
||||
}
|
||||
case LogEventType.Metadata: {
|
||||
var load = false;
|
||||
var unload = false;
|
||||
|
||||
switch (extType) {
|
||||
case LogEventType.MetadataExtra:
|
||||
break;
|
||||
case LogEventType.MetadataEndLoad:
|
||||
load = true;
|
||||
break;
|
||||
case LogEventType.MetadataEndUnload:
|
||||
unload = true;
|
||||
break;
|
||||
default:
|
||||
throw new LogException ($"Invalid extended event type ({extType}).");
|
||||
}
|
||||
|
||||
var metadataType = (LogMetadataType) Reader.ReadByte ();
|
||||
|
||||
switch (metadataType) {
|
||||
case LogMetadataType.Class:
|
||||
if (load) {
|
||||
return new ClassLoadEvent {
|
||||
ClassPointer = ReadPointer (),
|
||||
ImagePointer = ReadPointer (),
|
||||
Name = Reader.ReadCString (),
|
||||
};
|
||||
} else
|
||||
throw new LogException ("Invalid class metadata event.");
|
||||
case LogMetadataType.Image:
|
||||
if (load) {
|
||||
return new ImageLoadEvent {
|
||||
ImagePointer = ReadPointer (),
|
||||
Name = Reader.ReadCString (),
|
||||
};
|
||||
} else if (unload) {
|
||||
return new ImageUnloadEvent {
|
||||
ImagePointer = ReadPointer (),
|
||||
Name = Reader.ReadCString (),
|
||||
};
|
||||
} else
|
||||
throw new LogException ("Invalid image metadata event.");
|
||||
case LogMetadataType.Assembly:
|
||||
if (load) {
|
||||
return new AssemblyLoadEvent {
|
||||
AssemblyPointer = ReadPointer (),
|
||||
ImagePointer = ReadPointer (),
|
||||
Name = Reader.ReadCString (),
|
||||
};
|
||||
} else if (unload) {
|
||||
return new AssemblyUnloadEvent {
|
||||
AssemblyPointer = ReadPointer (),
|
||||
ImagePointer = ReadPointer (),
|
||||
Name = Reader.ReadCString (),
|
||||
};
|
||||
} else
|
||||
throw new LogException ("Invalid assembly metadata event.");
|
||||
case LogMetadataType.AppDomain:
|
||||
if (load) {
|
||||
return new AppDomainLoadEvent {
|
||||
AppDomainId = ReadPointer (),
|
||||
};
|
||||
} else if (unload) {
|
||||
return new AppDomainUnloadEvent {
|
||||
AppDomainId = ReadPointer (),
|
||||
};
|
||||
} else {
|
||||
return new AppDomainNameEvent {
|
||||
AppDomainId = ReadPointer (),
|
||||
Name = Reader.ReadCString (),
|
||||
};
|
||||
}
|
||||
case LogMetadataType.Thread:
|
||||
if (load) {
|
||||
return new ThreadStartEvent {
|
||||
ThreadId = ReadPointer (),
|
||||
};
|
||||
} else if (unload) {
|
||||
return new ThreadEndEvent {
|
||||
ThreadId = ReadPointer (),
|
||||
};
|
||||
} else {
|
||||
return new ThreadNameEvent {
|
||||
ThreadId = ReadPointer (),
|
||||
Name = Reader.ReadCString (),
|
||||
};
|
||||
}
|
||||
case LogMetadataType.Context:
|
||||
if (load) {
|
||||
return new ContextLoadEvent {
|
||||
ContextId = ReadPointer (),
|
||||
AppDomainId = ReadPointer (),
|
||||
};
|
||||
} else if (unload) {
|
||||
return new ContextUnloadEvent {
|
||||
ContextId = ReadPointer (),
|
||||
AppDomainId = ReadPointer (),
|
||||
};
|
||||
} else
|
||||
throw new LogException ("Invalid context metadata event.");
|
||||
default:
|
||||
throw new LogException ($"Invalid metadata type ({metadataType}).");
|
||||
}
|
||||
}
|
||||
case LogEventType.Method:
|
||||
switch (extType) {
|
||||
case LogEventType.MethodLeave:
|
||||
return new LeaveEvent {
|
||||
MethodPointer = ReadMethod (),
|
||||
};
|
||||
case LogEventType.MethodEnter:
|
||||
return new EnterEvent {
|
||||
MethodPointer = ReadMethod (),
|
||||
};
|
||||
case LogEventType.MethodLeaveExceptional:
|
||||
return new ExceptionalLeaveEvent {
|
||||
MethodPointer = ReadMethod (),
|
||||
};
|
||||
case LogEventType.MethodJit:
|
||||
return new JitEvent {
|
||||
MethodPointer = ReadMethod (),
|
||||
CodePointer = ReadPointer (),
|
||||
CodeSize = (long) Reader.ReadULeb128 (),
|
||||
Name = Reader.ReadCString (),
|
||||
};
|
||||
default:
|
||||
throw new LogException ($"Invalid extended event type ({extType}).");
|
||||
}
|
||||
case LogEventType.Exception:
|
||||
switch (extType) {
|
||||
case LogEventType.ExceptionThrowNoBacktrace:
|
||||
case LogEventType.ExceptionThrowBacktrace:
|
||||
return new ThrowEvent {
|
||||
ObjectPointer = ReadObject (),
|
||||
Backtrace = ReadBacktrace (extType == LogEventType.ExceptionThrowBacktrace),
|
||||
};
|
||||
case LogEventType.ExceptionClause:
|
||||
return new ExceptionClauseEvent {
|
||||
Type = (LogExceptionClause) Reader.ReadByte (),
|
||||
Index = (long) Reader.ReadULeb128 (),
|
||||
MethodPointer = ReadMethod (),
|
||||
ObjectPointer = ReadObject (),
|
||||
};
|
||||
default:
|
||||
throw new LogException ($"Invalid extended event type ({extType}).");
|
||||
}
|
||||
case LogEventType.Monitor:
|
||||
switch (extType) {
|
||||
case LogEventType.MonitorNoBacktrace:
|
||||
case LogEventType.MonitorBacktrace:
|
||||
return new MonitorEvent {
|
||||
Event = (LogMonitorEvent) Reader.ReadByte (),
|
||||
ObjectPointer = ReadObject (),
|
||||
Backtrace = ReadBacktrace (extType == LogEventType.MonitorBacktrace),
|
||||
};
|
||||
default:
|
||||
throw new LogException ($"Invalid extended event type ({extType}).");
|
||||
}
|
||||
case LogEventType.Heap:
|
||||
switch (extType) {
|
||||
case LogEventType.HeapBegin:
|
||||
return new HeapBeginEvent ();
|
||||
case LogEventType.HeapEnd:
|
||||
return new HeapEndEvent ();
|
||||
case LogEventType.HeapObject: {
|
||||
var ev = new HeapObjectEvent {
|
||||
ObjectPointer = ReadObject (),
|
||||
ClassPointer = ReadPointer (),
|
||||
ObjectSize = (long) Reader.ReadULeb128 (),
|
||||
};
|
||||
|
||||
var list = new HeapObjectEvent.HeapObjectReference [(int) Reader.ReadULeb128 ()];
|
||||
|
||||
for (var i = 0; i < list.Length; i++) {
|
||||
list [i] = new HeapObjectEvent.HeapObjectReference {
|
||||
Offset = (long) Reader.ReadULeb128 (),
|
||||
ObjectPointer = ReadObject (),
|
||||
};
|
||||
}
|
||||
|
||||
ev.References = list;
|
||||
|
||||
return ev;
|
||||
}
|
||||
case LogEventType.HeapRoots: {
|
||||
// TODO: This entire event makes no sense.
|
||||
|
||||
var ev = new HeapRootsEvent ();
|
||||
var list = new HeapRootsEvent.HeapRoot [(int) Reader.ReadULeb128 ()];
|
||||
|
||||
ev.MaxGenerationCollectionCount = (long) Reader.ReadULeb128 ();
|
||||
|
||||
for (var i = 0; i < list.Length; i++) {
|
||||
list [i] = new HeapRootsEvent.HeapRoot {
|
||||
ObjectPointer = ReadObject (),
|
||||
Attributes = (LogHeapRootAttributes) Reader.ReadByte (),
|
||||
ExtraInfo = (long) Reader.ReadULeb128 (),
|
||||
};
|
||||
}
|
||||
|
||||
ev.Roots = list;
|
||||
|
||||
return ev;
|
||||
}
|
||||
default:
|
||||
throw new LogException ($"Invalid extended event type ({extType}).");
|
||||
}
|
||||
case LogEventType.Sample:
|
||||
switch (extType) {
|
||||
case LogEventType.SampleHit:
|
||||
return new SampleHitEvent {
|
||||
Type = (LogSampleHitType) Reader.ReadByte (),
|
||||
ThreadId = ReadPointer (),
|
||||
UnmanagedBacktrace = ReadBacktrace (true, false),
|
||||
ManagedBacktrace = ReadBacktrace (true),
|
||||
};
|
||||
case LogEventType.SampleUnmanagedSymbol:
|
||||
return new UnmanagedSymbolEvent {
|
||||
CodePointer = ReadPointer (),
|
||||
CodeSize = (long) Reader.ReadULeb128 (),
|
||||
Name = Reader.ReadCString (),
|
||||
};
|
||||
case LogEventType.SampleUnmanagedBinary:
|
||||
return new UnmanagedBinaryEvent {
|
||||
SegmentPointer = ReadPointer (),
|
||||
SegmentOffset = (long) Reader.ReadULeb128 (),
|
||||
SegmentSize = (long) Reader.ReadULeb128 (),
|
||||
FileName = Reader.ReadCString (),
|
||||
};
|
||||
case LogEventType.SampleCounterDescriptions: {
|
||||
var ev = new CounterDescriptionsEvent ();
|
||||
var list = new CounterDescriptionsEvent.CounterDescription [(int) Reader.ReadULeb128 ()];
|
||||
|
||||
for (var i = 0; i < list.Length; i++) {
|
||||
var section = (LogCounterSection) Reader.ReadULeb128 ();
|
||||
|
||||
list [i] = new CounterDescriptionsEvent.CounterDescription {
|
||||
Section = section,
|
||||
SectionName = section == LogCounterSection.User ? Reader.ReadCString () : string.Empty,
|
||||
CounterName = Reader.ReadCString (),
|
||||
Type = (LogCounterType) Reader.ReadByte (),
|
||||
Unit = (LogCounterUnit) Reader.ReadByte (),
|
||||
Variance = (LogCounterVariance) Reader.ReadByte (),
|
||||
Index = (long) Reader.ReadULeb128 (),
|
||||
};
|
||||
}
|
||||
|
||||
ev.Descriptions = list;
|
||||
|
||||
return ev;
|
||||
}
|
||||
case LogEventType.SampleCounters: {
|
||||
var ev = new CounterSamplesEvent ();
|
||||
var list = new List<CounterSamplesEvent.CounterSample> ();
|
||||
|
||||
while (true) {
|
||||
var index = (long) Reader.ReadULeb128 ();
|
||||
|
||||
if (index == 0)
|
||||
break;
|
||||
|
||||
var counterType = (LogCounterType) Reader.ReadByte ();
|
||||
|
||||
object value = null;
|
||||
|
||||
switch (counterType) {
|
||||
case LogCounterType.String:
|
||||
value = Reader.ReadByte () == 1 ? Reader.ReadCString () : null;
|
||||
break;
|
||||
case LogCounterType.Int32:
|
||||
case LogCounterType.Word:
|
||||
case LogCounterType.Int64:
|
||||
case LogCounterType.Interval:
|
||||
value = Reader.ReadSLeb128 ();
|
||||
break;
|
||||
case LogCounterType.UInt32:
|
||||
case LogCounterType.UInt64:
|
||||
value = Reader.ReadULeb128 ();
|
||||
break;
|
||||
case LogCounterType.Double:
|
||||
value = Reader.ReadDouble ();
|
||||
break;
|
||||
default:
|
||||
throw new LogException ($"Invalid counter type ({counterType}).");
|
||||
}
|
||||
|
||||
list.Add (new CounterSamplesEvent.CounterSample {
|
||||
Index = index,
|
||||
Type = counterType,
|
||||
Value = value,
|
||||
});
|
||||
}
|
||||
|
||||
ev.Samples = list;
|
||||
|
||||
return ev;
|
||||
}
|
||||
default:
|
||||
throw new LogException ($"Invalid extended event type ({extType}).");
|
||||
}
|
||||
case LogEventType.Runtime:
|
||||
switch (extType) {
|
||||
case LogEventType.RuntimeJitHelper: {
|
||||
var helperType = (LogJitHelper) Reader.ReadByte ();
|
||||
|
||||
return new JitHelperEvent {
|
||||
Type = helperType,
|
||||
BufferPointer = ReadPointer (),
|
||||
BufferSize = (long) Reader.ReadULeb128 (),
|
||||
Name = helperType == LogJitHelper.SpecificTrampoline ? Reader.ReadCString () : string.Empty,
|
||||
};
|
||||
}
|
||||
default:
|
||||
throw new LogException ($"Invalid extended event type ({extType}).");
|
||||
}
|
||||
case LogEventType.Coverage:
|
||||
switch (extType) {
|
||||
case LogEventType.CoverageAssembly:
|
||||
return new AssemblyCoverageEvent {
|
||||
AssemblyName = Reader.ReadCString (),
|
||||
Guid = Guid.Parse (Reader.ReadCString ()),
|
||||
FileName = Reader.ReadCString (),
|
||||
NumberOfMethods = (long) Reader.ReadULeb128 (),
|
||||
FullyCovered = (long) Reader.ReadULeb128 (),
|
||||
PartiallyCovered = (long) Reader.ReadULeb128 (),
|
||||
};
|
||||
case LogEventType.CoverageMethod:
|
||||
return new MethodCoverageEvent {
|
||||
AssemblyName = Reader.ReadCString (),
|
||||
ClassName = Reader.ReadCString (),
|
||||
MethodName = Reader.ReadCString (),
|
||||
MethodSignature = Reader.ReadCString (),
|
||||
FileName = Reader.ReadCString (),
|
||||
MetadataToken = Reader.ReadULeb128 (),
|
||||
MethodId = (long) Reader.ReadULeb128 (),
|
||||
NumberOfStatements = (long) Reader.ReadULeb128 (),
|
||||
};
|
||||
case LogEventType.CoverageStatement:
|
||||
return new StatementCoverageEvent {
|
||||
MethodId = (long) Reader.ReadULeb128 (),
|
||||
RelativeILOffset = (long) Reader.ReadULeb128 (),
|
||||
Counter = Reader.ReadULeb128 (),
|
||||
Line = (long) Reader.ReadULeb128 (),
|
||||
Column = (long) Reader.ReadULeb128 (),
|
||||
};
|
||||
case LogEventType.CoverageClass:
|
||||
return new ClassCoverageEvent {
|
||||
AssemblyName = Reader.ReadCString (),
|
||||
ClassName = Reader.ReadCString (),
|
||||
NumberOfMethods = (long) Reader.ReadULeb128 (),
|
||||
FullyCovered = (long) Reader.ReadULeb128 (),
|
||||
PartiallyCovered = (long) Reader.ReadULeb128 (),
|
||||
};
|
||||
default:
|
||||
throw new LogException ($"Invalid extended event type ({extType}).");
|
||||
}
|
||||
case LogEventType.Meta:
|
||||
switch (extType) {
|
||||
case LogEventType.MetaSynchronizationPoint:
|
||||
return new SynchronizationPointEvent {
|
||||
Type = (LogSynchronizationPoint) Reader.ReadByte (),
|
||||
};
|
||||
default:
|
||||
throw new LogException ($"Invalid extended event type ({extType}).");
|
||||
}
|
||||
default:
|
||||
throw new LogException ($"Invalid basic event type ({basicType}).");
|
||||
}
|
||||
}
|
||||
|
||||
long ReadPointer ()
|
||||
{
|
||||
var ptr = Reader.ReadSLeb128 () + _bufferHeader.PointerBase;
|
||||
|
||||
return StreamHeader.PointerSize == sizeof (long) ? ptr : ptr & 0xffffffffL;
|
||||
}
|
||||
|
||||
long ReadObject ()
|
||||
{
|
||||
return Reader.ReadSLeb128 () + _bufferHeader.ObjectBase;
|
||||
}
|
||||
|
||||
long ReadMethod ()
|
||||
{
|
||||
return _bufferHeader.CurrentMethod += Reader.ReadSLeb128 ();
|
||||
}
|
||||
|
||||
ulong ReadTime ()
|
||||
{
|
||||
return _bufferHeader.CurrentTime += Reader.ReadULeb128 ();
|
||||
}
|
||||
|
||||
IReadOnlyList<long> ReadBacktrace (bool actuallyRead, bool managed = true)
|
||||
{
|
||||
if (!actuallyRead)
|
||||
return Array.Empty<long> ();
|
||||
|
||||
var list = new long [(int) Reader.ReadULeb128 ()];
|
||||
|
||||
for (var i = 0; i < list.Length; i++)
|
||||
list [i] = managed ? ReadMethod () : ReadPointer ();
|
||||
|
||||
return list;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,157 @@
|
||||
// Licensed to the .NET Foundation under one or more agreements.
|
||||
// The .NET Foundation licenses this file to you under the MIT license.
|
||||
// See the LICENSE file in the project root for more information.
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Text;
|
||||
|
||||
namespace Mono.Profiler.Log {
|
||||
|
||||
public sealed class LogReader : IDisposable {
|
||||
|
||||
public static Encoding Encoding { get; } = Encoding.UTF8;
|
||||
|
||||
public LogStream BaseStream => (LogStream) _reader.BaseStream;
|
||||
|
||||
public long Position { get; private set; }
|
||||
|
||||
readonly BinaryReader _reader;
|
||||
|
||||
byte[] _stringBuffer = new byte [1024];
|
||||
|
||||
public LogReader (LogStream stream, bool leaveOpen)
|
||||
{
|
||||
_reader = new BinaryReader (stream, Encoding, leaveOpen);
|
||||
}
|
||||
|
||||
public void Dispose ()
|
||||
{
|
||||
_reader.Dispose ();
|
||||
}
|
||||
|
||||
internal byte ReadByte ()
|
||||
{
|
||||
var b = _reader.ReadByte ();
|
||||
|
||||
Position += sizeof (byte);
|
||||
|
||||
return b;
|
||||
}
|
||||
|
||||
internal ushort ReadUInt16 ()
|
||||
{
|
||||
var i = _reader.ReadUInt16 ();
|
||||
|
||||
Position += sizeof (ushort);
|
||||
|
||||
return i;
|
||||
}
|
||||
|
||||
internal int ReadInt32 ()
|
||||
{
|
||||
var i = _reader.ReadInt32 ();
|
||||
|
||||
Position += sizeof (int);
|
||||
|
||||
return i;
|
||||
}
|
||||
|
||||
internal long ReadInt64 ()
|
||||
{
|
||||
var i = _reader.ReadInt64 ();
|
||||
|
||||
Position += sizeof (long);
|
||||
|
||||
return i;
|
||||
}
|
||||
|
||||
internal ulong ReadUInt64 ()
|
||||
{
|
||||
var i = _reader.ReadUInt64 ();
|
||||
|
||||
Position += sizeof (ulong);
|
||||
|
||||
return i;
|
||||
}
|
||||
|
||||
internal double ReadDouble ()
|
||||
{
|
||||
var d = _reader.ReadDouble ();
|
||||
|
||||
Position += sizeof (double);
|
||||
|
||||
return d;
|
||||
}
|
||||
|
||||
internal string ReadHeaderString ()
|
||||
{
|
||||
var bytes = new byte [ReadInt32 ()];
|
||||
|
||||
// ReadBytes doesn't necessarily read the specified amount of
|
||||
// bytes, so just do it this way.
|
||||
for (var i = 0; i < bytes.Length; i++)
|
||||
bytes [i] = ReadByte ();
|
||||
|
||||
return Encoding.GetString (bytes);
|
||||
}
|
||||
|
||||
internal string ReadCString ()
|
||||
{
|
||||
var pos = 0;
|
||||
|
||||
byte val;
|
||||
|
||||
while ((val = ReadByte ()) != 0) {
|
||||
if (pos == _stringBuffer.Length)
|
||||
Array.Resize (ref _stringBuffer, System.Math.Max (_stringBuffer.Length * 2, pos + 1));
|
||||
|
||||
_stringBuffer [pos++] = val;
|
||||
}
|
||||
|
||||
return Encoding.GetString (_stringBuffer, 0, pos);
|
||||
}
|
||||
|
||||
internal long ReadSLeb128 ()
|
||||
{
|
||||
long result = 0;
|
||||
var shift = 0;
|
||||
|
||||
while (true) {
|
||||
var b = ReadByte ();
|
||||
|
||||
result |= (long) (b & 0x7f) << shift;
|
||||
shift += 7;
|
||||
|
||||
if ((b & 0x80) != 0x80) {
|
||||
if (shift < sizeof (long) * 8 && (b & 0x40) == 0x40)
|
||||
result |= -(1L << shift);
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
internal ulong ReadULeb128 ()
|
||||
{
|
||||
ulong result = 0;
|
||||
var shift = 0;
|
||||
|
||||
while (true) {
|
||||
var b = ReadByte ();
|
||||
|
||||
result |= (ulong) (b & 0x7f) << shift;
|
||||
|
||||
if ((b & 0x80) != 0x80)
|
||||
break;
|
||||
|
||||
shift += 7;
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
// Licensed to the .NET Foundation under one or more agreements.
|
||||
// The .NET Foundation licenses this file to you under the MIT license.
|
||||
// See the LICENSE file in the project root for more information.
|
||||
|
||||
using System.Runtime.InteropServices;
|
||||
|
||||
namespace Mono.Profiler.Log {
|
||||
|
||||
public static class LogRuntimeProfiler {
|
||||
|
||||
// TODO: Runtime profiler interface.
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,71 @@
|
||||
// Licensed to the .NET Foundation under one or more agreements.
|
||||
// The .NET Foundation licenses this file to you under the MIT license.
|
||||
// See the LICENSE file in the project root for more information.
|
||||
|
||||
using System;
|
||||
using System.IO;
|
||||
|
||||
namespace Mono.Profiler.Log {
|
||||
|
||||
public class LogStream : Stream {
|
||||
|
||||
public Stream BaseStream { get; }
|
||||
|
||||
public virtual bool EndOfStream => BaseStream.Position == BaseStream.Length;
|
||||
|
||||
public override bool CanRead => true;
|
||||
|
||||
public override bool CanSeek => false;
|
||||
|
||||
public override bool CanWrite => false;
|
||||
|
||||
public override long Length => throw new NotSupportedException ();
|
||||
|
||||
public override long Position {
|
||||
get => throw new NotSupportedException ();
|
||||
set => throw new NotSupportedException ();
|
||||
}
|
||||
|
||||
public LogStream (Stream baseStream)
|
||||
{
|
||||
if (baseStream == null)
|
||||
throw new ArgumentNullException (nameof (baseStream));
|
||||
|
||||
if (!baseStream.CanRead)
|
||||
throw new ArgumentException ("Stream does not support reading.", nameof (baseStream));
|
||||
|
||||
BaseStream = baseStream;
|
||||
}
|
||||
|
||||
protected override void Dispose (bool disposing)
|
||||
{
|
||||
if (disposing)
|
||||
BaseStream.Dispose ();
|
||||
}
|
||||
|
||||
public override void Flush ()
|
||||
{
|
||||
throw new NotSupportedException ();
|
||||
}
|
||||
|
||||
public override int Read (byte[] buffer, int offset, int count)
|
||||
{
|
||||
return BaseStream.Read (buffer, offset, count);
|
||||
}
|
||||
|
||||
public override long Seek (long offset, SeekOrigin origin)
|
||||
{
|
||||
throw new NotSupportedException ();
|
||||
}
|
||||
|
||||
public override void SetLength (long value)
|
||||
{
|
||||
throw new NotSupportedException ();
|
||||
}
|
||||
|
||||
public override void Write (byte[] buffer, int offset, int count)
|
||||
{
|
||||
throw new NotSupportedException ();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,55 @@
|
||||
// Licensed to the .NET Foundation under one or more agreements.
|
||||
// The .NET Foundation licenses this file to you under the MIT license.
|
||||
// See the LICENSE file in the project root for more information.
|
||||
|
||||
using System;
|
||||
|
||||
namespace Mono.Profiler.Log {
|
||||
|
||||
public sealed class LogStreamHeader {
|
||||
|
||||
const int Id = 0x4d505a01;
|
||||
|
||||
public Version Version { get; }
|
||||
|
||||
public int FormatVersion { get; }
|
||||
|
||||
public byte PointerSize { get; }
|
||||
|
||||
public ulong StartupTime { get; }
|
||||
|
||||
public int TimerOverhead { get; }
|
||||
|
||||
public int Flags { get; }
|
||||
|
||||
public int ProcessId { get; }
|
||||
|
||||
public int Port { get; }
|
||||
|
||||
public string Arguments { get; }
|
||||
|
||||
public string Architecture { get; }
|
||||
|
||||
public string OperatingSystem { get; }
|
||||
|
||||
internal LogStreamHeader (LogReader reader)
|
||||
{
|
||||
var id = reader.ReadInt32 ();
|
||||
|
||||
if (id != Id)
|
||||
throw new LogException ($"Invalid stream header ID (0x{id:X}).");
|
||||
|
||||
Version = new Version (reader.ReadByte (), reader.ReadByte ());
|
||||
FormatVersion = reader.ReadByte ();
|
||||
PointerSize = reader.ReadByte ();
|
||||
StartupTime = reader.ReadUInt64 ();
|
||||
TimerOverhead = reader.ReadInt32 ();
|
||||
Flags = reader.ReadInt32 ();
|
||||
ProcessId = reader.ReadInt32 ();
|
||||
Port = reader.ReadUInt16 ();
|
||||
Arguments = reader.ReadHeaderString ();
|
||||
Architecture = reader.ReadHeaderString ();
|
||||
OperatingSystem = reader.ReadHeaderString ();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -27,6 +27,7 @@ using System;
|
||||
using System.IO;
|
||||
using System.Net;
|
||||
using System.Net.Security;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using SSA = System.Security.Authentication;
|
||||
using System.Security.Cryptography.X509Certificates;
|
||||
@@ -86,6 +87,10 @@ namespace Mono.Security.Interface
|
||||
|
||||
void EndWrite (IAsyncResult asyncResult);
|
||||
|
||||
Task WriteAsync (byte[] buffer, int offset, int count, CancellationToken cancellationToken);
|
||||
|
||||
Task ShutdownAsync ();
|
||||
|
||||
TransportContext TransportContext {
|
||||
get;
|
||||
}
|
||||
|
||||
@@ -387,7 +387,7 @@ namespace Mono.Security.X509 {
|
||||
byte[] nullPassword = {0, 0};
|
||||
calculatedMac = MAC(nullPassword, macSalt.Value, _iterations, authSafeData);
|
||||
if (!Compare (macValue, calculatedMac))
|
||||
throw new CryptographicException ("Invalid MAC - file may have been tampe red!");
|
||||
throw new CryptographicException ("Invalid MAC - file may have been tampered with!");
|
||||
_password = nullPassword;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -27,6 +27,7 @@ Mono.Security.Cryptography/PKCS8Test.cs
|
||||
Mono.Security.Cryptography/RSAManagedTest.cs
|
||||
Mono.Security.Cryptography/SHA224ManagedTest.cs
|
||||
Mono.Security.Cryptography/SHA224Test.cs
|
||||
Mono.Security.Interface/TestProvider.cs
|
||||
Mono.Security.Protocol.Ntlm/ChallengeResponseTest.cs
|
||||
Mono.Security.Protocol.Ntlm/MessageBaseTest.cs
|
||||
Mono.Security.Protocol.Ntlm/Type1MessageTest.cs
|
||||
|
||||
@@ -0,0 +1,47 @@
|
||||
//
|
||||
// TestProvider.cs
|
||||
//
|
||||
// Author:
|
||||
// Martin Baulig <[email protected]>
|
||||
//
|
||||
// Copyright (c) 2017 Xamarin, Inc.
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
// of this software and associated documentation files (the "Software"), to deal
|
||||
// in the Software without restriction, including without limitation the rights
|
||||
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
// copies of the Software, and to permit persons to whom the Software is
|
||||
// furnished to do so, subject to the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be included in
|
||||
// all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
// THE SOFTWARE.
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Security.Cryptography;
|
||||
using System.Text;
|
||||
|
||||
using Mono.Security;
|
||||
using Mono.Security.Interface;
|
||||
using NUnit.Framework;
|
||||
|
||||
namespace MonoTests.Mono.Security
|
||||
{
|
||||
[TestFixture]
|
||||
public class TestProvider
|
||||
{
|
||||
[Test]
|
||||
public void GetProvider ()
|
||||
{
|
||||
var provider = MonoTlsProviderFactory.GetProvider ();
|
||||
Assert.IsNotNull (provider, "TLS Provider");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -310,19 +310,20 @@ namespace System.IO.MemoryMappedFiles
|
||||
[MonoLimitation ("Named mappings scope is process local")]
|
||||
public static MemoryMappedFile OpenExisting (string mapName)
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
return OpenExisting (mapName, MemoryMappedFileRights.ReadWrite);
|
||||
}
|
||||
|
||||
[MonoLimitation ("Named mappings scope is process local")]
|
||||
public static MemoryMappedFile OpenExisting (string mapName, MemoryMappedFileRights desiredAccessRights)
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
return OpenExisting (mapName, desiredAccessRights, HandleInheritability.None);
|
||||
}
|
||||
|
||||
[MonoLimitation ("Named mappings scope is process local")]
|
||||
public static MemoryMappedFile OpenExisting (string mapName, MemoryMappedFileRights desiredAccessRights, HandleInheritability inheritability)
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
// FIXME: Actually use desiredAccessRights
|
||||
return CoreShmCreate (mapName, 0, MemoryMappedFileAccess.ReadWrite, MemoryMappedFileOptions.None, null, inheritability, FileMode.Open);
|
||||
}
|
||||
|
||||
public MemoryMappedViewStream CreateViewStream ()
|
||||
@@ -393,10 +394,9 @@ namespace System.IO.MemoryMappedFiles
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public SafeMemoryMappedFileHandle SafeMemoryMappedFileHandle {
|
||||
get {
|
||||
throw new NotImplementedException ();
|
||||
return handle;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -301,9 +301,12 @@ namespace MonoTests.System.IO.MemoryMappedFiles {
|
||||
var name = MkNamedMapping ();
|
||||
using (var m0 = MemoryMappedFile.CreateNew(name, 4096, MemoryMappedFileAccess.ReadWrite)) {
|
||||
using (var m1 = MemoryMappedFile.CreateOrOpen (name, 4096, MemoryMappedFileAccess.ReadWrite)) {
|
||||
using (MemoryMappedViewAccessor v0 = m0.CreateViewAccessor (), v1 = m1.CreateViewAccessor ()) {
|
||||
v0.Write (10, 0x12345);
|
||||
Assert.AreEqual (0x12345, v1.ReadInt32 (10));
|
||||
using (var m2 = MemoryMappedFile.OpenExisting (name)) {
|
||||
using (MemoryMappedViewAccessor v0 = m0.CreateViewAccessor (), v1 = m1.CreateViewAccessor (), v2 = m2.CreateViewAccessor ()) {
|
||||
v0.Write (10, 0x12345);
|
||||
Assert.AreEqual (0x12345, v1.ReadInt32 (10));
|
||||
Assert.AreEqual (0x12345, v2.ReadInt32 (10));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -466,5 +469,13 @@ namespace MonoTests.System.IO.MemoryMappedFiles {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void OpenExistingWithNoExistingThrows()
|
||||
{
|
||||
Assert.Throws<FileNotFoundException>(() => {
|
||||
MemoryMappedFile.OpenExisting (MkNamedMapping ());
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
#include common_System.Core.dll.sources
|
||||
#include dynamic_System.Core.dll.sources
|
||||
|
||||
System.Security.Cryptography/AesCryptoServiceProvider.cs
|
||||
System.Security.Cryptography/AesTransform.cs
|
||||
System.Security.Cryptography/MD5Cng.cs
|
||||
System.Security.Cryptography/SHA1Cng.cs
|
||||
System.Security.Cryptography/SHA256Cng.cs
|
||||
System.Security.Cryptography/SHA384Cng.cs
|
||||
System.Security.Cryptography/SHA512Cng.cs
|
||||
|
||||
../referencesource/System.Core/System/Security/Cryptography/AesManaged.cs
|
||||
../referencesource/System.Core/System/Security/Cryptography/ECDiffieHellman.cs
|
||||
../referencesource/System.Core/System/Security/Cryptography/ECKeyXmlFormat.cs
|
||||
@@ -0,0 +1 @@
|
||||
#include mobile_System.Data.dll.sources
|
||||
Loaded 100 of 817 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user