wed150/Cleaner
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: fix clean task

Browse Source
This commit is contained in:
Tsubasa6848
2024-02-23 21:07:06 +08:00
Unverified
parent 5efa2ab484
commit 7a19e82fb5
4 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SDK-GMLIB
+1 -1
Submodule SDK-GMLIB updated: 945cea5cae...58cec5c0c5
src/Features/CleanTask.cpp
+15 -5
View File
@@ -12,7 +12,8 @@ bool mSendToast = true;
namespace Cleaner { namespace Cleaner {
static std::shared_ptr<ll::schedule::task::Task<ll::chrono::ServerClock>> mAutoCleanTask; static std::shared_ptr<ll::schedule::task::Task<ll::chrono::ServerClock>> mAutoCleanTask;
static std::shared_ptr<ll::schedule::task::Task<ll::chrono::ServerClock>> mCheckCleanTask; static std::shared_ptr<ll::schedule::task::Task<ll::chrono::ServerClock>> mCleanTaskCount;
static std::shared_ptr<ll::schedule::task::Task<ll::chrono::ServerClock>> mCleanTaskTPS;
ServerTimeScheduler scheduler; ServerTimeScheduler scheduler;
@@ -63,8 +64,8 @@ void AutoCleanTask(int seconds) {
mAutoCleanTask = scheduler.add<RepeatTask>(time, [] { CleanTask(); }); mAutoCleanTask = scheduler.add<RepeatTask>(time, [] { CleanTask(); });
} }
void CheckCleanTask(int max_entities, float min_tps) { void CleanTaskCount(int max_entities) {
mCheckCleanTask = scheduler.add<RepeatTask>(10s, [max_entities, min_tps] { mCleanTaskCount = scheduler.add<RepeatTask>(10s, [max_entities] {
auto count = CountEntities(); auto count = CountEntities();
if (auto_clean_triggerred == false) { if (auto_clean_triggerred == false) {
if (count >= max_entities) { if (count >= max_entities) {
@@ -79,7 +80,15 @@ void CheckCleanTask(int max_entities, float min_tps) {
Helper::broadcastToast(tr("cleaner.output.triggerAutoCleanCount", {S(count)})); Helper::broadcastToast(tr("cleaner.output.triggerAutoCleanCount", {S(count)}));
} }
CleanTask(); CleanTask();
} else if (GMLIB_Level::getLevel()->getServerAverageTps() <= min_tps) { }
}
});
}
void CleanTaskTPS(float min_tps) {
mCleanTaskTPS = scheduler.add<RepeatTask>(10s, [min_tps] {
if (auto_clean_triggerred == false) {
if (GMLIB_Level::getLevel()->getServerAverageTps() <= min_tps) {
auto_clean_triggerred = true; auto_clean_triggerred = true;
auto mspt = S(GMLIB_Level::getLevel()->getServerAverageTps()); auto mspt = S(GMLIB_Level::getLevel()->getServerAverageTps());
if (ConfigFile::mConsoleLog) { if (ConfigFile::mConsoleLog) {
@@ -98,7 +107,8 @@ void CheckCleanTask(int max_entities, float min_tps) {
} }
void stopAllTasks() { void stopAllTasks() {
mCheckCleanTask->cancel(); mCleanTaskTPS->cancel();
mCleanTaskCount->cancel();
mAutoCleanTask->cancel(); mAutoCleanTask->cancel();
} }
src/Features/Cleaner.cpp
+5 -6
View File
@@ -6,12 +6,11 @@ void loadCleaner() {
if (Config->getValue<bool>({"ScheduleClean", "Enabled"}, false)) { if (Config->getValue<bool>({"ScheduleClean", "Enabled"}, false)) {
Cleaner::AutoCleanTask(Config->getValue<int>({"ScheduleClean", "CleanInterval"}, 3000)); Cleaner::AutoCleanTask(Config->getValue<int>({"ScheduleClean", "CleanInterval"}, 3000));
} }
if (Config->getValue<bool>({"AutoCleanCount", "Enabled"}, false) if (Config->getValue<bool>({"AutoCleanCount", "Enabled"}, false)) {
|| Config->getValue<bool>({"AutoCleanTPS", "Enabled"}, false)) { Cleaner::CleanTaskCount(Config->getValue<int>({"AutoCleanCount", "TriggerCount"}, 900));
Cleaner::CheckCleanTask( }
Config->getValue<int>({"AutoCleanCount", "TriggerCount"}, 900), if (Config->getValue<bool>({"AutoCleanTPS", "Enabled"}, false)) {
Config->getValue<int>({"AutoCleanTPS", "TriggerTPS"}, 15) Cleaner::CleanTaskTPS(Config->getValue<float>({"AutoCleanTPS", "TriggerTPS"}, 15.0f));
);
} }
ConfigFile::mItemDespawnTicks = Config->getValue<int>({"ItemDespawn", "DespawnTime"}, 6000); ConfigFile::mItemDespawnTicks = Config->getValue<int>({"ItemDespawn", "DespawnTime"}, 6000);
ConfigFile::mAnnounce = Config->getValue<bool>({"Basic", "SendBroadcast"}, true); ConfigFile::mAnnounce = Config->getValue<bool>({"Basic", "SendBroadcast"}, true);
src/Features/Cleaner.h
+2 -1
View File
@@ -12,7 +12,8 @@ extern int ExecuteClean();
extern int CountEntities(); extern int CountEntities();
extern void AutoCleanTask(int seconds); extern void AutoCleanTask(int seconds);
extern void CheckCleanTask(int max_entities, float min_tps); extern void CleanTaskCount(int max_entities);
extern void CleanTaskTPS(float min_tps);
extern void ListenEvents(); extern void ListenEvents();
extern void stopAllTasks(); extern void stopAllTasks();
extern void CleanTask(); extern void CleanTask();