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

Imported Upstream version 3.10.0

Browse Source 
Former-commit-id: 172c8e3c300b39d5785c7a3e8dfb08ebdbc1a99b
This commit is contained in:
Jo Shields
2014-10-04 11:27:48 +01:00
parent fe777c5c82
commit 8b9b85e7f5
970 changed files with 20242 additions and 31308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mcs/class/System/System.Diagnostics/DefaultTraceListener.cs
View File

@ -64,14 +64,10 @@ namespace System.Diagnostics {
OnWin32 = (Path.DirectorySeparatorChar == '\\');
if (!OnWin32) {
#if TARGET_JVM
string trace = java.lang.System.getProperty("MONO_TRACE");
#else
// If we're running on Unix, we don't have OutputDebugString.
// Instead, send output to...wherever the MONO_TRACE_LISTENER environment
// variables says to.
String trace = Environment.GetEnvironmentVariable("MONO_TRACE_LISTENER");
#endif
#if MOBILE
if (trace == null)
@ -215,10 +211,6 @@ namespace System.Diagnostics {
Abort
}
#if TARGET_JVM
private void WriteDebugString (string message)
{
#else
[MethodImplAttribute(MethodImplOptions.InternalCall)]
private extern static void WriteWindowsDebugString (string message);
@ -227,7 +219,6 @@ namespace System.Diagnostics {
if (OnWin32)
WriteWindowsDebugString (message);
else
#endif
WriteMonoTrace (message);
}

4
mcs/class/System/System.Diagnostics/DiagnosticsConfigurationHandler.cs
View File

@ -186,7 +186,6 @@ namespace System.Diagnostics
// them
private void AddSwitchesNode (IDictionary d, XmlNode node)
{
#if !TARGET_JVM
// There are no attributes on <switch/>
ValidateInvalidAttributes (node.Attributes, node);
@ -224,7 +223,6 @@ namespace System.Diagnostics
}
d [node.Name] = newNodes;
#endif
}
private static object GetSwitchValue (string name, string value)
@ -367,7 +365,6 @@ namespace System.Diagnostics
// for add, "name" is required; initializeData is optional; "type" is required in 1.x, optional in 2.0.
private void AddTraceListeners (IDictionary d, XmlNode listenersNode, TraceListenerCollection listeners)
{
#if !TARGET_JVM
// There are no attributes on <listeners/>
ValidateInvalidAttributes (listenersNode.Attributes, listenersNode);
@ -398,7 +395,6 @@ namespace System.Diagnostics
else
ThrowUnrecognizedNode (child);
}
#endif
}
private void AddTraceListener (IDictionary d, XmlNode child, XmlAttributeCollection attributes, TraceListenerCollection listeners)

50
mcs/class/System/System.Diagnostics/TraceListener.cs
View File

@ -43,55 +43,6 @@ namespace System.Diagnostics {
public abstract class TraceListener : MarshalByRefObject, IDisposable {
#if TARGET_JVM
readonly LocalDataStoreSlot _indentLevelStore = System.Threading.Thread.AllocateDataSlot ();
readonly LocalDataStoreSlot _indentSizeStore = System.Threading.Thread.AllocateDataSlot ();
readonly LocalDataStoreSlot _attributesStore = System.Threading.Thread.AllocateDataSlot ();
readonly LocalDataStoreSlot _filterStore = System.Threading.Thread.AllocateDataSlot ();
readonly LocalDataStoreSlot _optionsStore = System.Threading.Thread.AllocateDataSlot ();
private int indentLevel {
get {
object o = System.Threading.Thread.GetData (_indentLevelStore);
if (o == null)
return 0;
return (int) o;
}
set { System.Threading.Thread.SetData (_indentLevelStore, value); }
}
private int indentSize {
get {
object o = System.Threading.Thread.GetData (_indentSizeStore);
if (o == null)
return 4;
return (int) o;
}
set { System.Threading.Thread.SetData (_indentSizeStore, value); }
}
private StringDictionary attributes {
get { return (StringDictionary) System.Threading.Thread.GetData (_attributesStore); }
set { System.Threading.Thread.SetData (_attributesStore, value); }
}
#if !MOBILE
private TraceFilter filter {
get { return (TraceFilter) System.Threading.Thread.GetData (_filterStore); }
set { System.Threading.Thread.SetData (_filterStore, value); }
}
#endif
private TraceOptions options {
get {
object o = System.Threading.Thread.GetData (_optionsStore);
if (o == null)
return TraceOptions.None;
return (TraceOptions) o;
}
set { System.Threading.Thread.SetData (_optionsStore, value); }
}
#else
[ThreadStatic]
private int indentLevel = 0;
@ -106,7 +57,6 @@ namespace System.Diagnostics {
#endif
[ThreadStatic]
private TraceOptions options;
#endif
private string name;
private bool needIndent = true;