ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

TasStateManager - simplify MaxState logic and actually fix the math so it isn't 2x of what is intended

This commit is contained in:
adelikat 2020-05-17 10:41:39 -05:00
parent 45fd7ee81e
commit 604f4ce833
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs
View File

@ -25,13 +25,12 @@ namespace BizHawk.Client.Common
private readonly ITasMovie _movie; private readonly ITasMovie _movie;
private readonly SortedList<int, byte[]> _states; private readonly SortedList<int, byte[]> _states;
private readonly ulong _expectedStateSize; private readonly double _expectedStateSizeInMb;
private ulong _used; private ulong _used;
private int _stateFrequency; private int _stateFrequency;
private int MaxStates => (int)(Settings.Cap / _expectedStateSize) + private int MaxStates => (int)(Settings.CapacityMb / _expectedStateSizeInMb + 1);
(int)((ulong)Settings.DiskCapacityMb * 1024 * 1024 / _expectedStateSize);
private int FileStateGap => 1 << Settings.FileStateGap; private int FileStateGap => 1 << Settings.FileStateGap;
/// <exception cref="InvalidOperationException">loaded core expects savestate size of <c>0 B</c></exception> /// <exception cref="InvalidOperationException">loaded core expects savestate size of <c>0 B</c></exception>
@ -47,8 +46,8 @@ namespace BizHawk.Client.Common
_decay = new StateManagerDecay(_movie, this); _decay = new StateManagerDecay(_movie, this);
_expectedStateSize = (ulong)Core.CloneSavestate().Length; // TODO: why do we store this in a ulong? _expectedStateSizeInMb = Core.CloneSavestate().Length / (double)(1024 * 1024);
if (_expectedStateSize == 0) if (_expectedStateSizeInMb.HawkFloatEquality(0))
{ {
throw new InvalidOperationException("Savestate size can not be zero!"); throw new InvalidOperationException("Savestate size can not be zero!");
} }
@ -103,7 +102,7 @@ namespace BizHawk.Client.Common
public void UpdateStateFrequency() public void UpdateStateFrequency()
{ {
_stateFrequency = ((int)_expectedStateSize / Settings.MemStateGapDivider / 1024) _stateFrequency = ((int)_expectedStateSizeInMb / Settings.MemStateGapDivider / 1024)
.Clamp(MinFrequency, MaxFrequency); .Clamp(MinFrequency, MaxFrequency);
_decay.UpdateSettings(MaxStates, _stateFrequency, 4); _decay.UpdateSettings(MaxStates, _stateFrequency, 4);

8
src/BizHawk.Client.Common/movie/tasproj/TasStateManagerSettings.cs
View File

@ -1,5 +1,4 @@
using System.ComponentModel; using System.ComponentModel;
using Newtonsoft.Json;
namespace BizHawk.Client.Common namespace BizHawk.Client.Common
{ {
@ -64,12 +63,5 @@ namespace BizHawk.Client.Common
[DisplayName("State interval for .tasproj")] [DisplayName("State interval for .tasproj")]
[Description("The actual state gap in frames is calculated as Nth power on 2")] [Description("The actual state gap in frames is calculated as Nth power on 2")]
public int FileStateGap { get; set; } public int FileStateGap { get; set; }
/// <summary>
/// The memory state capacity in bytes.
/// </summary>
[JsonIgnore]
[Browsable(false)]
public ulong Cap => (ulong)CapacityMb * 1024UL * 1024UL;
} }
} }