Akatsuki-Misaki/ArchiSteamFarm
1
0
Fork 0
mirror of https://github.com/JustArchiNET/ArchiSteamFarm.git synced 2025-12-17 06:50:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Slightly improve error-reporting related to cross-process semaphore

Browse Source
This commit is contained in:
Łukasz Domeradzki
2025-10-14 13:01:34 +02:00
parent 725a3a5106
commit ae183ae3ad
1 changed files with 53 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
ArchiSteamFarm/Helpers/CrossProcessFileBasedSemaphore.cs
View File

@@ -86,7 +86,11 @@ internal sealed class CrossProcessFileBasedSemaphore : IAsyncDisposable, ICrossP
try { try {
while (true) { while (true) {
if (!await EnsureFileExists().ConfigureAwait(false)) { if (!await EnsureFileExists().ConfigureAwait(false)) {
throw new IOException(Strings.FormatWarningFailedWithError(nameof(EnsureFileExists))); ASF.ArchiLogger.LogGenericError(Strings.FormatWarningFailedWithError(nameof(EnsureFileExists)));
await Task.Delay(SpinLockDelay * 25, cancellationToken).ConfigureAwait(false);
continue;
} }
try { try {
@@ -128,7 +132,7 @@ internal sealed class CrossProcessFileBasedSemaphore : IAsyncDisposable, ICrossP
try { try {
stopwatch.Stop(); stopwatch.Stop();
if (stopwatch.ElapsedMilliseconds >= millisecondsTimeout) { if (stopwatch.ElapsedMilliseconds > millisecondsTimeout) {
return false; return false;
} }
@@ -136,7 +140,18 @@ internal sealed class CrossProcessFileBasedSemaphore : IAsyncDisposable, ICrossP
while (true) { while (true) {
if (!await EnsureFileExists().ConfigureAwait(false)) { if (!await EnsureFileExists().ConfigureAwait(false)) {
throw new IOException(Strings.FormatWarningFailedWithError(nameof(EnsureFileExists))); ASF.ArchiLogger.LogGenericError(Strings.FormatWarningFailedWithError(nameof(EnsureFileExists)));
if (millisecondsTimeout <= 0) {
return false;
}
int sleep = Math.Min(millisecondsTimeout, SpinLockDelay * 25);
await Task.Delay(sleep, cancellationToken).ConfigureAwait(false);
millisecondsTimeout -= sleep;
continue;
} }
try { try {
@@ -154,12 +169,14 @@ internal sealed class CrossProcessFileBasedSemaphore : IAsyncDisposable, ICrossP
} catch (FileNotFoundException) { } catch (FileNotFoundException) {
throw; throw;
} catch (IOException) { } catch (IOException) {
if (millisecondsTimeout <= SpinLockDelay) { if (millisecondsTimeout <= 0) {
return false; return false;
} }
await Task.Delay(SpinLockDelay, cancellationToken).ConfigureAwait(false); int sleep = Math.Min(millisecondsTimeout, SpinLockDelay);
millisecondsTimeout -= SpinLockDelay;
await Task.Delay(sleep, cancellationToken).ConfigureAwait(false);
millisecondsTimeout -= sleep;
} }
} }
} finally { } finally {
@@ -184,20 +201,26 @@ internal sealed class CrossProcessFileBasedSemaphore : IAsyncDisposable, ICrossP
} }
if (!Directory.Exists(directoryPath)) { if (!Directory.Exists(directoryPath)) {
if (OperatingSystem.IsWindows()) { try {
DirectoryInfo directoryInfo = Directory.CreateDirectory(directoryPath); if (OperatingSystem.IsWindows()) {
DirectoryInfo directoryInfo = Directory.CreateDirectory(directoryPath);
try { try {
DirectorySecurity directorySecurity = new(directoryPath, AccessControlSections.All); DirectorySecurity directorySecurity = new(directoryPath, AccessControlSections.All);
directoryInfo.SetAccessControl(directorySecurity); directoryInfo.SetAccessControl(directorySecurity);
} catch (PrivilegeNotHeldException e) { } catch (PrivilegeNotHeldException e) {
// Non-critical, user might have no rights to manage the resource // Non-critical, user might have no rights to manage the resource
ASF.ArchiLogger.LogGenericDebuggingException(e); ASF.ArchiLogger.LogGenericDebuggingException(e);
}
} else if (OperatingSystem.IsFreeBSD() || OperatingSystem.IsLinux() || OperatingSystem.IsMacOS()) {
// We require global access from all users, as other ASFs might need to put additional files in there
Directory.CreateDirectory(directoryPath, UnixFileMode.UserRead | UnixFileMode.UserWrite | UnixFileMode.UserExecute | UnixFileMode.GroupRead | UnixFileMode.GroupWrite | UnixFileMode.GroupExecute | UnixFileMode.OtherRead | UnixFileMode.OtherWrite | UnixFileMode.OtherExecute);
} }
} else if (OperatingSystem.IsFreeBSD() || OperatingSystem.IsLinux() || OperatingSystem.IsMacOS()) { } catch (IOException e) {
// We require global access from all users, as other ASFs might need to put additional files in there ASF.ArchiLogger.LogGenericException(e);
Directory.CreateDirectory(directoryPath, UnixFileMode.UserRead | UnixFileMode.UserWrite | UnixFileMode.UserExecute | UnixFileMode.GroupRead | UnixFileMode.GroupWrite | UnixFileMode.GroupExecute | UnixFileMode.OtherRead | UnixFileMode.OtherWrite | UnixFileMode.OtherExecute);
return false;
} }
} }
@@ -228,11 +251,21 @@ internal sealed class CrossProcessFileBasedSemaphore : IAsyncDisposable, ICrossP
await new FileStream(FilePath, fileStreamOptions).DisposeAsync().ConfigureAwait(false); await new FileStream(FilePath, fileStreamOptions).DisposeAsync().ConfigureAwait(false);
} }
} catch (IOException e) { } catch (IOException e) {
// Ignored, if the file was already created in the meantime by another instance, this is fine if (i == 0) {
ASF.ArchiLogger.LogGenericDebuggingException(e); // Ignored, if the file was already created in the meantime by another instance, this is fine
ASF.ArchiLogger.LogGenericDebuggingException(e);
continue;
}
// It's not fine if the same issue happened again
ASF.ArchiLogger.LogGenericException(e);
return false;
} }
} }
return false; // It's also not fine if we failed to create the file twice in a row
return File.Exists(FilePath);
} }
} }