Perf: Reduce tracing related allocations (NetFx) (#483)

cheenamalhotra · web-flow · commit 2874114481d7 · 2020-03-23T13:37:02.000-07:00
diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/Common/ActivityCorrelator.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/Common/ActivityCorrelator.cs
@@ -15,30 +15,15 @@ namespace Microsoft.Data.Common
     internal static class ActivityCorrelator
     {
 
-        internal class ActivityId
+        internal sealed class ActivityId
         {
-            internal Guid Id { get; private set; }
-            internal UInt32 Sequence { get; private set; }
+            internal readonly Guid Id;
+            internal readonly uint Sequence;
 
-            internal ActivityId()
+            internal ActivityId(uint sequence)
             {
                 this.Id = Guid.NewGuid();
-                this.Sequence = 0; // the first event will start 1
-            }
-
-            // copy-constructor
-            internal ActivityId(ActivityId activity)
-            {
-                this.Id = activity.Id;
-                this.Sequence = activity.Sequence;
-            }
-
-            internal void Increment()
-            {
-                unchecked
-                {
-                    ++this.Sequence;
-                }
+                this.Sequence = sequence;
             }
 
             public override string ToString()
@@ -51,7 +36,7 @@ public override string ToString()
         // The Sequence number will be incremented when each event happens.
         // Correlation along threads is consistent with the current XEvent mechanisam at server.
         [ThreadStaticAttribute]
-        static ActivityId tlsActivity;
+        static ActivityId t_tlsActivity;
 
         /// <summary>
         /// Get the current ActivityId
@@ -60,12 +45,12 @@ internal static ActivityId Current
         {
             get
             {
-                if (tlsActivity == null)
+                if (t_tlsActivity == null)
                 {
-                    tlsActivity = new ActivityId();
+                    t_tlsActivity = new ActivityId(1);
                 }
 
-                return new ActivityId(tlsActivity);
+                return t_tlsActivity;
             }
         }
 
@@ -75,14 +60,9 @@ internal static ActivityId Current
         /// <returns>ActivityId</returns>
         internal static ActivityId Next()
         {
-            if (tlsActivity == null)
-            {
-                tlsActivity = new ActivityId();
-            }
-
-            tlsActivity.Increment();
-
-            return new ActivityId(tlsActivity);
+            t_tlsActivity = new ActivityId(t_tlsActivity?.Sequence ?? 0);
+            
+            return t_tlsActivity;
         }
     }
 }
diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParser.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParser.cs
@@ -1314,7 +1314,10 @@ internal void Deactivate(bool connectionIsDoomed)
             // Called when the connection that owns us is deactivated.
 
             SqlClientEventSource.Log.AdvanceTrace("<sc.TdsParser.Deactivate|ADV> {0}# deactivating", ObjectID);
-            SqlClientEventSource.Log.StateDumpEvent("<sc.TdsParser.Deactivate|STATE> {0}#, {1}", ObjectID, TraceString());
+            if (SqlClientEventSource.Log.IsStateDumpEnabled())
+            {
+                SqlClientEventSource.Log.StateDumpEvent("<sc.TdsParser.Deactivate|STATE> {0}#, {1}", ObjectID, TraceString());
+            }
 
             if (MARSOn)
             {
@@ -13502,13 +13505,13 @@ internal ulong PlpBytesTotalLength(TdsParserStateObject stateObj)
                                         ;
         internal string TraceString()
         {
-            return String.Format(/*IFormatProvider*/ null,
+            return string.Format(/*IFormatProvider*/ null,
                             StateTraceFormatString,
-                            null == _physicalStateObj,
-                            null == _pMarsPhysicalConObj,
+                            null == _physicalStateObj ? bool.TrueString : bool.FalseString,
+                            null == _pMarsPhysicalConObj ? bool.TrueString : bool.FalseString,
                             _state,
                             _server,
-                            _fResetConnection,
+                            _fResetConnection ? bool.TrueString : bool.FalseString,
                             null == _defaultCollation ? "(null)" : _defaultCollation.TraceString(),
                             _defaultCodePage,
                             _defaultLCID,
@@ -13520,19 +13523,19 @@ internal string TraceString()
                             _retainedTransactionId,
                             _nonTransactedOpenResultCount,
                             null == _connHandler ? "(null)" : _connHandler.ObjectID.ToString((IFormatProvider)null),
-                            _fMARS,
+                            _fMARS ? bool.TrueString : bool.FalseString,
                             null == _sessionPool ? "(null)" : _sessionPool.TraceString(),
-                            _isShiloh,
-                            _isShilohSP1,
-                            _isYukon,
+                            _isShiloh ? bool.TrueString : bool.FalseString,
+                            _isShilohSP1 ? bool.TrueString : bool.FalseString,
+                            _isYukon ? bool.TrueString : bool.FalseString,
                             null == _sniSpnBuffer ? "(null)" : _sniSpnBuffer.Length.ToString((IFormatProvider)null),
                             _physicalStateObj != null ? "(null)" : _physicalStateObj.ErrorCount.ToString((IFormatProvider)null),
                             _physicalStateObj != null ? "(null)" : _physicalStateObj.WarningCount.ToString((IFormatProvider)null),
                             _physicalStateObj != null ? "(null)" : _physicalStateObj.PreAttentionErrorCount.ToString((IFormatProvider)null),
                             _physicalStateObj != null ? "(null)" : _physicalStateObj.PreAttentionWarningCount.ToString((IFormatProvider)null),
-                            null == _statistics,
-                            _statisticsIsInTransaction,
-                            _fPreserveTransaction,
+                            null == _statistics ? bool.TrueString : bool.FalseString,
+                            _statisticsIsInTransaction ? bool.TrueString : bool.FalseString,
+                            _fPreserveTransaction ? bool.TrueString : bool.FalseString,
                             null == _connHandler ? "(null)" : _connHandler.ConnectionOptions.MultiSubnetFailover.ToString((IFormatProvider)null),
                             null == _connHandler ? "(null)" : _connHandler.ConnectionOptions.TransparentNetworkIPResolution.ToString((IFormatProvider)null));
         }

Original file line number	Diff line number	Diff line change
`@@ -15,30 +15,15 @@ namespace Microsoft.Data.Common`
`15`	`15`	`internal static class ActivityCorrelator`
`16`	`16`	`{`
`17`	`17`
`18`		`- internal class ActivityId`
	`18`	`+ internal sealed class ActivityId`
`19`	`19`	`{`
`20`		`- internal Guid Id { get; private set; }`
`21`		`- internal UInt32 Sequence { get; private set; }`
	`20`	`+ internal readonly Guid Id;`
	`21`	`+ internal readonly uint Sequence;`
`22`	`22`
`23`		`- internal ActivityId()`
	`23`	`+ internal ActivityId(uint sequence)`
`24`	`24`	`{`
`25`	`25`	`this.Id = Guid.NewGuid();`
`26`		`- this.Sequence = 0; // the first event will start 1`
`27`		`- }`
`28`		`-`
`29`		`- // copy-constructor`
`30`		`- internal ActivityId(ActivityId activity)`
`31`		`- {`
`32`		`- this.Id = activity.Id;`
`33`		`- this.Sequence = activity.Sequence;`
`34`		`- }`
`35`		`-`
`36`		`- internal void Increment()`
`37`		`- {`
`38`		`- unchecked`
`39`		`- {`
`40`		`- ++this.Sequence;`
`41`		`- }`
	`26`	`+ this.Sequence = sequence;`
`42`	`27`	`}`
`43`	`28`
`44`	`29`	`public override string ToString()`
`@@ -51,7 +36,7 @@ public override string ToString()`
`51`	`36`	`// The Sequence number will be incremented when each event happens.`
`52`	`37`	`// Correlation along threads is consistent with the current XEvent mechanisam at server.`
`53`	`38`	`[ThreadStaticAttribute]`
`54`		`- static ActivityId tlsActivity;`
	`39`	`+ static ActivityId t_tlsActivity;`
`55`	`40`
`56`	`41`	`/// <summary>`
`57`	`42`	`/// Get the current ActivityId`
`@@ -60,12 +45,12 @@ internal static ActivityId Current`
`60`	`45`	`{`
`61`	`46`	`get`
`62`	`47`	`{`
`63`		`- if (tlsActivity == null)`
	`48`	`+ if (t_tlsActivity == null)`
`64`	`49`	`{`
`65`		`- tlsActivity = new ActivityId();`
	`50`	`+ t_tlsActivity = new ActivityId(1);`
`66`	`51`	`}`
`67`	`52`
`68`		`- return new ActivityId(tlsActivity);`
	`53`	`+ return t_tlsActivity;`
`69`	`54`	`}`
`70`	`55`	`}`
`71`	`56`
`@@ -75,14 +60,9 @@ internal static ActivityId Current`
`75`	`60`	`/// <returns>ActivityId</returns>`
`76`	`61`	`internal static ActivityId Next()`
`77`	`62`	`{`
`78`		`- if (tlsActivity == null)`
`79`		`- {`
`80`		`- tlsActivity = new ActivityId();`
`81`		`- }`
`82`		`-`
`83`		`- tlsActivity.Increment();`
`84`		`-`
`85`		`- return new ActivityId(tlsActivity);`
	`63`	`+ t_tlsActivity = new ActivityId(t_tlsActivity?.Sequence ?? 0);`
	`64`	`+`
	`65`	`+ return t_tlsActivity;`
`86`	`66`	`}`
`87`	`67`	`}`
`88`	`68`	`}`