v0.15.4: ARCH-1 step 4 — extract MountManager (final ARCH-1 step) #45
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| using System; | ||
| using System.IO; | ||
| using Microsoft.Win32; | ||
|
|
||
| namespace Pixelpipe | ||
| { | ||
| // ARCH-1 step 3 (v0.15.3, audit): third collaborator extracted from | ||
| // the TrayContext partial. Owns the cached rclone / WinFsp availability | ||
| // state plus the synchronous probes themselves. | ||
| // | ||
| // The TTL + UI-thread-friendly cached accessors stay where they were | ||
| // semantically — UI callers ask "is rclone available?" and get back | ||
| // whatever the last refresh wrote, never touching disk on the UI thread. | ||
| // The async refresh worker (RefreshDependencyStatusAsync) stays in | ||
| // TrayContext for now because it composes results into the setup-status | ||
| // line; it just hands off the actual probe calls to this class. | ||
| internal sealed class DependencyProbe | ||
| { | ||
| public const int CacheTtlSeconds = 30; | ||
|
|
||
| private readonly Func<string> _rclonePathProvider; | ||
| private readonly Action<string, Exception> _logIssue; | ||
| private volatile bool _cachedRcloneAvailable; | ||
| private volatile bool _cachedWinfspInstalled; | ||
| private DateTime _cachedStampUtc = DateTime.MinValue; | ||
|
|
||
| public DependencyProbe(Func<string> rclonePathProvider, Action<string, Exception> logIssue) | ||
| { | ||
| _rclonePathProvider = rclonePathProvider; | ||
| _logIssue = logIssue; | ||
| } | ||
|
|
||
| public bool RcloneAvailable { get { return _cachedRcloneAvailable; } } | ||
| public bool WinFspInstalled { get { return _cachedWinfspInstalled; } } | ||
| public DateTime LastProbeUtc { get { return _cachedStampUtc; } } | ||
| public bool IsStale { get { return (DateTime.UtcNow - _cachedStampUtc).TotalSeconds >= CacheTtlSeconds; } } | ||
|
|
||
| // Called by the async refresh worker after the slow probes complete. | ||
| public void PublishProbeResults(bool rcloneAvailable, bool winfspInstalled) | ||
| { | ||
| _cachedRcloneAvailable = rcloneAvailable; | ||
| _cachedWinfspInstalled = winfspInstalled; | ||
| _cachedStampUtc = DateTime.UtcNow; | ||
| } | ||
|
|
||
| // Synchronous rclone probe. Tries the resolved path first; if that | ||
| // file isn't present, falls back to spawning `rclone.exe version` | ||
| // (PATH resolution). Returns true if either path responds. | ||
| public bool ProbeRcloneSync(Func<string, int, string> runProcessCapture) | ||
| { | ||
| try | ||
| { | ||
| string resolved = _rclonePathProvider == null ? null : _rclonePathProvider(); | ||
| if (!String.IsNullOrEmpty(resolved) && File.Exists(resolved)) return true; | ||
| if (runProcessCapture == null) return false; | ||
| string version = runProcessCapture("rclone.exe", 3000); | ||
| return !String.IsNullOrEmpty(version) && version.IndexOf("rclone", StringComparison.OrdinalIgnoreCase) >= 0; | ||
| } | ||
| catch (Exception ex) { if (_logIssue != null) _logIssue("dep probe rclone", ex); return false; } | ||
| } | ||
|
|
||
| // Synchronous WinFsp probe. Two on-disk dll locations + two registry | ||
| // keys; any positive signal is enough. | ||
| public bool ProbeWinFspSync() | ||
| { | ||
| try | ||
| { | ||
| string pf86 = Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86); | ||
| string pf = Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles); | ||
| if (File.Exists(Path.Combine(pf86, "WinFsp", "bin", "winfsp-x64.dll"))) return true; | ||
| if (File.Exists(Path.Combine(pf, "WinFsp", "bin", "winfsp-x64.dll"))) return true; | ||
| using (RegistryKey k1 = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\WinFsp")) { if (k1 != null) return true; } | ||
| using (RegistryKey k2 = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\WOW6432Node\WinFsp")) { if (k2 != null) return true; } | ||
| } | ||
| catch (Exception ex) { if (_logIssue != null) _logIssue("dep probe winfsp", ex); } | ||
| return false; | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| using System; | ||
| using System.Diagnostics; | ||
| using System.IO; | ||
|
|
||
| namespace Pixelpipe | ||
| { | ||
| // ARCH-1 step 4 (v0.15.4, audit): fourth and final collaborator | ||
| // extracted from the TrayContext partial. Owns just the rclone mount | ||
| // process-lifecycle bits: argument assembly + Process.Start + Job Object | ||
| // binding. The dialog flow (rclone-missing, WinFsp-missing, remote-not- | ||
| // configured, drive-in-use, post-launch result) stays in TrayContext | ||
| // because it's heavily UI-coupled. | ||
| // | ||
| // This is intentionally a thin extraction. The audit calls ARCH-1 | ||
| // incremental; later releases can pull more orchestration in once the | ||
| // shape of "what doesn't need a TrayContext" stabilises. | ||
| internal sealed class MountManager | ||
| { | ||
| // Pure helper, tests cover it. Builds the rclone mount argv that | ||
| // Pixelpipe has used since v0.5.x with all the cache-mode, VFS, | ||
| // network-mode, RC, and bandwidth flags in one place. Caller passes | ||
| // RcCommonFlags + effective bandwidth so this class doesn't need to | ||
| // know about the auth token / per-profile bandwidth resolution. | ||
| internal static string BuildMountArgs(RemoteProfile p, bool fullCache, string rcCommonFlags, string effectiveBandwidth) | ||
| { | ||
| if (p == null) return ""; | ||
| string cacheMode = fullCache ? "full" : "writes"; | ||
| string args = "mount " + TrayContext.QuoteArg(TrayContext.NormalizeRemoteName(p.Remote)) | ||
| + " " + TrayContext.QuoteArg(TrayContext.NormalizeDriveLetter(p.DriveLetter)) | ||
| + " --links" | ||
| + (String.Equals(p.MountMode, "network", StringComparison.OrdinalIgnoreCase) ? " --network-mode" : "") | ||
| + " --vfs-cache-mode " + cacheMode | ||
| + " --dir-cache-time 10m" | ||
| + " --poll-interval 1m" | ||
| + " --vfs-write-back 10s" | ||
| + " --vfs-cache-max-age 6h" | ||
| + " --vfs-cache-max-size 5G" | ||
| + " --volname " + TrayContext.QuoteArg(p.Label) | ||
| + " --rc " + (rcCommonFlags ?? "") | ||
| + " --log-level INFO" | ||
| + " --log-file " + TrayContext.QuoteArg(p.LogFile); | ||
| if (!String.IsNullOrEmpty(effectiveBandwidth) | ||
| && !String.Equals(effectiveBandwidth, "off", StringComparison.OrdinalIgnoreCase)) | ||
| { | ||
| args += " --bwlimit " + effectiveBandwidth; | ||
| } | ||
| return args; | ||
| } | ||
|
|
||
| // Spawns rclone mount and binds the child to the kill-on-job-close | ||
| // Job Object so it dies with Pixelpipe even on Task Manager kill / | ||
| // crash / sign-out. Returns the started Process; caller is | ||
| // responsible for the post-launch monitor (1900 ms wait + exit | ||
| // check + UI feedback). | ||
| internal static Process StartMountProcess(string rclonePath, string args, Action<string> logJobWarn) | ||
| { | ||
| ProcessStartInfo psi = new ProcessStartInfo(); | ||
| psi.FileName = rclonePath; | ||
| psi.Arguments = args; | ||
| psi.UseShellExecute = false; | ||
| psi.CreateNoWindow = true; | ||
| psi.WindowStyle = ProcessWindowStyle.Hidden; | ||
| psi.WorkingDirectory = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile); | ||
| Process child = Process.Start(psi); | ||
| RcloneJob.TryAssign(child, logJobWarn); | ||
| return child; | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The
_cachedStampUtcfield is a 64-bitDateTimevalue that is read and written across different threads (the UI thread and the background refresh worker thread) without synchronization. On 32-bit architectures, 64-bit reads and writes are not atomic, which can lead to torn reads. Additionally, without memory barriers, there is no guarantee of visibility or ordering.Using a lock to synchronize access to all cached fields (
_cachedRcloneAvailable,_cachedWinfspInstalled, and_cachedStampUtc) ensures thread safety and correctness across all platforms.