Revert `Remove #if false blocks` just for Eventing

Commit migrated from https://github.com/dotnet/coreclr/commit/31d6e5ec55f06ca7c6c84dc0ea0f133aec105c1a

diff --git a/src/coreclr/src/mscorlib/src/System/Diagnostics/Eventing/EventSource.cs b/src/coreclr/src/mscorlib/src/System/Diagnostics/Eventing/EventSource.cs
index 405fbb2..74bd6bb 100644 (file)
--- a/src/coreclr/src/mscorlib/src/System/Diagnostics/Eventing/EventSource.cs
+++ b/src/coreclr/src/mscorlib/src/System/Diagnostics/Eventing/EventSource.cs
@@ -3910,6 +3910,17 @@ namespace System.Diagnostics.Tracing
             return -1;
         }
 
+#if false // This routine is not needed at all, it was used for unit test debugging. 
+        [Conditional("DEBUG")]
+        private static void OutputDebugString(string msg)
+        {
+#if !ES_BUILD_PCL
+            msg = msg.TrimEnd('\r', '\n') +
+                    string.Format(CultureInfo.InvariantCulture, ", Thrd({0})" + Environment.NewLine, Thread.CurrentThread.ManagedThreadId);
+            System.Diagnostics.Debugger.Log(0, null, msg);
+#endif
+        }
+#endif
 
         /// <summary>
         /// Sends an error message to the debugger (outputDebugString), as well as the EventListeners 

diff --git a/src/coreclr/src/mscorlib/src/System/Diagnostics/Eventing/TraceLogging/EventFieldFormat.cs b/src/coreclr/src/mscorlib/src/System/Diagnostics/Eventing/TraceLogging/EventFieldFormat.cs
index 297b063..fd77b07 100644 (file)
--- a/src/coreclr/src/mscorlib/src/System/Diagnostics/Eventing/TraceLogging/EventFieldFormat.cs
+++ b/src/coreclr/src/mscorlib/src/System/Diagnostics/Eventing/TraceLogging/EventFieldFormat.cs
@@ -20,6 +20,12 @@ namespace System.Diagnostics.Tracing
         /// Field receives default formatting based on the field's underlying type.
         /// </summary>
         Default = 0,
+#if false 
+        /// <summary>
+        /// Field should not be displayed.
+        /// </summary>
+        NoPrint = 1,
+#endif
         /// <summary>
         /// Field should be formatted as character or string data.
         /// Typically applied to 8-bit or 16-bit integers.
@@ -39,6 +45,40 @@ namespace System.Diagnostics.Tracing
         /// </summary>
         Hexadecimal = 4,
 
+#if false 
+        /// <summary>
+        /// Field should be formatted as a process identifier. Typically applied to
+        /// 32-bit integer types.
+        /// </summary>
+        ProcessId = 5,
+
+        /// <summary>
+        /// Field should be formatted as a thread identifier. Typically applied to
+        /// 32-bit integer types.
+        /// </summary>
+        ThreadId = 6,
+
+        /// <summary>
+        /// Field should be formatted as an Internet port. Typically applied to 16-bit integer
+        /// types.
+        /// </summary>
+        Port = 7,
+        /// <summary>
+        /// Field should be formatted as an Internet Protocol v4 address. Typically applied to
+        /// 32-bit integer types.
+        /// </summary>
+        Ipv4Address = 8,
+
+        /// <summary>
+        /// Field should be formatted as an Internet Protocol v6 address. Typically applied to
+        /// byte[] types.
+        /// </summary>
+        Ipv6Address = 9,
+        /// <summary>
+        /// Field should be formatted as a SOCKADDR. Typically applied to byte[] types.
+        /// </summary>
+        SocketAddress = 10,
+#endif
         /// <summary>
         /// Field should be formatted as XML string data. Typically applied to
         /// strings or arrays of 8-bit or 16-bit integers.
@@ -50,10 +90,41 @@ namespace System.Diagnostics.Tracing
         /// strings or arrays of 8-bit or 16-bit integers.
         /// </summary>
         Json = 12,
+#if false 
+        /// <summary>
+        /// Field should be formatted as a Win32 error code. Typically applied to
+        /// 32-bit integer types.
+        /// </summary>
+        Win32Error = 13,
+
+        /// <summary>
+        /// Field should be formatted as an NTSTATUS code. Typically applied to
+        /// 32-bit integer types.
+        /// </summary>
+        NTStatus = 14,
+#endif
         /// <summary>
         /// Field should be formatted as an HRESULT code. Typically applied to
         /// 32-bit integer types.
         /// </summary>
         HResult = 15,
+#if false 
+        /// <summary>
+        /// Field should be formatted as a FILETIME. Typically applied to 64-bit
+        /// integer types. This is the default format for DateTime types.
+        /// </summary>
+        FileTime = 16,
+        /// <summary>
+        /// When applied to a numeric type, indicates that the type should be formatted
+        /// as a signed integer. This is the default format for signed integer types.
+        /// </summary>
+        Signed = 17,
+
+        /// <summary>
+        /// When applied to a numeric type, indicates that the type should be formatted
+        /// as an unsigned integer. This is the default format for unsigned integer types.
+        /// </summary>
+        Unsigned = 18,
+#endif
     }
 }

diff --git a/src/coreclr/src/mscorlib/src/System/Diagnostics/Eventing/TraceLogging/Statics.cs b/src/coreclr/src/mscorlib/src/System/Diagnostics/Eventing/TraceLogging/Statics.cs
index c92937c..516c8ba 100644 (file)
--- a/src/coreclr/src/mscorlib/src/System/Diagnostics/Eventing/TraceLogging/Statics.cs
+++ b/src/coreclr/src/mscorlib/src/System/Diagnostics/Eventing/TraceLogging/Statics.cs
@@ -211,6 +211,12 @@ namespace System.Diagnostics.Tracing
                     return TraceLoggingDataType.Boolean8;
                 case EventFieldFormat.Hexadecimal:
                     return TraceLoggingDataType.HexInt8;
+#if false 
+                case EventSourceFieldFormat.Signed:
+                    return TraceLoggingDataType.Int8;
+                case EventSourceFieldFormat.Unsigned:
+                    return TraceLoggingDataType.UInt8;
+#endif
                 default:
                     return MakeDataType(native, format);
             }
@@ -234,6 +240,14 @@ namespace System.Diagnostics.Tracing
                     return TraceLoggingDataType.Char16;
                 case EventFieldFormat.Hexadecimal:
                     return TraceLoggingDataType.HexInt16;
+#if false
+                case EventSourceFieldFormat.Port:
+                    return TraceLoggingDataType.Port;
+                case EventSourceFieldFormat.Signed:
+                    return TraceLoggingDataType.Int16;
+                case EventSourceFieldFormat.Unsigned:
+                    return TraceLoggingDataType.UInt16;
+#endif
                 default:
                     return MakeDataType(native, format);
             }
@@ -257,8 +271,26 @@ namespace System.Diagnostics.Tracing
                     return TraceLoggingDataType.Boolean32;
                 case EventFieldFormat.Hexadecimal:
                     return TraceLoggingDataType.HexInt32;
+#if false 
+                case EventSourceFieldFormat.Ipv4Address:
+                    return TraceLoggingDataType.Ipv4Address;
+                case EventSourceFieldFormat.ProcessId:
+                    return TraceLoggingDataType.ProcessId;
+                case EventSourceFieldFormat.ThreadId:
+                    return TraceLoggingDataType.ThreadId;
+                case EventSourceFieldFormat.Win32Error:
+                    return TraceLoggingDataType.Win32Error;
+                case EventSourceFieldFormat.NTStatus:
+                    return TraceLoggingDataType.NTStatus;
+#endif
                 case EventFieldFormat.HResult:
                     return TraceLoggingDataType.HResult;
+#if false 
+                case EventSourceFieldFormat.Signed:
+                    return TraceLoggingDataType.Int32;
+                case EventSourceFieldFormat.Unsigned:
+                    return TraceLoggingDataType.UInt32;
+#endif
                 default:
                     return MakeDataType(native, format);
             }
@@ -280,6 +312,14 @@ namespace System.Diagnostics.Tracing
                     return native;
                 case EventFieldFormat.Hexadecimal:
                     return TraceLoggingDataType.HexInt64;
+#if false 
+                case EventSourceFieldFormat.FileTime:
+                    return TraceLoggingDataType.FileTime;
+                case EventSourceFieldFormat.Signed:
+                    return TraceLoggingDataType.Int64;
+                case EventSourceFieldFormat.Unsigned:
+                    return TraceLoggingDataType.UInt64;
+#endif
                 default:
                     return MakeDataType(native, format);
             }
@@ -301,6 +341,12 @@ namespace System.Diagnostics.Tracing
                     return native;
                 case EventFieldFormat.Hexadecimal:
                     return HexIntPtrType;
+#if false 
+                case EventSourceFieldFormat.Signed:
+                    return IntPtrType;
+                case EventSourceFieldFormat.Unsigned:
+                    return UIntPtrType;
+#endif
                 default:
                     return MakeDataType(native, format);
             }

diff --git a/src/coreclr/src/mscorlib/src/System/Diagnostics/Eventing/TraceLogging/TraceLoggingDataType.cs b/src/coreclr/src/mscorlib/src/System/Diagnostics/Eventing/TraceLogging/TraceLoggingDataType.cs
index b396031..529948d 100644 (file)
--- a/src/coreclr/src/mscorlib/src/System/Diagnostics/Eventing/TraceLogging/TraceLoggingDataType.cs
+++ b/src/coreclr/src/mscorlib/src/System/Diagnostics/Eventing/TraceLogging/TraceLoggingDataType.cs
@@ -226,6 +226,49 @@ namespace System.Diagnostics.Tracing
         /// </summary>
         HexInt16 = UInt16 + (EventFieldFormat.Hexadecimal << 8),
 
+#if false 
+        /// <summary>
+        /// Formatted type.
+        /// Encoding assumes 32-bit value.
+        /// Decoding treats as process identifier.
+        /// </summary>
+        ProcessId = UInt32 + (EventSourceFieldFormat.ProcessId << 8),
+
+        /// <summary>
+        /// Formatted type.
+        /// Encoding assumes 32-bit value.
+        /// Decoding treats as thread identifier.
+        /// </summary>
+        ThreadId = UInt32 + (EventSourceFieldFormat.ThreadId << 8),
+
+        /// <summary>
+        /// Formatted type.
+        /// Encoding assumes 16-bit value.
+        /// Decoding treats as IP port.
+        /// </summary>
+        Port = UInt16 + (EventSourceFieldFormat.Port << 8),
+
+        /// <summary>
+        /// Formatted type.
+        /// Encoding assumes 32-bit value.
+        /// Decoding treats as IPv4 address.
+        /// </summary>
+        Ipv4Address = UInt32 + (EventSourceFieldFormat.Ipv4Address << 8),
+
+        /// <summary>
+        /// Formatted type.
+        /// Encoding assumes 16-bit bytecount followed by binary data.
+        /// Decoding treats as IPv6 address.
+        /// </summary>
+        Ipv6Address = Binary + (EventSourceFieldFormat.Ipv6Address << 8),
+
+        /// <summary>
+        /// Formatted type.
+        /// Encoding assumes 16-bit bytecount followed by binary data.
+        /// Decoding treats as SOCKADDR.
+        /// </summary>
+        SocketAddress = Binary + (EventSourceFieldFormat.SocketAddress << 8),
+#endif
         /// <summary>
         /// Formatted type.
         /// Encoding assumes null-terminated Char16 string.
@@ -281,6 +324,21 @@ namespace System.Diagnostics.Tracing
         /// Decoding treats as MBCS JSON.
         /// </summary>
         CountedMbcsJson = CountedMbcsString + (EventFieldFormat.Json << 8),
+#if false 
+        /// <summary>
+        /// Formatted type.
+        /// Encoding assumes 32-bit value.
+        /// Decoding treats as Win32 error.
+        /// </summary>
+        Win32Error = UInt32 + (EventSourceFieldFormat.Win32Error << 8),
+
+        /// <summary>
+        /// Formatted type.
+        /// Encoding assumes 32-bit value.
+        /// Decoding treats as NTSTATUS.
+        /// </summary>
+        NTStatus = UInt32 + (EventSourceFieldFormat.NTStatus << 8),
+#endif
         /// <summary>
         /// Formatted type.
         /// Encoding assumes 32-bit value.