From 5328834711d714599796459901841918a3a39f8a Mon Sep 17 00:00:00 2001 From: raul Date: Sun, 7 Apr 2024 13:42:36 +0200 Subject: [PATCH 1/7] Base --- Carbon.Core/Carbon.Hooks/Carbon.Hooks.Base | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Carbon.Core/Carbon.Hooks/Carbon.Hooks.Base b/Carbon.Core/Carbon.Hooks/Carbon.Hooks.Base index 482451a26..19a958026 160000 --- a/Carbon.Core/Carbon.Hooks/Carbon.Hooks.Base +++ b/Carbon.Core/Carbon.Hooks/Carbon.Hooks.Base @@ -1 +1 @@ -Subproject commit 482451a26b7741f386686457fb88d1e855b358b0 +Subproject commit 19a95802666b134df1493e1329369b82d5a0c2c8 From 63a7f0ae40eb37961ef8cff30c95a0dc033355b6 Mon Sep 17 00:00:00 2001 From: raul Date: Sun, 7 Apr 2024 14:52:55 +0200 Subject: [PATCH 2/7] Common++ --- Carbon.Core/Carbon.Components/Carbon.Common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Carbon.Core/Carbon.Components/Carbon.Common b/Carbon.Core/Carbon.Components/Carbon.Common index af5a30f1d..4e889be26 160000 --- a/Carbon.Core/Carbon.Components/Carbon.Common +++ b/Carbon.Core/Carbon.Components/Carbon.Common @@ -1 +1 @@ -Subproject commit af5a30f1da2ceab855393ccdfed0992672489500 +Subproject commit 4e889be264497690b913792b446582c196d9aaf5 From 9a7c9f0039db898a5c2d7a6417c90b93bbc8f097 Mon Sep 17 00:00:00 2001 From: raul Date: Sun, 7 Apr 2024 16:37:06 +0200 Subject: [PATCH 3/7] Common++ --- Carbon.Core/Carbon.Components/Carbon.Common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Carbon.Core/Carbon.Components/Carbon.Common b/Carbon.Core/Carbon.Components/Carbon.Common index 4e889be26..fdc87521d 160000 --- a/Carbon.Core/Carbon.Components/Carbon.Common +++ b/Carbon.Core/Carbon.Components/Carbon.Common @@ -1 +1 @@ -Subproject commit 4e889be264497690b913792b446582c196d9aaf5 +Subproject commit fdc87521dea1badcc2a1e465232a3539a12b808c From 4577abebd610f95fee77a7ed6ea199d5baef30f8 Mon Sep 17 00:00:00 2001 From: raul Date: Mon, 8 Apr 2024 01:49:28 +0200 Subject: [PATCH 4/7] Common++ --- Carbon.Core/Carbon.Components/Carbon.Common | 2 +- Carbon.Core/Carbon.Components/Carbon.Common.Client | 2 +- Carbon.Core/Carbon/src/Hooks/HookCallerInternal.cs | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Carbon.Core/Carbon.Components/Carbon.Common b/Carbon.Core/Carbon.Components/Carbon.Common index fdc87521d..c121fd2c2 160000 --- a/Carbon.Core/Carbon.Components/Carbon.Common +++ b/Carbon.Core/Carbon.Components/Carbon.Common @@ -1 +1 @@ -Subproject commit fdc87521dea1badcc2a1e465232a3539a12b808c +Subproject commit c121fd2c2135da57f419fb3a130d60ec2c151b30 diff --git a/Carbon.Core/Carbon.Components/Carbon.Common.Client b/Carbon.Core/Carbon.Components/Carbon.Common.Client index 077af9ef5..10ae73519 160000 --- a/Carbon.Core/Carbon.Components/Carbon.Common.Client +++ b/Carbon.Core/Carbon.Components/Carbon.Common.Client @@ -1 +1 @@ -Subproject commit 077af9ef5851223ef4a7fd490d096e95cd95fb4f +Subproject commit 10ae73519e3106b0770d7a55bb225d8c7a499564 diff --git a/Carbon.Core/Carbon/src/Hooks/HookCallerInternal.cs b/Carbon.Core/Carbon/src/Hooks/HookCallerInternal.cs index a2b68419d..a7981c3f8 100644 --- a/Carbon.Core/Carbon/src/Hooks/HookCallerInternal.cs +++ b/Carbon.Core/Carbon/src/Hooks/HookCallerInternal.cs @@ -154,7 +154,7 @@ public override object CallHook(T hookable, uint hookId, BindingFlags flags, Profiler.EndHookCall(hookable); #endif - hook?.OnFired(afterHookTime, totalMemory); + hook?.OnFired(hookable, afterHookTime, totalMemory); var afterHookTimeMs = afterHookTime.TotalMilliseconds; @@ -168,7 +168,7 @@ public override object CallHook(T hookable, uint hookId, BindingFlags flags, if (wasLagSpike) { - hook?.OnLagSpike(); + hook?.OnLagSpike(hookable); } Analytics.plugin_time_warn(readableHook, basePlugin, afterHookTimeMs, totalMemory, hook, hookable, wasLagSpike); @@ -260,7 +260,7 @@ static object DoCall(T hookable, uint hookId, CachedHook hook, object[] args, re var afterMemory = hookable.TotalMemoryUsed; var totalMemory = afterMemory - beforeMemory; - hook.OnFired(afterHookTime, totalMemory); + hook.OnFired(hookable, afterHookTime, totalMemory); var afterHookTimeMs = afterHookTime.TotalMilliseconds; @@ -275,7 +275,7 @@ static object DoCall(T hookable, uint hookId, CachedHook hook, object[] args, re if (wasLagSpike) { - hook.OnLagSpike(); + hook.OnLagSpike(hookable); } Analytics.plugin_time_warn(readableHook, basePlugin, afterHookTimeMs, totalMemory, hook, hookable, wasLagSpike); From a26118ef2552b216889eaa2baec74a679bda52e2 Mon Sep 17 00:00:00 2001 From: raul Date: Mon, 8 Apr 2024 04:57:45 +0200 Subject: [PATCH 5/7] Common++ --- Carbon.Core/Carbon.Components/Carbon.Common | 2 +- Carbon.Core/Carbon/src/Hooks/HookCallerInternal.cs | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Carbon.Core/Carbon.Components/Carbon.Common b/Carbon.Core/Carbon.Components/Carbon.Common index c121fd2c2..b8916ca75 160000 --- a/Carbon.Core/Carbon.Components/Carbon.Common +++ b/Carbon.Core/Carbon.Components/Carbon.Common @@ -1 +1 @@ -Subproject commit c121fd2c2135da57f419fb3a130d60ec2c151b30 +Subproject commit b8916ca755cdbc2cca9697cbb3850e51127d59f1 diff --git a/Carbon.Core/Carbon/src/Hooks/HookCallerInternal.cs b/Carbon.Core/Carbon/src/Hooks/HookCallerInternal.cs index a7981c3f8..114a905fd 100644 --- a/Carbon.Core/Carbon/src/Hooks/HookCallerInternal.cs +++ b/Carbon.Core/Carbon/src/Hooks/HookCallerInternal.cs @@ -1,11 +1,13 @@ using System; using System.Collections.Generic; using System.Reflection; +using Carbon.Base; using Carbon.Components; using Carbon.Extensions; using Carbon.Pooling; using Facepunch; using Oxide.Core.Plugins; +using UnityEngine; using static Carbon.Base.BaseHookable; /* @@ -128,7 +130,7 @@ public override object CallHook(T hookable, uint hookId, BindingFlags flags, #endif hookable.TrackStart(); - var beforeMemory = hookable.TotalMemoryUsed; + var beforeMemory = CurrentMemory; if (hook != null && hook.IsAsync) { @@ -147,8 +149,8 @@ public override object CallHook(T hookable, uint hookId, BindingFlags flags, } var afterHookTime = hookable.CurrentHookTime; - var afterMemory = hookable.TotalMemoryUsed; - var totalMemory = afterMemory - beforeMemory; + var afterMemory = CurrentMemory; + var totalMemory = Mathf.Abs(afterMemory - beforeMemory); #if DEBUG Profiler.EndHookCall(hookable); From 7647fb2f16a4f63fbd34e79e0d2dde5f6d242e40 Mon Sep 17 00:00:00 2001 From: raul Date: Tue, 9 Apr 2024 00:18:17 +0200 Subject: [PATCH 6/7] Common++ --- Carbon.Core/Carbon.Components/Carbon.Common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Carbon.Core/Carbon.Components/Carbon.Common b/Carbon.Core/Carbon.Components/Carbon.Common index b8916ca75..21dbe89d2 160000 --- a/Carbon.Core/Carbon.Components/Carbon.Common +++ b/Carbon.Core/Carbon.Components/Carbon.Common @@ -1 +1 @@ -Subproject commit b8916ca755cdbc2cca9697cbb3850e51127d59f1 +Subproject commit 21dbe89d26fd3f8789ecc9fcd7e6ee343fc7e326 From 88a48f995f71f260eb6b005ef8050b0d08de5d11 Mon Sep 17 00:00:00 2001 From: raul Date: Tue, 9 Apr 2024 20:59:16 +0200 Subject: [PATCH 7/7] Common++ --- Carbon.Core/Carbon.Components/Carbon.Common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Carbon.Core/Carbon.Components/Carbon.Common b/Carbon.Core/Carbon.Components/Carbon.Common index 21dbe89d2..22f9cb530 160000 --- a/Carbon.Core/Carbon.Components/Carbon.Common +++ b/Carbon.Core/Carbon.Components/Carbon.Common @@ -1 +1 @@ -Subproject commit 21dbe89d26fd3f8789ecc9fcd7e6ee343fc7e326 +Subproject commit 22f9cb530969967eaedc42b2aba0d5978626c49f