Imported Upstream version 5.10.0.47

Former-commit-id: d0813289fa2d35e1f8ed77530acb4fb1df441bc0
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-01-24 17:04:36 +00:00
parent 88ff76fe28
commit e46a49ecf1
5927 changed files with 226314 additions and 129848 deletions

View File

@@ -8,6 +8,8 @@ LIB_REFS = System System.Core
KEYFILE = $(LIBRARY_SNK)
LIB_MCS_FLAGS = /unsafe /publicsign
LIBRARY_WARN_AS_ERROR = yes
NO_TEST = yes
include ../../build/library.make

View File

@@ -119,17 +119,16 @@ namespace Mono.Profiler.Log {
// 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,
Method = 0,
MethodTrampoline = 1,
UnboxTrampoline = 2,
ImtTrampoline = 3,
GenericsTrampoline = 4,
SpecificTrampoline = 5,
Helper = 6,
Monitor = 7,
DelegateInvoke = 8,
ExceptionHandling = 9,
}
// mono/metadata/profiler.h : MonoProfilerGCRootType
@@ -139,11 +138,11 @@ namespace Mono.Profiler.Log {
WeakReference = 2 << 8,
Interior = 4 << 8,
Stack = 0,
Finalizer = 1,
Handle = 2,
Other = 3,
Miscellaneous = 4,
Stack = 1 << 0,
Finalizer = 1 << 1,
Handle = 1 << 2,
Other = 1 << 3,
Miscellaneous = 1 << 4,
TypeMask = 0xff,
}

View File

@@ -373,8 +373,8 @@ namespace Mono.Profiler.Log {
case LogEventType.MonitorBacktrace:
ev = new MonitorEvent {
Event = StreamHeader.FormatVersion >= 14 ?
(LogMonitorEvent) _reader.ReadByte () :
(LogMonitorEvent) ((((byte) type & 0xf0) >> 4) & 0x3),
(LogMonitorEvent) _reader.ReadByte () :
(LogMonitorEvent) ((((byte) type & 0xf0) >> 4) & 0x3),
ObjectPointer = ReadObject (),
Backtrace = ReadBacktrace (extType == LogEventType.MonitorBacktrace),
};
@@ -476,9 +476,9 @@ namespace Mono.Profiler.Log {
Section = section,
SectionName = section == LogCounterSection.User ? _reader.ReadCString () : null,
CounterName = _reader.ReadCString (),
Type = (LogCounterType) _reader.ReadByte (),
Unit = (LogCounterUnit) _reader.ReadByte (),
Variance = (LogCounterVariance) _reader.ReadByte (),
Type = StreamHeader.FormatVersion < 15 ? (LogCounterType) _reader.ReadByte () : (LogCounterType) _reader.ReadULeb128 (),
Unit = StreamHeader.FormatVersion < 15 ? (LogCounterUnit) _reader.ReadByte () : (LogCounterUnit) _reader.ReadULeb128 (),
Variance = StreamHeader.FormatVersion < 15 ? (LogCounterVariance) _reader.ReadByte () : (LogCounterVariance) _reader.ReadULeb128 (),
Index = (long) _reader.ReadULeb128 (),
};
}
@@ -498,7 +498,7 @@ namespace Mono.Profiler.Log {
if (index == 0)
break;
var counterType = (LogCounterType) _reader.ReadByte ();
var counterType = StreamHeader.FormatVersion < 15 ? (LogCounterType) _reader.ReadByte () : (LogCounterType) _reader.ReadULeb128 ();
object value = null;

View File

@@ -100,6 +100,9 @@ namespace Mono.Profiler.Log {
}
}
[MethodImpl (MethodImplOptions.InternalCall)]
public extern static void TriggerHeapshot ();
[MethodImpl (MethodImplOptions.InternalCall)]
extern static int GetCallDepth ();