Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion performance/CsvHelper.Benchmarks/BenchmarkMain.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ internal class BenchmarkMain
{
static void Main(string[] args)
{
_ = BenchmarkRunner.Run<BenchmarkEnumerateRecords>();
_ = BenchmarkSwitcher.FromAssembly(System.Reflection.Assembly.GetExecutingAssembly()).Run(args);
}
}
55 changes: 55 additions & 0 deletions performance/CsvHelper.Benchmarks/BenchmarkWriteCsv.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
using System;
using System.Collections.Generic;
using System.Globalization;
using System.IO;
using BenchmarkDotNet.Attributes;

namespace CsvHelper.Benchmarks;

public class BenchmarkWriteCsv
{
private const int entryCount = 10000;
private readonly List<Simple> records = new(entryCount);

public class Simple
{
public int Id1 { get; set; }
public int Id2 { get; set; }
public string Name1 { get; set; }
public string Name2 { get; set; }
}

[GlobalSetup]
public void GlobalSetup()
{
var random = new Random(42);
var chars = new char[10];
string getRandomString()
{
for (int i = 0; i < 10; ++i)
chars[i] = (char)random.Next('a', 'z' + 1);
return new string(chars);
}

for (int i = 0; i < entryCount; ++i)
{
records.Add(new Simple
{
Id1 = random.Next(),
Id2 = random.Next(),
Name1 = getRandomString(),
Name2 = getRandomString(),
});
}
}

[Benchmark]
public void WriteRecords()
{
using var stream = new MemoryStream();
using var streamWriter = new StreamWriter(stream);
using var writer = new CsvHelper.CsvWriter(streamWriter, CultureInfo.InvariantCulture);
writer.WriteRecords(records);
streamWriter.Flush();
}
}
3 changes: 2 additions & 1 deletion performance/CsvHelper.Benchmarks/CsvHelper.Benchmarks.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.15.0" />
<PackageReference Include="BenchmarkDotNet" Version="0.15.2" />
<PackageReference Include="Microsoft.VisualStudio.DiagnosticsHub.BenchmarkDotNetDiagnosers" Version="18.0.36421.1" />
</ItemGroup>

<ItemGroup>
Expand Down
16 changes: 10 additions & 6 deletions src/CsvHelper/Expressions/ObjectRecordWriter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ protected override Action<T> CreateWriteDelegate<T>(Type type)
throw new WriterException(Writer.Context, $"No properties are mapped for type '{type.FullName}'.");
}

var delegates = new List<Action<T>>();
var expressions = new List<Expression>(members.Count);

foreach (var memberMap in members)
{
Expand All @@ -59,7 +59,7 @@ protected override Action<T> CreateWriteDelegate<T>(Type type)
var args = Expression.New(constructor, recordParameterConverted);
Expression exp = Expression.Invoke(memberMap.Data.WritingConvertExpression, args);
exp = Expression.Call(Expression.Constant(Writer), nameof(Writer.WriteField), null, exp);
delegates.Add(Expression.Lambda<Action<T>>(exp, recordParameter).Compile());
expressions.Add(exp);
continue;
}

Expand Down Expand Up @@ -110,12 +110,16 @@ protected override Action<T> CreateWriteDelegate<T>(Type type)
}

var writeFieldMethodCall = Expression.Call(Expression.Constant(Writer), nameof(Writer.WriteConvertedField), null, fieldExpression, Expression.Constant(memberMap.Data.Type));

delegates.Add(Expression.Lambda<Action<T>>(writeFieldMethodCall, recordParameter).Compile());
expressions.Add(writeFieldMethodCall);
}

var action = CombineDelegates(delegates) ?? new Action<T>((T parameter) => { });
if (expressions.Count == 0)
{
return new Action<T>((T parameter) => { });
}

return action;
// Combine all field writes into a single block
var block = Expression.Block(expressions);
return Expression.Lambda<Action<T>>(block, recordParameter).Compile();
}
}
Loading