dangerous #2
10 changed files with 164 additions and 115 deletions
|
|
@ -6,7 +6,11 @@ namespace StitchATon2.App.Controllers;
|
||||||
|
|
||||||
public static class ImageController
|
public static class ImageController
|
||||||
{
|
{
|
||||||
public static async Task GenerateImage(HttpResponse response, GenerateImageDto dto, TileManager tileManager)
|
public static async Task GenerateImage(
|
||||||
|
HttpResponse response,
|
||||||
|
GenerateImageDto dto,
|
||||||
|
TileManager tileManager,
|
||||||
|
CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
if (dto.GetErrors() is { Count: > 0 } errors)
|
if (dto.GetErrors() is { Count: > 0 } errors)
|
||||||
{
|
{
|
||||||
|
|
@ -14,7 +18,7 @@ public static class ImageController
|
||||||
response.ContentType = "text/json";
|
response.ContentType = "text/json";
|
||||||
var errorBody = JsonSerializer.Serialize(errors, AppJsonSerializerContext.Default.DictionaryStringListString);
|
var errorBody = JsonSerializer.Serialize(errors, AppJsonSerializerContext.Default.DictionaryStringListString);
|
||||||
response.ContentLength = errorBody.Length;
|
response.ContentLength = errorBody.Length;
|
||||||
await response.WriteAsync(errorBody);
|
await response.WriteAsync(errorBody, cancellationToken: cancellationToken);
|
||||||
await response.CompleteAsync();
|
await response.CompleteAsync();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
@ -24,12 +28,15 @@ public static class ImageController
|
||||||
|
|
||||||
await tileManager
|
await tileManager
|
||||||
.CreateSection(dto)
|
.CreateSection(dto)
|
||||||
.DangerousWriteToPipe(response.BodyWriter, dto.OutputScale);
|
.DangerousWriteToPipe(response.BodyWriter, dto.OutputScale, cancellationToken);
|
||||||
|
|
||||||
await response.CompleteAsync();
|
await response.CompleteAsync();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static async Task GenerateRandomImage(HttpResponse response, TileManager tileManager)
|
public static async Task GenerateRandomImage(
|
||||||
|
HttpResponse response,
|
||||||
|
TileManager tileManager,
|
||||||
|
CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
response.StatusCode = 200;
|
response.StatusCode = 200;
|
||||||
response.ContentType = "image/png";
|
response.ContentType = "image/png";
|
||||||
|
|
@ -47,7 +54,7 @@ public static class ImageController
|
||||||
var scale = float.Clamp(480f / int.Max(section.Width, section.Height), 0.01f, 1f);
|
var scale = float.Clamp(480f / int.Max(section.Width, section.Height), 0.01f, 1f);
|
||||||
Console.WriteLine($"Generate random image for {coordinatePair} scale: {scale}");
|
Console.WriteLine($"Generate random image for {coordinatePair} scale: {scale}");
|
||||||
|
|
||||||
await section.DangerousWriteToPipe(response.BodyWriter, scale);
|
await section.DangerousWriteToPipe(response.BodyWriter, scale, cancellationToken);
|
||||||
await response.CompleteAsync();
|
await response.CompleteAsync();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -21,9 +21,13 @@ public static class Utils
|
||||||
await imageCreator.WriteToStream(stream, scale!.Value);
|
await imageCreator.WriteToStream(stream, scale!.Value);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static async Task DangerousWriteToPipe(this GridSection section, PipeWriter pipeWriter, float? scale)
|
public static async Task DangerousWriteToPipe(
|
||||||
|
this GridSection section,
|
||||||
|
PipeWriter pipeWriter,
|
||||||
|
float? scale,
|
||||||
|
CancellationToken cancellationToken = default)
|
||||||
{
|
{
|
||||||
var imageCreator = new DangerousImageCreator(section);
|
var imageCreator = new DangerousImageCreator(section);
|
||||||
await imageCreator.WriteToPipe(pipeWriter, scale!.Value);
|
await imageCreator.WriteToPipe(pipeWriter, scale!.Value, cancellationToken);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -58,6 +58,12 @@ public sealed class DangerousImageCreator : IDisposable
|
||||||
|
|
||||||
var yStart = OffsetY;
|
var yStart = OffsetY;
|
||||||
|
|
||||||
|
var pxInt32 = Int32Pixel.Zero;
|
||||||
|
ref var px = ref pxInt32;
|
||||||
|
ref var rChannel = ref Unsafe.As<Int32Pixel, byte>(ref px);
|
||||||
|
ref var gChannel = ref Unsafe.Add(ref rChannel, 4);
|
||||||
|
ref var bChannel = ref Unsafe.Add(ref rChannel, 8);
|
||||||
|
|
||||||
var outputTaskQueue = TaskHelper.SynchronizedTaskFactory.StartNew(() => { }, cancellationToken);
|
var outputTaskQueue = TaskHelper.SynchronizedTaskFactory.StartNew(() => { }, cancellationToken);
|
||||||
for (var y = 0; y < targetHeight; y++)
|
for (var y = 0; y < targetHeight; y++)
|
||||||
{
|
{
|
||||||
|
|
@ -76,14 +82,9 @@ public sealed class DangerousImageCreator : IDisposable
|
||||||
|
|
||||||
int xStart = OffsetX, x0 = 0;
|
int xStart = OffsetX, x0 = 0;
|
||||||
|
|
||||||
var pxInt32 = Int32Pixel.Zero;
|
|
||||||
ref var px = ref pxInt32;
|
|
||||||
ref var rChannel = ref Unsafe.As<Int32Pixel, byte>(ref px);
|
|
||||||
ref var gChannel = ref Unsafe.Add(ref rChannel, 4);
|
|
||||||
ref var bChannel = ref Unsafe.Add(ref rChannel, 8);
|
|
||||||
|
|
||||||
var outputBuffer = MemoryAllocator.Allocate<byte>(outputBufferSize);
|
var outputBuffer = MemoryAllocator.Allocate<byte>(outputBufferSize);
|
||||||
ref var outputChannel = ref outputBuffer.Span[0];
|
ref var outputChannel = ref outputBuffer.Span[0];
|
||||||
|
var boxHeight = yEnd - yStart;
|
||||||
for (int x1 = 0; x1 < targetWidth; x1++)
|
for (int x1 = 0; x1 < targetWidth; x1++)
|
||||||
{
|
{
|
||||||
var xEnd = xLookup[x1];
|
var xEnd = xLookup[x1];
|
||||||
|
|
@ -92,7 +93,7 @@ public sealed class DangerousImageCreator : IDisposable
|
||||||
px += yStartMap[x0];
|
px += yStartMap[x0];
|
||||||
px -= yEndMap[x0];
|
px -= yEndMap[x0];
|
||||||
px -= yStartMap[x1];
|
px -= yStartMap[x1];
|
||||||
px /= Math.Max(1, (xEnd - xStart) * (yEnd - yStart));
|
px /= Math.Max(1, (xEnd - xStart) * boxHeight);
|
||||||
|
|
||||||
outputChannel = rChannel;
|
outputChannel = rChannel;
|
||||||
outputChannel = ref Unsafe.Add(ref outputChannel, 1);
|
outputChannel = ref Unsafe.Add(ref outputChannel, 1);
|
||||||
|
|
@ -108,13 +109,16 @@ public sealed class DangerousImageCreator : IDisposable
|
||||||
}
|
}
|
||||||
|
|
||||||
outputTaskQueue = outputTaskQueue
|
outputTaskQueue = outputTaskQueue
|
||||||
.ContinueWith(_ => encoder.WriteData(outputBuffer, cancellationToken: cancellationToken), cancellationToken);
|
.ContinueWith(async _ =>
|
||||||
|
{
|
||||||
|
await encoder.WriteDataAsync(outputBuffer, cancellationToken: cancellationToken);
|
||||||
|
}, cancellationToken);
|
||||||
|
|
||||||
yStart = yEnd;
|
yStart = yEnd;
|
||||||
}
|
}
|
||||||
|
|
||||||
await outputTaskQueue;
|
await outputTaskQueue;
|
||||||
encoder.WriteEndOfFile(cancellationToken);
|
await encoder.WriteEndOfFileAsync(cancellationToken);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void MapRow(
|
private void MapRow(
|
||||||
|
|
|
||||||
|
|
@ -7,10 +7,11 @@ public class ArrayOwner<T> : IBuffer<T> where T : unmanaged
|
||||||
private readonly ArrayPool<T> _owner;
|
private readonly ArrayPool<T> _owner;
|
||||||
private readonly T[] _buffer;
|
private readonly T[] _buffer;
|
||||||
|
|
||||||
public ArrayOwner(ArrayPool<T> owner, int size)
|
public ArrayOwner(ArrayPool<T> owner, int length)
|
||||||
{
|
{
|
||||||
_owner = owner;
|
_owner = owner;
|
||||||
_buffer = owner.Rent(size);
|
_buffer = owner.Rent(length);
|
||||||
|
Length = length;
|
||||||
}
|
}
|
||||||
|
|
||||||
~ArrayOwner() => Dispose();
|
~ArrayOwner() => Dispose();
|
||||||
|
|
@ -26,4 +27,6 @@ public class ArrayOwner<T> : IBuffer<T> where T : unmanaged
|
||||||
public Span<T> Span => _buffer;
|
public Span<T> Span => _buffer;
|
||||||
|
|
||||||
public T[] Array => _buffer;
|
public T[] Array => _buffer;
|
||||||
|
|
||||||
|
public int Length { get; }
|
||||||
}
|
}
|
||||||
|
|
@ -5,4 +5,6 @@ public interface IBuffer<T> : IDisposable where T : unmanaged
|
||||||
ref T this[int index] { get; }
|
ref T this[int index] { get; }
|
||||||
|
|
||||||
Span<T> Span { get; }
|
Span<T> Span { get; }
|
||||||
|
|
||||||
|
int Length { get; }
|
||||||
}
|
}
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
using System.Buffers;
|
using System.Buffers;
|
||||||
|
using System.Runtime.CompilerServices;
|
||||||
|
|
||||||
namespace StitchATon2.Infra.Buffers;
|
namespace StitchATon2.Infra.Buffers;
|
||||||
|
|
||||||
|
|
@ -15,4 +16,29 @@ public static class MemoryAllocator
|
||||||
|
|
||||||
public static MemoryManager<T> AllocateImmovable<T>(int count) where T : unmanaged
|
public static MemoryManager<T> AllocateImmovable<T>(int count) where T : unmanaged
|
||||||
=> new ImmovableMemory<T>(count);
|
=> new ImmovableMemory<T>(count);
|
||||||
|
|
||||||
|
public static unsafe IBuffer<T> Clone<T>(this IBuffer<T> buffer) where T : unmanaged
|
||||||
|
{
|
||||||
|
if (buffer is UnmanagedMemory<T> unmanagedMemory)
|
||||||
|
{
|
||||||
|
var newBuffer = new UnmanagedMemory<T>(buffer.Length);
|
||||||
|
var byteCount = (uint)(Unsafe.SizeOf<T>() * buffer.Length);
|
||||||
|
Unsafe.CopyBlock(newBuffer.Pointer, unmanagedMemory.Pointer, byteCount);
|
||||||
|
return newBuffer;
|
||||||
|
}
|
||||||
|
|
||||||
|
throw new NotSupportedException();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static unsafe void Copy<T>(this IBuffer<T> source, IBuffer<T> destination, int count) where T : unmanaged
|
||||||
|
{
|
||||||
|
if (source is UnmanagedMemory<T> sourceBuffer && destination is UnmanagedMemory<T> destinationBuffer)
|
||||||
|
{
|
||||||
|
var byteCount = (uint)(Unsafe.SizeOf<T>() * count);
|
||||||
|
Unsafe.CopyBlock(destinationBuffer.Pointer, sourceBuffer.Pointer, byteCount);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
throw new NotSupportedException();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -9,18 +9,19 @@ namespace StitchATon2.Infra.Buffers;
|
||||||
/// <typeparam name="T"></typeparam>
|
/// <typeparam name="T"></typeparam>
|
||||||
internal sealed unsafe class UnmanagedMemory<T> : IBuffer<T> where T : unmanaged
|
internal sealed unsafe class UnmanagedMemory<T> : IBuffer<T> where T : unmanaged
|
||||||
{
|
{
|
||||||
private readonly T* _pointer;
|
internal readonly T* Pointer;
|
||||||
private readonly int _count;
|
|
||||||
private bool _disposed;
|
private bool _disposed;
|
||||||
|
|
||||||
public ref T this[int index] => ref Unsafe.AsRef<T>(_pointer + index);
|
public int Length { get; }
|
||||||
|
|
||||||
public Span<T> Span => new(_pointer, _count);
|
public ref T this[int index] => ref Unsafe.AsRef<T>(Pointer + index);
|
||||||
|
|
||||||
public UnmanagedMemory(int count)
|
public Span<T> Span => new(Pointer, Length);
|
||||||
|
|
||||||
|
public UnmanagedMemory(int length)
|
||||||
{
|
{
|
||||||
_pointer = (T*)NativeMemory.Alloc((nuint)count, (nuint)Unsafe.SizeOf<T>());
|
Pointer = (T*)NativeMemory.Alloc((nuint)length, (nuint)Unsafe.SizeOf<T>());
|
||||||
_count = count;
|
Length = length;
|
||||||
}
|
}
|
||||||
|
|
||||||
~UnmanagedMemory() => Dispose();
|
~UnmanagedMemory() => Dispose();
|
||||||
|
|
@ -29,7 +30,7 @@ internal sealed unsafe class UnmanagedMemory<T> : IBuffer<T> where T : unmanaged
|
||||||
{
|
{
|
||||||
if (!_disposed)
|
if (!_disposed)
|
||||||
{
|
{
|
||||||
NativeMemory.Free(_pointer);
|
NativeMemory.Free(Pointer);
|
||||||
GC.SuppressFinalize(this);
|
GC.SuppressFinalize(this);
|
||||||
_disposed = true;
|
_disposed = true;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,7 @@ public class PngPipeEncoder : IDisposable
|
||||||
{
|
{
|
||||||
private const int BufferSize = 8 * 1024;
|
private const int BufferSize = 8 * 1024;
|
||||||
private const int FlushThreshold = 1024;
|
private const int FlushThreshold = 1024;
|
||||||
|
private const int PipeChunkThreshold = 16 * 1024;
|
||||||
|
|
||||||
private readonly PipeWriter _outputPipe;
|
private readonly PipeWriter _outputPipe;
|
||||||
private readonly MemoryStream _memoryStream;
|
private readonly MemoryStream _memoryStream;
|
||||||
|
|
@ -60,33 +61,33 @@ public class PngPipeEncoder : IDisposable
|
||||||
_outputPipe.Write(headerBytes);
|
_outputPipe.Write(headerBytes);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void WriteData(IBuffer<byte> buffer, bool disposeBuffer = true, CancellationToken cancellationToken = default)
|
public async Task WriteDataAsync(IBuffer<byte> buffer, bool disposeBuffer = true, CancellationToken cancellationToken = default)
|
||||||
{
|
{
|
||||||
_zlibStream.Write([0]);
|
_zlibStream.Write([0]);
|
||||||
|
|
||||||
var dataSlice = buffer.Span;
|
var offset = 0;
|
||||||
while (dataSlice.Length > FlushThreshold)
|
while (buffer.Length - offset > FlushThreshold)
|
||||||
{
|
{
|
||||||
_zlibStream.Write(dataSlice[..FlushThreshold]);
|
_zlibStream.Write(buffer.Span.Slice(offset, FlushThreshold));
|
||||||
_zlibStream.Flush();
|
await _zlibStream.FlushAsync(cancellationToken);
|
||||||
dataSlice = dataSlice[FlushThreshold..];
|
offset += FlushThreshold;
|
||||||
if(_memoryStream.Length >= BufferSize)
|
if(_outputPipe.UnflushedBytes >= PipeChunkThreshold)
|
||||||
Flush(cancellationToken);
|
await FlushAsync(cancellationToken);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (dataSlice.Length > 0)
|
if (buffer.Length > offset)
|
||||||
{
|
{
|
||||||
_zlibStream.Write(dataSlice);
|
_zlibStream.Write(buffer.Span[offset..]);
|
||||||
_zlibStream.Flush();
|
await _zlibStream.FlushAsync(cancellationToken);
|
||||||
_shouldFlush = true;
|
_shouldFlush = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(disposeBuffer) buffer.Dispose();
|
if(disposeBuffer) buffer.Dispose();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void Flush(CancellationToken cancellationToken)
|
private async Task FlushAsync(CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
_zlibStream.Flush();
|
await _zlibStream.FlushAsync(cancellationToken);
|
||||||
var dataSize = (int)(_memoryStream.Length - 8);
|
var dataSize = (int)(_memoryStream.Length - 8);
|
||||||
|
|
||||||
_memoryStream.Write("\0\0\0\0"u8);
|
_memoryStream.Write("\0\0\0\0"u8);
|
||||||
|
|
@ -102,15 +103,17 @@ public class PngPipeEncoder : IDisposable
|
||||||
BinaryPrimitives.WriteUInt32BigEndian(buffer.AsSpan(dataSize + 8), crc);
|
BinaryPrimitives.WriteUInt32BigEndian(buffer.AsSpan(dataSize + 8), crc);
|
||||||
|
|
||||||
_outputPipe.Write(buffer.AsSpan(0, dataSize + 12));
|
_outputPipe.Write(buffer.AsSpan(0, dataSize + 12));
|
||||||
|
await _outputPipe.FlushAsync(cancellationToken);
|
||||||
|
|
||||||
_memoryStream.SetLength(8);
|
_memoryStream.SetLength(8);
|
||||||
_memoryStream.Position = 8;
|
_memoryStream.Position = 8;
|
||||||
_shouldFlush = false;
|
_shouldFlush = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void WriteEndOfFile(CancellationToken cancellationToken = default)
|
public async Task WriteEndOfFileAsync(CancellationToken cancellationToken = default)
|
||||||
{
|
{
|
||||||
if(_shouldFlush)
|
if(_shouldFlush)
|
||||||
Flush(cancellationToken);
|
await FlushAsync(cancellationToken);
|
||||||
|
|
||||||
Span<byte> endChunk = [
|
Span<byte> endChunk = [
|
||||||
0x00, 0x00, 0x00, 0x00, // Length
|
0x00, 0x00, 0x00, 0x00, // Length
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,7 @@ using SixLabors.ImageSharp.Formats;
|
||||||
using SixLabors.ImageSharp.Formats.Png;
|
using SixLabors.ImageSharp.Formats.Png;
|
||||||
using SixLabors.ImageSharp.PixelFormats;
|
using SixLabors.ImageSharp.PixelFormats;
|
||||||
using StitchATon2.Infra.Buffers;
|
using StitchATon2.Infra.Buffers;
|
||||||
|
using StitchATon2.Infra.Synchronization;
|
||||||
|
|
||||||
namespace StitchATon2.Infra;
|
namespace StitchATon2.Infra;
|
||||||
|
|
||||||
|
|
@ -58,7 +59,7 @@ public class ImageIntegral : IDisposable
|
||||||
{
|
{
|
||||||
if (_memoryMappedFile is null)
|
if (_memoryMappedFile is null)
|
||||||
{
|
{
|
||||||
Task.Factory.StartNew(() => Initialize(cancellationToken), cancellationToken);
|
Task.Run(() => Initialize(cancellationToken), cancellationToken);
|
||||||
_initializationLock.Wait(cancellationToken);
|
_initializationLock.Wait(cancellationToken);
|
||||||
_initializationLock.Dispose();
|
_initializationLock.Dispose();
|
||||||
}
|
}
|
||||||
|
|
@ -86,8 +87,8 @@ public class ImageIntegral : IDisposable
|
||||||
}
|
}
|
||||||
|
|
||||||
var taskQueue = backedFileStream == null
|
var taskQueue = backedFileStream == null
|
||||||
? Task.CompletedTask
|
? TaskHelper.SynchronizedTaskFactory.StartNew(() => { }, cancellationToken)
|
||||||
: AllocateBackedFile(backedFileStream, header);
|
: AllocateBackedFile(backedFileStream, header, cancellationToken);
|
||||||
|
|
||||||
taskQueue = taskQueue.ContinueWith(
|
taskQueue = taskQueue.ContinueWith(
|
||||||
_ =>
|
_ =>
|
||||||
|
|
@ -129,7 +130,7 @@ public class ImageIntegral : IDisposable
|
||||||
var imageBuffer = image.Frames.RootFrame.PixelBuffer;
|
var imageBuffer = image.Frames.RootFrame.PixelBuffer;
|
||||||
|
|
||||||
var accumulator = Int32Pixel.Zero;
|
var accumulator = Int32Pixel.Zero;
|
||||||
var buffer = MemoryAllocator.AllocateArray<Int32Pixel>(_width);
|
var buffer = MemoryAllocator.Allocate<Int32Pixel>(_width);
|
||||||
var processedRows = _processedRows;
|
var processedRows = _processedRows;
|
||||||
Interlocked.Exchange(ref _queueCounter, 0);
|
Interlocked.Exchange(ref _queueCounter, 0);
|
||||||
|
|
||||||
|
|
@ -143,20 +144,21 @@ public class ImageIntegral : IDisposable
|
||||||
buffer[x] = accumulator;
|
buffer[x] = accumulator;
|
||||||
}
|
}
|
||||||
|
|
||||||
taskQueue = QueueWriterTask(taskQueue, 0, buffer.Clone(_width), cancellationToken);
|
taskQueue = QueueWriterTask(taskQueue, 0, buffer.Clone(), cancellationToken);
|
||||||
processedRows++;
|
processedRows++;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
ReadRow(processedRows - 1, buffer);
|
ReadRow(processedRows - 1, buffer.Span);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(cancellationToken.IsCancellationRequested)
|
if(cancellationToken.IsCancellationRequested)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
var prevBuffer = buffer;
|
var prevBuffer = buffer;
|
||||||
buffer = MemoryAllocator.AllocateArray<Int32Pixel>(_width);
|
buffer = MemoryAllocator.Allocate<Int32Pixel>(_width);
|
||||||
|
try
|
||||||
|
{
|
||||||
for (int y = processedRows; y < image.Height; y++)
|
for (int y = processedRows; y < image.Height; y++)
|
||||||
{
|
{
|
||||||
var sourceRow = imageBuffer.DangerousGetRowSpan(y);
|
var sourceRow = imageBuffer.DangerousGetRowSpan(y);
|
||||||
|
|
@ -180,13 +182,17 @@ public class ImageIntegral : IDisposable
|
||||||
break;
|
break;
|
||||||
|
|
||||||
var writeBuffer = prevBuffer;
|
var writeBuffer = prevBuffer;
|
||||||
Array.Copy(buffer.Array, writeBuffer.Array, image.Width);
|
buffer.Copy(writeBuffer, _width);
|
||||||
taskQueue = QueueWriterTask(taskQueue, y, writeBuffer, cancellationToken);
|
taskQueue = QueueWriterTask(taskQueue, y, writeBuffer, cancellationToken);
|
||||||
prevBuffer = buffer;
|
prevBuffer = buffer;
|
||||||
buffer = MemoryAllocator.AllocateArray<Int32Pixel>(_width);
|
buffer = MemoryAllocator.Allocate<Int32Pixel>(_width);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
buffer.Dispose();
|
||||||
}
|
}
|
||||||
|
|
||||||
buffer.Dispose();
|
|
||||||
if(cancellationToken.IsCancellationRequested)
|
if(cancellationToken.IsCancellationRequested)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|
@ -205,7 +211,7 @@ public class ImageIntegral : IDisposable
|
||||||
private Task QueueWriterTask(
|
private Task QueueWriterTask(
|
||||||
Task taskQueue,
|
Task taskQueue,
|
||||||
int row,
|
int row,
|
||||||
ArrayOwner<Int32Pixel> writeBuffer,
|
IBuffer<Int32Pixel> writeBuffer,
|
||||||
CancellationToken cancellationToken)
|
CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
Interlocked.Increment(ref _queueCounter);
|
Interlocked.Increment(ref _queueCounter);
|
||||||
|
|
@ -213,7 +219,7 @@ public class ImageIntegral : IDisposable
|
||||||
return taskQueue.ContinueWith(_ =>
|
return taskQueue.ContinueWith(_ =>
|
||||||
{
|
{
|
||||||
using (var view = AcquireView(row, MemoryMappedFileAccess.Write))
|
using (var view = AcquireView(row, MemoryMappedFileAccess.Write))
|
||||||
view.WriteArray(0, writeBuffer.Array, 0, _width);
|
view.DangerousWriteSpan(0, writeBuffer.Span, 0, _width);
|
||||||
|
|
||||||
writeBuffer.Dispose();
|
writeBuffer.Dispose();
|
||||||
_rowLocks!.Memory.Span[row].Set();
|
_rowLocks!.Memory.Span[row].Set();
|
||||||
|
|
@ -249,12 +255,6 @@ public class ImageIntegral : IDisposable
|
||||||
view.DangerousReadSpan(0, buffer, 0, _width);
|
view.DangerousReadSpan(0, buffer, 0, _width);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ReadRow(int row, ArrayOwner<Int32Pixel> buffer)
|
|
||||||
{
|
|
||||||
using var view = AcquireView(row, MemoryMappedFileAccess.Read);
|
|
||||||
view.DangerousReadSpan(0, buffer.Span, 0, _width);
|
|
||||||
}
|
|
||||||
|
|
||||||
private FileStream? InitializeBackedFile(string path, out Header header)
|
private FileStream? InitializeBackedFile(string path, out Header header)
|
||||||
{
|
{
|
||||||
var expectedHeader = Header.CreateInitial(_width, _height);
|
var expectedHeader = Header.CreateInitial(_width, _height);
|
||||||
|
|
@ -311,7 +311,9 @@ public class ImageIntegral : IDisposable
|
||||||
return fs;
|
return fs;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static async Task AllocateBackedFile(FileStream fileStream, Header header)
|
private static Task AllocateBackedFile(FileStream fileStream, Header header, CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
return TaskHelper.SynchronizedTaskFactory.StartNew(() =>
|
||||||
{
|
{
|
||||||
// The input filestream is expected to be empty with
|
// The input filestream is expected to be empty with
|
||||||
// initial cursor at the beginning of the file and the content
|
// initial cursor at the beginning of the file and the content
|
||||||
|
|
@ -336,8 +338,8 @@ public class ImageIntegral : IDisposable
|
||||||
// }
|
// }
|
||||||
|
|
||||||
fileStream.SetLength(header.Length + Header.Size);
|
fileStream.SetLength(header.Length + Header.Size);
|
||||||
|
fileStream.Dispose();
|
||||||
await fileStream.DisposeAsync();
|
}, cancellationToken);
|
||||||
}
|
}
|
||||||
|
|
||||||
[StructLayout(LayoutKind.Sequential)]
|
[StructLayout(LayoutKind.Sequential)]
|
||||||
|
|
|
||||||
|
|
@ -1,16 +1,13 @@
|
||||||
using System.IO.MemoryMappedFiles;
|
using System.IO.MemoryMappedFiles;
|
||||||
using System.Runtime.CompilerServices;
|
|
||||||
using System.Runtime.InteropServices;
|
|
||||||
using StitchATon2.Infra.Buffers;
|
|
||||||
|
|
||||||
namespace StitchATon2.Infra;
|
namespace StitchATon2.Infra;
|
||||||
|
|
||||||
public static class Utils
|
internal static class Utils
|
||||||
{
|
{
|
||||||
private static unsafe uint AlignedSizeOf<T>() where T : unmanaged
|
private static unsafe uint AlignedSizeOf<T>() where T : unmanaged
|
||||||
{
|
{
|
||||||
uint size = (uint)sizeof(T);
|
uint size = (uint)sizeof(T);
|
||||||
return size is 1 or 2 ? size : (uint)((size + 3) & (~3));
|
return size is 1 or 2 ? size : (uint)((size + 3) & ~3);
|
||||||
}
|
}
|
||||||
|
|
||||||
internal static void DangerousReadSpan<T>(this MemoryMappedViewAccessor view, long position, Span<T> span, int offset, int count)
|
internal static void DangerousReadSpan<T>(this MemoryMappedViewAccessor view, long position, Span<T> span, int offset, int count)
|
||||||
|
|
@ -36,10 +33,10 @@ public static class Utils
|
||||||
view.SafeMemoryMappedViewHandle.ReadSpan(byteOffset, span.Slice(offset, n));
|
view.SafeMemoryMappedViewHandle.ReadSpan(byteOffset, span.Slice(offset, n));
|
||||||
}
|
}
|
||||||
|
|
||||||
public static ArrayOwner<T> Clone<T>(this ArrayOwner<T> arrayOwner, int length) where T : unmanaged
|
internal static void DangerousWriteSpan<T>(this MemoryMappedViewAccessor view, long position, Span<T> span, int offset, int count)
|
||||||
|
where T : unmanaged
|
||||||
{
|
{
|
||||||
var newArrayOwner = MemoryAllocator.AllocateArray<T>(length);
|
var byteOffset = (ulong)(view.PointerOffset + position);
|
||||||
Array.Copy(arrayOwner.Array, 0, newArrayOwner.Array, 0, length);
|
view.SafeMemoryMappedViewHandle.WriteSpan<T>(byteOffset, span.Slice(offset, count));
|
||||||
return newArrayOwner;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Loading…
Add table
Add a link
Reference in a new issue