ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-30 04:13:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

feat: detect hitches in framework update, draw and gamenetwork

Browse source
This commit is contained in:
goat 2023-02-17 21:02:49 +01:00
parent 268ddfbea0
commit 44dc127101
No known key found for this signature in database
GPG key ID: 49E2AA8C6A76498B
4 changed files with 109 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

55
Dalamud/Game/Network/GameNetwork.cs
View file

@ -5,6 +5,7 @@ using System.Runtime.InteropServices;
using Dalamud.Hooking;
using Dalamud.IoC;
using Dalamud.IoC.Internal;
using Dalamud.Utility;
using Serilog;
namespace Dalamud.Game.Network;
@ -20,7 +21,9 @@ public sealed class GameNetwork : IDisposable, IServiceType
private readonly GameNetworkAddressResolver address;
private readonly Hook<ProcessZonePacketDownDelegate> processZonePacketDownHook;
private readonly Hook<ProcessZonePacketUpDelegate> processZonePacketUpHook;
private readonly Queue<byte[]> zoneInjectQueue = new();
private readonly HitchDetector hitchDetectorUp = new("GameNetworkUp");
private readonly HitchDetector hitchDetectorDown = new("GameNetworkDown");
private IntPtr baseAddress;
@ -68,27 +71,6 @@ public sealed class GameNetwork : IDisposable, IServiceType
this.processZonePacketUpHook.Dispose();
}
/// <summary>
/// Process a chat queue.
/// </summary>
internal void UpdateQueue()
{
while (this.zoneInjectQueue.Count > 0)
{
var packetData = this.zoneInjectQueue.Dequeue();
var unmanagedPacketData = Marshal.AllocHGlobal(packetData.Length);
Marshal.Copy(packetData, 0, unmanagedPacketData, packetData.Length);
if (this.baseAddress != IntPtr.Zero)
{
this.processZonePacketDownHook.Original(this.baseAddress, 0, unmanagedPacketData);
}
Marshal.FreeHGlobal(unmanagedPacketData);
}
}
[ServiceManager.CallWhenServicesReady]
private void ContinueConstruction()
{
@ -100,6 +82,8 @@ public sealed class GameNetwork : IDisposable, IServiceType
{
this.baseAddress = a;
this.hitchDetectorDown.Start();
// Go back 0x10 to get back to the start of the packet header
dataPtr -= 0x10;
@ -128,10 +112,14 @@ public sealed class GameNetwork : IDisposable, IServiceType
this.processZonePacketDownHook.Original(a, targetId, dataPtr + 0x10);
}
this.hitchDetectorDown.Stop();
}
private byte ProcessZonePacketUpDetour(IntPtr a1, IntPtr dataPtr, IntPtr a3, byte a4)
{
this.hitchDetectorUp.Start();
try
{
// Call events
@ -155,27 +143,8 @@ public sealed class GameNetwork : IDisposable, IServiceType
Log.Error(ex, "Exception on ProcessZonePacketUp hook. Header: " + header);
}
this.hitchDetectorUp.Stop();
return this.processZonePacketUpHook.Original(a1, dataPtr, a3, a4);
}
// private void InjectZoneProtoPacket(byte[] data)
// {
// this.zoneInjectQueue.Enqueue(data);
// }
// private void InjectActorControl(short cat, int param1)
// {
// var packetData = new byte[]
// {
// 0x14, 0x00, 0x8D, 0x00, 0x00, 0x00, 0x0E, 0x00, 0x17, 0x7C, 0xC5, 0x5D, 0x00, 0x00, 0x00, 0x00,
// 0x05, 0x00, 0x48, 0xB2, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
// 0x00, 0x00, 0x00, 0x00, 0x43, 0x7F, 0x00, 0x00,
// };
//
// BitConverter.GetBytes((short)cat).CopyTo(packetData, 0x10);
//
// BitConverter.GetBytes((uint)param1).CopyTo(packetData, 0x14);
//
// this.InjectZoneProtoPacket(packetData);
// }
}