Merge pull request #96 from rafaelsc/optimization/fastNullCheck

nblumhardt · web-flow · commit e99270833809 · 2020-07-23T14:32:52.000+10:00
Optimization - Use faster null checking
diff --git a/src/Serilog.Sinks.Console/ConsoleLoggerConfigurationExtensions.cs b/src/Serilog.Sinks.Console/ConsoleLoggerConfigurationExtensions.cs
@@ -28,7 +28,7 @@ namespace Serilog
     /// </summary>
     public static class ConsoleLoggerConfigurationExtensions
     {
-        static object DefaultSyncRoot = new object();
+        static readonly object DefaultSyncRoot = new object();
         const string DefaultConsoleOutputTemplate = "[{Timestamp:HH:mm:ss} {Level:u3}] {Message:lj}{NewLine}{Exception}";
 
         /// <summary>
@@ -61,8 +61,8 @@ public static LoggerConfiguration Console(
             bool applyThemeToRedirectedOutput = false,
             object syncRoot = null)
         {
-            if (sinkConfiguration == null) throw new ArgumentNullException(nameof(sinkConfiguration));
-            if (outputTemplate == null) throw new ArgumentNullException(nameof(outputTemplate));
+            if (sinkConfiguration is null) throw new ArgumentNullException(nameof(sinkConfiguration));
+            if (outputTemplate is null) throw new ArgumentNullException(nameof(outputTemplate));
 
             var appliedTheme = !applyThemeToRedirectedOutput && (System.Console.IsOutputRedirected || System.Console.IsErrorRedirected) ?
                 ConsoleTheme.None :
@@ -97,8 +97,8 @@ public static LoggerConfiguration Console(
             LogEventLevel? standardErrorFromLevel = null,
             object syncRoot = null)
         {
-            if (sinkConfiguration == null) throw new ArgumentNullException(nameof(sinkConfiguration));
-            if (formatter == null) throw new ArgumentNullException(nameof(formatter));
+            if (sinkConfiguration is null) throw new ArgumentNullException(nameof(sinkConfiguration));
+            if (formatter is null) throw new ArgumentNullException(nameof(formatter));
 
             syncRoot = syncRoot ?? DefaultSyncRoot;
             return sinkConfiguration.Sink(new ConsoleSink(ConsoleTheme.None, formatter, standardErrorFromLevel, syncRoot), restrictedToMinimumLevel, levelSwitch);
diff --git a/src/Serilog.Sinks.Console/Sinks/SystemConsole/ConsoleSink.cs b/src/Serilog.Sinks.Console/Sinks/SystemConsole/ConsoleSink.cs
@@ -79,7 +79,7 @@ public void Emit(LogEvent logEvent)
 
         TextWriter SelectOutputStream(LogEventLevel logEventLevel)
         {
-            if (_standardErrorFromLevel == null)
+            if (_standardErrorFromLevel is null)
                 return Console.Out;
 
             return logEventLevel < _standardErrorFromLevel ? Console.Out : Console.Error;
diff --git a/src/Serilog.Sinks.Console/Sinks/SystemConsole/Formatting/ThemedDisplayValueFormatter.cs b/src/Serilog.Sinks.Console/Sinks/SystemConsole/Formatting/ThemedDisplayValueFormatter.cs
@@ -37,14 +37,14 @@ public override ThemedValueFormatter SwitchTheme(ConsoleTheme theme)
 
         protected override int VisitScalarValue(ThemedValueFormatterState state, ScalarValue scalar)
         {
-            if (scalar == null)
+            if (scalar is null)
                 throw new ArgumentNullException(nameof(scalar));
             return FormatLiteralValue(scalar, state.Output, state.Format);
         }
 
         protected override int VisitSequenceValue(ThemedValueFormatterState state, SequenceValue sequence)
         {
-            if (sequence == null)
+            if (sequence is null)
                 throw new ArgumentNullException(nameof(sequence));
 
             var count = 0;
@@ -155,7 +155,7 @@ public int FormatLiteralValue(ScalarValue scalar, TextWriter output, string form
             var value = scalar.Value;
             var count = 0;
 
-            if (value == null)
+            if (value is null)
             {
                 using (ApplyStyle(output, ConsoleThemeStyle.Null, ref count))
                     output.Write("null");
diff --git a/src/Serilog.Sinks.Console/Sinks/SystemConsole/Formatting/ThemedJsonValueFormatter.cs b/src/Serilog.Sinks.Console/Sinks/SystemConsole/Formatting/ThemedJsonValueFormatter.cs
@@ -40,7 +40,7 @@ public override ThemedValueFormatter SwitchTheme(ConsoleTheme theme)
 
         protected override int VisitScalarValue(ThemedValueFormatterState state, ScalarValue scalar)
         {
-            if (scalar == null)
+            if (scalar is null)
                 throw new ArgumentNullException(nameof(scalar));
 
             // At the top level, for scalar values, use "display" rendering.
diff --git a/src/Serilog.Sinks.Console/Sinks/SystemConsole/Output/ExceptionTokenRenderer.cs b/src/Serilog.Sinks.Console/Sinks/SystemConsole/Output/ExceptionTokenRenderer.cs
@@ -34,7 +34,7 @@ public override void Render(LogEvent logEvent, TextWriter output)
         {
             // Padding is never applied by this renderer.
 
-            if (logEvent.Exception == null)
+            if (logEvent.Exception is null)
                 return;
 
             var lines = new StringReader(logEvent.Exception.ToString());
diff --git a/src/Serilog.Sinks.Console/Sinks/SystemConsole/Output/LevelOutputFormat.cs b/src/Serilog.Sinks.Console/Sinks/SystemConsole/Output/LevelOutputFormat.cs
@@ -57,7 +57,7 @@ static class LevelOutputFormat
 
         public static string GetLevelMoniker(LogEventLevel value, string format = null)
         {
-            if (format == null || format.Length != 2 && format.Length != 3)
+            if (format is null || format.Length != 2 && format.Length != 3)
                 return Casing.Format(value.ToString(), format);
 
             // Using int.Parse() here requires allocating a string to exclude the first character prefix.
diff --git a/src/Serilog.Sinks.Console/Sinks/SystemConsole/Output/MessageTemplateOutputTokenRenderer.cs b/src/Serilog.Sinks.Console/Sinks/SystemConsole/Output/MessageTemplateOutputTokenRenderer.cs
@@ -54,7 +54,7 @@ public MessageTemplateOutputTokenRenderer(ConsoleTheme theme, PropertyToken toke
 
         public override void Render(LogEvent logEvent, TextWriter output)
         {
-            if (_token.Alignment == null || !_theme.CanBuffer)
+            if (_token.Alignment is null || !_theme.CanBuffer)
             {
                 _renderer.Render(logEvent.MessageTemplate, logEvent.Properties, output);
                 return;
diff --git a/src/Serilog.Sinks.Console/Sinks/SystemConsole/Output/OutputTemplateRenderer.cs b/src/Serilog.Sinks.Console/Sinks/SystemConsole/Output/OutputTemplateRenderer.cs
@@ -29,7 +29,7 @@ class OutputTemplateRenderer : ITextFormatter
 
         public OutputTemplateRenderer(ConsoleTheme theme, string outputTemplate, IFormatProvider formatProvider)
         {
-            if (outputTemplate == null) throw new ArgumentNullException(nameof(outputTemplate));
+            if (outputTemplate is null) throw new ArgumentNullException(nameof(outputTemplate));
             var template = new MessageTemplateParser().Parse(outputTemplate);
 
             var renderers = new List<OutputTemplateTokenRenderer>();
@@ -77,8 +77,8 @@ public OutputTemplateRenderer(ConsoleTheme theme, string outputTemplate, IFormat
 
         public void Format(LogEvent logEvent, TextWriter output)
         {
-            if (logEvent == null) throw new ArgumentNullException(nameof(logEvent));
-            if (output == null) throw new ArgumentNullException(nameof(output));
+            if (logEvent is null) throw new ArgumentNullException(nameof(logEvent));
+            if (output is null) throw new ArgumentNullException(nameof(output));
 
             foreach (var renderer in _renderers)
                 renderer.Render(logEvent, output);
diff --git a/src/Serilog.Sinks.Console/Sinks/SystemConsole/Output/PropertiesTokenRenderer.cs b/src/Serilog.Sinks.Console/Sinks/SystemConsole/Output/PropertiesTokenRenderer.cs
@@ -61,7 +61,7 @@ public override void Render(LogEvent logEvent, TextWriter output)
 
             var value = new StructureValue(included);
 
-            if (_token.Alignment == null || !_theme.CanBuffer)
+            if (_token.Alignment is null || !_theme.CanBuffer)
             {
                 _valueFormatter.Format(value, output, null);
                 return;
diff --git a/src/Serilog.Sinks.Console/Sinks/SystemConsole/Output/TimestampTokenRenderer.cs b/src/Serilog.Sinks.Console/Sinks/SystemConsole/Output/TimestampTokenRenderer.cs
@@ -43,7 +43,7 @@ public override void Render(LogEvent logEvent, TextWriter output)
             var _ = 0;
             using (_theme.Apply(output, ConsoleThemeStyle.SecondaryText, ref _))
             {
-                if (_token.Alignment == null)
+                if (_token.Alignment is null)
                 {
                     sv.Render(output, _token.Format, _formatProvider);
                 }
diff --git a/src/Serilog.Sinks.Console/Sinks/SystemConsole/Rendering/Padding.cs b/src/Serilog.Sinks.Console/Sinks/SystemConsole/Rendering/Padding.cs
@@ -29,7 +29,7 @@ static class Padding
         /// <param name="alignment">The alignment settings to apply when rendering <paramref name="value"/>.</param>
         public static void Apply(TextWriter output, string value, Alignment? alignment)
         {
-            if (alignment == null || value.Length >= alignment.Value.Width)
+            if (alignment is null || value.Length >= alignment.Value.Width)
             {
                 output.Write(value);
                 return;
diff --git a/src/Serilog.Sinks.Console/Sinks/SystemConsole/Themes/AnsiConsoleTheme.cs b/src/Serilog.Sinks.Console/Sinks/SystemConsole/Themes/AnsiConsoleTheme.cs
@@ -49,7 +49,7 @@ public class AnsiConsoleTheme : ConsoleTheme
         /// <param name="styles">Styles to apply within the theme.</param>
         public AnsiConsoleTheme(IReadOnlyDictionary<ConsoleThemeStyle, string> styles)
         {
-            if (styles == null) throw new ArgumentNullException(nameof(styles));
+            if (styles is null) throw new ArgumentNullException(nameof(styles));
             _styles = styles.ToDictionary(kv => kv.Key, kv => kv.Value);
         }
 
diff --git a/src/Serilog.Sinks.Console/Sinks/SystemConsole/Themes/SystemConsoleTheme.cs b/src/Serilog.Sinks.Console/Sinks/SystemConsole/Themes/SystemConsoleTheme.cs
@@ -46,7 +46,7 @@ public class SystemConsoleTheme : ConsoleTheme
         /// <param name="styles">Styles to apply within the theme.</param>
         public SystemConsoleTheme(IReadOnlyDictionary<ConsoleThemeStyle, SystemConsoleThemeStyle> styles)
         {
-            if (styles == null) throw new ArgumentNullException(nameof(styles));
+            if (styles is null) throw new ArgumentNullException(nameof(styles));
             Styles = styles.ToDictionary(kv => kv.Key, kv => kv.Value);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ public void Emit(LogEvent logEvent)`
`79`	`79`
`80`	`80`	`TextWriter SelectOutputStream(LogEventLevel logEventLevel)`
`81`	`81`	`{`
`82`		`- if (_standardErrorFromLevel == null)`
	`82`	`+ if (_standardErrorFromLevel is null)`
`83`	`83`	`return Console.Out;`
`84`	`84`
`85`	`85`	`return logEventLevel < _standardErrorFromLevel ? Console.Out : Console.Error;`
Original file line number	Diff line number	Diff line change
`@@ -37,14 +37,14 @@ public override ThemedValueFormatter SwitchTheme(ConsoleTheme theme)`
`37`	`37`
`38`	`38`	`protected override int VisitScalarValue(ThemedValueFormatterState state, ScalarValue scalar)`
`39`	`39`	`{`
`40`		`- if (scalar == null)`
	`40`	`+ if (scalar is null)`
`41`	`41`	`throw new ArgumentNullException(nameof(scalar));`
`42`	`42`	`return FormatLiteralValue(scalar, state.Output, state.Format);`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`protected override int VisitSequenceValue(ThemedValueFormatterState state, SequenceValue sequence)`
`46`	`46`	`{`
`47`		`- if (sequence == null)`
	`47`	`+ if (sequence is null)`
`48`	`48`	`throw new ArgumentNullException(nameof(sequence));`
`49`	`49`
`50`	`50`	`var count = 0;`
`@@ -155,7 +155,7 @@ public int FormatLiteralValue(ScalarValue scalar, TextWriter output, string form`
`155`	`155`	`var value = scalar.Value;`
`156`	`156`	`var count = 0;`
`157`	`157`
`158`		`- if (value == null)`
	`158`	`+ if (value is null)`
`159`	`159`	`{`
`160`	`160`	`using (ApplyStyle(output, ConsoleThemeStyle.Null, ref count))`
`161`	`161`	`output.Write("null");`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public override ThemedValueFormatter SwitchTheme(ConsoleTheme theme)`
`40`	`40`
`41`	`41`	`protected override int VisitScalarValue(ThemedValueFormatterState state, ScalarValue scalar)`
`42`	`42`	`{`
`43`		`- if (scalar == null)`
	`43`	`+ if (scalar is null)`
`44`	`44`	`throw new ArgumentNullException(nameof(scalar));`
`45`	`45`
`46`	`46`	`// At the top level, for scalar values, use "display" rendering.`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public override void Render(LogEvent logEvent, TextWriter output)`
`34`	`34`	`{`
`35`	`35`	`// Padding is never applied by this renderer.`
`36`	`36`
`37`		`- if (logEvent.Exception == null)`
	`37`	`+ if (logEvent.Exception is null)`
`38`	`38`	`return;`
`39`	`39`
`40`	`40`	`var lines = new StringReader(logEvent.Exception.ToString());`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ static class LevelOutputFormat`
`57`	`57`
`58`	`58`	`public static string GetLevelMoniker(LogEventLevel value, string format = null)`
`59`	`59`	`{`
`60`		`- if (format == null \|\| format.Length != 2 && format.Length != 3)`
	`60`	`+ if (format is null \|\| format.Length != 2 && format.Length != 3)`
`61`	`61`	`return Casing.Format(value.ToString(), format);`
`62`	`62`
`63`	`63`	`// Using int.Parse() here requires allocating a string to exclude the first character prefix.`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public MessageTemplateOutputTokenRenderer(ConsoleTheme theme, PropertyToken toke`
`54`	`54`
`55`	`55`	`public override void Render(LogEvent logEvent, TextWriter output)`
`56`	`56`	`{`
`57`		`- if (_token.Alignment == null \|\| !_theme.CanBuffer)`
	`57`	`+ if (_token.Alignment is null \|\| !_theme.CanBuffer)`
`58`	`58`	`{`
`59`	`59`	`_renderer.Render(logEvent.MessageTemplate, logEvent.Properties, output);`
`60`	`60`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public override void Render(LogEvent logEvent, TextWriter output)`
`61`	`61`
`62`	`62`	`var value = new StructureValue(included);`
`63`	`63`
`64`		`- if (_token.Alignment == null \|\| !_theme.CanBuffer)`
	`64`	`+ if (_token.Alignment is null \|\| !_theme.CanBuffer)`
`65`	`65`	`{`
`66`	`66`	`_valueFormatter.Format(value, output, null);`
`67`	`67`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public override void Render(LogEvent logEvent, TextWriter output)`
`43`	`43`	`var _ = 0;`
`44`	`44`	`using (_theme.Apply(output, ConsoleThemeStyle.SecondaryText, ref _))`
`45`	`45`	`{`
`46`		`- if (_token.Alignment == null)`
	`46`	`+ if (_token.Alignment is null)`
`47`	`47`	`{`
`48`	`48`	`sv.Render(output, _token.Format, _formatProvider);`
`49`	`49`	`}`