Skip to content

Harden background compressor against stalled native work #23

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

Draft
marcmy wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Harden background compressor against stalled native work #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b404e7
Expose compactor progress for stall detection
marcmy Aug 18, 2026
d8e1f05
Recover safely from stalled background compression
marcmy Aug 18, 2026
cf06b04
Keep background completion behavior unchanged
marcmy Aug 18, 2026
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
26 changes: 25 additions & 1 deletion CompactGUI.Core/Compactor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ public sealed class Compactor : ICompressor, IDisposable
private readonly ConcurrentDictionary<string, WOFCompressionAlgorithm> processedFiles = new(StringComparer.OrdinalIgnoreCase);
private readonly ConcurrentDictionary<string, byte> failedFiles = new(StringComparer.OrdinalIgnoreCase);
private IReadOnlyList<CompressionWorkItem> workItems = [];
private long progressVersion = 0;
private string currentPhase = "Idle";
private string? currentFile;

private ILogger<Compactor> _logger;

Expand All @@ -48,6 +51,9 @@ public sealed class Compactor : ICompressor, IDisposable
public int DisplayFailedFiles => progressBaseline.FailedFiles + Volatile.Read(ref failedFileCount);
public long DisplayTotalBytes { get; private set; }
public int DisplayTotalFiles { get; private set; }
public long ProgressVersion => Interlocked.Read(ref progressVersion);
public string CurrentPhase => Volatile.Read(ref currentPhase);
public string? CurrentFile => Volatile.Read(ref currentFile);

public Compactor(
string folderPath,
Expand Down Expand Up @@ -80,11 +86,19 @@ private void InitializeCompressionInfoPointer()

}

private void ReportProgress(string phase, string? file = null)
{
Volatile.Write(ref currentPhase, phase);
Volatile.Write(ref currentFile, file);
Interlocked.Increment(ref progressVersion);
}


public async Task<bool> RunAsync(List<string>? filesList, IProgress<CompressionProgress>? progressMonitor = null, int maxParallelism = 1)
{
if(cancellationTokenSource.IsCancellationRequested) { return false; }

ReportProgress("Building work list");
CompactorLog.BuildingWorkingFilesList(_logger, workingDirectory);
List<FileDetails> workingFiles;
try
Expand All @@ -93,11 +107,13 @@ public async Task<bool> RunAsync(List<string>? filesList, IProgress<CompressionP
}
catch (OperationCanceledException)
{
ReportProgress("Idle");
CompactorLog.CompressionCanceled(_logger);
return false;
}
catch (Exception ex)
{
ReportProgress("Idle");
CompactorLog.CompressionFailed(_logger, ex.Message);
return false;
}
Expand All @@ -117,6 +133,7 @@ public async Task<bool> RunAsync(List<string>? filesList, IProgress<CompressionP
processedFiles.Clear();
failedFiles.Clear();

ReportProgress("Work list ready");
CompactorLog.WorkListBuilt(
_logger,
WorkItemCount,
Expand All @@ -142,6 +159,7 @@ public async Task<bool> RunAsync(List<string>? filesList, IProgress<CompressionP
TotalFiles = DisplayTotalFiles,
FailedFiles = progressBaseline.FailedFiles
});
ReportProgress("Idle");
CompactorLog.CompressionCompleted(_logger, 0);
return false;
}
Expand All @@ -151,6 +169,7 @@ public async Task<bool> RunAsync(List<string>? filesList, IProgress<CompressionP
if (maxParallelism <= 0) maxParallelism = Environment.ProcessorCount;
ParallelOptions parallelOptions = new() { MaxDegreeOfParallelism = maxParallelism, CancellationToken = cancellationTokenSource.Token };

ReportProgress("Compressing");
CompactorLog.StartingCompression(_logger, workingDirectory, wofCompressionAlgorithm.ToString(), maxParallelism);
try
{
Expand All @@ -163,23 +182,26 @@ await Parallel.ForEachAsync(workingFiles, parallelOptions,
}).ConfigureAwait(false);
}
catch (OperationCanceledException){
ReportProgress("Idle");
CompactorLog.CompressionCanceled(_logger);
return false;
}
catch (Exception ex){
ReportProgress("Idle");
CompactorLog.CompressionFailed(_logger, ex.Message);
return false;
}
finally { sw.Stop();}



ReportProgress("Idle");
CompactorLog.CompressionCompleted(_logger, Math.Round(sw.Elapsed.TotalSeconds, 3));
return true;
}

private async Task PauseAndProcessFile(FileDetails file, long totalFilesSize, CancellationToken token, IProgress<CompressionProgress>? progressMonitor)
{
ReportProgress("Waiting to process file", file.FileName);
CompactorLog.ProcessingFile(_logger, file.FileName, file.UncompressedSize);

await pauseSemaphore.WaitAsync(token).ConfigureAwait(false);
Expand All @@ -197,7 +219,9 @@ private async Task PauseAndProcessFile(FileDetails file, long totalFilesSize, Ca
progressBaseline.FailedFiles + Volatile.Read(ref failedFileCount),
DisplayTotalBytes));

ReportProgress("Compressing file", file.FileName);
FileOperationResult operation = WOFCompressFile(file.FileName);
ReportProgress("Processed file", file.FileName);
bool succeeded = operation.Succeeded;
long? compressedSize = null;
if (succeeded)
Expand Down
Loading
Loading