Skip to content

Make TestFile Image threadsafe. #2225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 14, 2022
Merged

Make TestFile Image threadsafe. #2225

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9fdaac8
Use Interlocked.CompareExchange
JimBobSquarePants Sep 12, 2022
c5d893a
Use simple lock for readability
JimBobSquarePants Sep 13, 2022
2515d80
Initialize the locker!
JimBobSquarePants Sep 13, 2022
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
23 changes: 21 additions & 2 deletions tests/ImageSharp.Tests/TestFile.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,12 @@ public sealed class TestFile
/// <summary>
/// The image (lazy initialized value)
/// </summary>
private Image<Rgba32> image;
private volatile Image<Rgba32> image;

/// <summary>
/// Used to ensure image loading is threadsafe.
/// </summary>
private readonly object syncLock;
Copy link
Contributor

@br3aker br3aker Sep 13, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
private readonly object syncLock;
private readonly object syncLock = new();

Copy link
Member Author

@JimBobSquarePants JimBobSquarePants Sep 13, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ha! Can't believe I missed that!


/// <summary>
/// The image bytes
Expand Down Expand Up @@ -65,7 +70,21 @@ public sealed class TestFile
/// <summary>
/// Gets the image with lazy initialization.
/// </summary>
private Image<Rgba32> Image => this.image ??= ImageSharp.Image.Load<Rgba32>(this.Bytes);
private Image<Rgba32> Image
{
get
{
if (this.image is null)
{
lock (this.syncLock)
{
this.image ??= ImageSharp.Image.Load<Rgba32>(this.Bytes);
}
}

return this.image;
}
}

/// <summary>
/// Gets the input image directory.
Expand Down