Skip to content
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

Jump to bottom

Fix performance issues #63

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

Fix performance issues #63

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
b0c738d
Reduce unnecessary allocations
Milkitic Jun 22, 2022
310ff14
`out` to `ref` to avoid struct copy
Milkitic Jun 22, 2022
a2ba698
static
Milkitic Jun 22, 2022
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
5 changes: 3 additions & 2 deletions Memory/OsuBeatmapFinder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ internal class OsuBeatmapFinder : OsuFinderBase
private const int MAX_RETRY_COUNT = 10;

private IntPtr m_beatmap_address;

private static byte[] s_beatmap_pattern_bytes;

public OsuBeatmapFinder(Process osu) : base(osu)
{
var versionBeatmapOffset = BeatmapOffsetInfo.MatchVersion(Setting.CurrentOsuVersionValue);
Expand All @@ -47,7 +48,7 @@ public override bool TryInit()
SigScan.Reload();
{
//Find Beatmap ID Address
m_beatmap_address = SigScan.FindPattern(StringToByte(s_beatmap_pattern), s_beatmap_mask, 4);
m_beatmap_address = SigScan.FindPattern(s_beatmap_pattern_bytes = s_beatmap_pattern_bytes ?? StringToByte(s_beatmap_pattern), s_beatmap_mask, 4);
LogHelper.LogToFile($"Beatmap Base Address (0):0x{(int)m_beatmap_address:X8}");

success = TryReadIntPtrFromMemory(m_beatmap_address, out m_beatmap_address);
Expand Down
9 changes: 6 additions & 3 deletions Memory/OsuFinderBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,12 @@ public OsuFinderBase(Process process)

protected byte[] StringToByte(string s)
{
_a.Clear();
foreach (var c in s) _a.Add((byte)c);
return _a.ToArray();
lock (_a)
{
_a.Clear();
foreach (var c in s) _a.Add((byte)c);
return _a.ToArray();
}
}

private byte[] _number_buf = new byte[8];
Expand Down
25 changes: 17 additions & 8 deletions Memory/OsuHitEventFinder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,18 +80,18 @@ internal class OsuReplayHitEventFinder : BaseOsuHitEventFinder
// 74 4D A1 ?? ?? ?? ?? 8B 58 34 8D 46 FF
// A1 ?? ?? ?? ?? 8B 40 34 8B 70 0C
// 75 0E 33 D2 89 15 ?? ?? ?? ?? 89 15
internal override string[] pattern => new string[] {
internal override string[] pattern { get; } = new string[] {
"\xD9\x5D\xC0\xEB\x4E\xA1\x00\x00\x00\x00\x8B\x48\x34\x4E",
"\x74\x4D\xA1\x00\x00\x00\x00\x8B\x58\x34\x8D\x46\xFF",
"\xA1\x00\x00\x00\x00\x8B\x40\x34\x8B\x70\x0C",
"\x75\x0E\x33\xD2\x89\x15\x0\x0\x0\x0\x89\x15"
};

internal override string[] mask => new string[] {
internal override string[] mask { get; } = new string[] {
"xxxxxx????xxxx", "xxx????xxxxxx", "x????xxxxxx", "xxxxxx????xx"
};

internal override int[] offset => new int[] { 6, 3, 1, 6 };
internal override int[] offset { get; } = new int[] { 6, 3, 1, 6 };

internal override string name => "Replay";

Expand All @@ -104,16 +104,16 @@ internal class OsuPlayingHitEventFinder : BaseOsuHitEventFinder
{
// 83 7E 60 00 74 2C A1 ?? ?? ?? ?? 8B 50 1C 8B 4A 04
// 5D C3 A1 ?? ?? ?? ?? 8B 50 1C 8B 4A 04
internal override string[] pattern => new string[] {
internal override string[] pattern { get; } = new string[] {
"\x83\x7E\x60\x00\x74\x2C\xA1\x00\x00\x00\x00\x8B\x50\x1C\x8B\x4A\x04",
"\x5D\xC3\xA1\x00\x00\x00\x00\x8B\x50\x1C\x8B\x4A\x04"
};

internal override string[] mask => new string[] {
internal override string[] mask { get; } = new string[] {
"xxxxxxx????xxxxxx", "xxx????xxxxxx"
};

internal override int[] offset => new int[] { 7, 3 };
internal override int[] offset { get; } = new int[] { 7, 3 };

internal override string name => "Playing";

Expand All @@ -129,6 +129,7 @@ internal abstract class BaseOsuHitEventFinder : OsuFinderBase
int[] PreOffsets = new int[4] { -1, -1, -1, -1 };

internal abstract string[] pattern { get; }
internal List<byte[]> pattern_byte { get; private set; }
internal abstract string[] mask { get; }
internal abstract int[] offset { get; }
internal abstract string name { get; }
Expand All @@ -155,12 +156,20 @@ public BaseOsuHitEventFinder(Process osu) : base(osu)
public override bool TryInit()
{
bool success = false;
if (pattern_byte == null)
{
pattern_byte = new List<byte[]>(pattern.Length);
foreach (var s in pattern)
{
pattern_byte.Add(StringToByte(s));
}
}

SigScan.Reload();
{
for (int i = 0; i < pattern.Length; i++)
for (int i = 0; i < pattern_byte.Count; i++)
{
Addresses[0] = SigScan.FindPattern(StringToByte(pattern[i]), mask[i], offset[i]);
Addresses[0] = SigScan.FindPattern(pattern_byte[i], mask[i], offset[i]);
success = Addresses[0] != IntPtr.Zero;

if (!success)
Expand Down
3 changes: 2 additions & 1 deletion Memory/OsuModeFinder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ internal class OsuPlayModeFinder : OsuFinderBase
private static readonly string s_mode_mask = "xxxxxx????xxxx";

private IntPtr m_mode_address;
private static byte[] s_mode_pattern_bytes;

public OsuPlayModeFinder(Process process) : base(process)
{
Expand All @@ -28,7 +29,7 @@ public override bool TryInit()

SigScan.Reload();
{
m_mode_address = SigScan.FindPattern(StringToByte(s_mode_pattern), s_mode_mask,6);
m_mode_address = SigScan.FindPattern(s_mode_pattern_bytes = s_mode_pattern_bytes ?? StringToByte(s_mode_pattern), s_mode_mask, 6);
LogHelper.LogToFile($"Mode Address (0):0x{(int)m_mode_address:X8}");

success = TryReadIntPtrFromMemory(m_mode_address, out m_mode_address);
Expand Down
13 changes: 9 additions & 4 deletions Memory/OsuPlayFinder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@ internal class OsuPlayFinder : OsuFinderBase
private IntPtr m_time_address;
private IntPtr m_mods_address;

private static byte[] s_global_mods_pattern_bytes;
private static byte[] s_acc_pattern_bytes;
private static byte[] s_acc_pattern_fallback_bytes;
private static byte[] s_time_pattern_bytes;

public OsuPlayFinder(Process osu) : base(osu)
{
}
Expand All @@ -46,15 +51,15 @@ public override bool TryInit()
if (Setting.EnableModsChangedAtListening)
{
//Find mods address
m_mods_address = SigScan.FindPattern(StringToByte(s_global_mods_pattern), s_global_mods_mask, 3);
m_mods_address = SigScan.FindPattern(s_global_mods_pattern_bytes = s_global_mods_pattern_bytes ?? StringToByte(s_global_mods_pattern), s_global_mods_mask, 3);
LogHelper.LogToFile($"Mods Base Address (0):0x{(int)m_mods_address:X8}");

m_mods_address_success = TryReadIntPtrFromMemory(m_mods_address, out m_mods_address);
LogHelper.LogToFile($"Mods Base Address (1):0x{(int)m_mods_address:X8}");
}

//Find acc Address
m_acc_address = SigScan.FindPattern(StringToByte(s_acc_pattern), s_acc_mask, 1);
m_acc_address = SigScan.FindPattern(s_acc_pattern_bytes = s_acc_pattern_bytes ?? StringToByte(s_acc_pattern), s_acc_mask, 1);
LogHelper.LogToFile($"Playing Accuracy Base Address (0):0x{(int)m_acc_address:X8}");

m_accuracy_address_success = TryReadIntPtrFromMemory(m_acc_address, out m_acc_address);
Expand All @@ -63,15 +68,15 @@ public override bool TryInit()
if (!m_accuracy_address_success)//use s_acc_pattern_fallback
{
LogHelper.LogToFile("Use Fallback Accuracy Pattern");
m_acc_address = SigScan.FindPattern(StringToByte(s_acc_pattern_fallback), s_acc_mask_fallback, 4);
m_acc_address = SigScan.FindPattern(s_acc_pattern_fallback_bytes = s_acc_pattern_fallback_bytes ?? StringToByte(s_acc_pattern_fallback), s_acc_mask_fallback, 4);
LogHelper.LogToFile($"Playing Accuracy Base Address (0):0x{(int)m_acc_address:X8}");

m_accuracy_address_success = TryReadIntPtrFromMemory(m_acc_address, out m_acc_address);
LogHelper.LogToFile($"Playing Accuracy Base Address (1):0x{(int)m_acc_address:X8}");
}

//Find Time Address
m_time_address = SigScan.FindPattern(StringToByte(s_time_pattern), s_time_mask, 5);
m_time_address = SigScan.FindPattern(s_time_pattern_bytes = s_time_pattern_bytes ?? StringToByte(s_time_pattern), s_time_mask, 5);
LogHelper.LogToFile($"Time Base Address (0):0x{(int)m_time_address:X8}");

m_time_address_success = TryReadIntPtrFromMemory(m_time_address, out m_time_address);
Expand Down
3 changes: 2 additions & 1 deletion Memory/OsuStatusFinder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ internal class OsuStatusFinder : OsuFinderBase

private IntPtr m_game_modes_address;
private bool success = false;
private static byte[] s_game_modes_pattern_bytes;

public OsuStatusFinder(Process osu) : base(osu)
{
Expand All @@ -21,7 +22,7 @@ public override bool TryInit()
SigScan.Reload();
{
//Find Game Modes
m_game_modes_address = SigScan.FindPattern(StringToByte(s_game_modes_pattern), s_game_modes_mask, 11);
m_game_modes_address = SigScan.FindPattern(s_game_modes_pattern_bytes = s_game_modes_pattern_bytes ?? StringToByte(s_game_modes_pattern), s_game_modes_mask, 11);
LogHelper.LogToFile($"Game Status Address (0):0x{(int)m_game_modes_address:X8}");

success = TryReadIntPtrFromMemory(m_game_modes_address, out m_game_modes_address);
Expand Down
8 changes: 4 additions & 4 deletions Memory/SigScan.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ private bool QueryMemoryBasicInformation(IntPtr handle, IntPtr current_address,
{
MEMORY_BASIC_INFORMATION_X64 mem_basic_info = new MEMORY_BASIC_INFORMATION_X64();
int mem_info_size = Marshal.SizeOf<MEMORY_BASIC_INFORMATION_X64>();
int size = VirtualQueryEx_X64(handle, current_address, out mem_basic_info, (uint)mem_info_size);
int size = VirtualQueryEx_X64(handle, current_address, ref mem_basic_info, (uint)mem_info_size);

if (size != mem_info_size)
{
Expand All @@ -337,7 +337,7 @@ private bool QueryMemoryBasicInformation(IntPtr handle, IntPtr current_address,
{
MEMORY_BASIC_INFORMATION_X86 mem_basic_info = new MEMORY_BASIC_INFORMATION_X86();
int mem_info_size = Marshal.SizeOf<MEMORY_BASIC_INFORMATION_X86>();
int size = VirtualQueryEx_X86(handle, current_address, out mem_basic_info, (uint)mem_info_size);
int size = VirtualQueryEx_X86(handle, current_address, ref mem_basic_info, (uint)mem_info_size);

if (size != mem_info_size)
{
Expand Down Expand Up @@ -455,10 +455,10 @@ out int lpNumberOfBytesRead
);

[DllImport("kernel32.dll", SetLastError = true, EntryPoint = "VirtualQueryEx")]
private static extern int VirtualQueryEx_X86(IntPtr hProcess, IntPtr lpAddress, out MEMORY_BASIC_INFORMATION_X86 lpBuffer, uint dwLength);
private static extern int VirtualQueryEx_X86(IntPtr hProcess, IntPtr lpAddress, ref MEMORY_BASIC_INFORMATION_X86 lpBuffer, uint dwLength);

[DllImport("kernel32.dll", SetLastError = true, EntryPoint = "VirtualQueryEx")]
private static extern int VirtualQueryEx_X64(IntPtr hProcess, IntPtr lpAddress, out MEMORY_BASIC_INFORMATION_X64 lpBuffer, uint dwLength);
private static extern int VirtualQueryEx_X64(IntPtr hProcess, IntPtr lpAddress, ref MEMORY_BASIC_INFORMATION_X64 lpBuffer, uint dwLength);

[DllImport("kernel32.dll", SetLastError = true)]
private static extern void GetSystemInfo(out SYSTEM_INFO lpSystemInfo);
Expand Down