From 19f31f7deaf93234ec769fdc52632bc58769eaf1 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Sat, 4 Nov 2023 21:50:12 +0800 Subject: [PATCH] 1 --- server/gameserver/android_agent.h | 2 +- server/gameserver/base_agent.cc | 4 +++- server/gameserver/btcoroutine.cc | 15 +++++++++++++++ server/gameserver/btcoroutine.h | 9 ++------- server/gameserver/buff.cc | 5 +++-- server/gameserver/buff.h | 2 +- server/gameserver/entity.cc | 3 +++ server/gameserver/hero_agent.h | 2 +- server/gameserver/master_agent.h | 2 +- server/gameserver/room_agent.h | 2 +- server/gameserver/target_agent.h | 2 +- server/gameserver/team_agent.h | 2 +- 12 files changed, 33 insertions(+), 17 deletions(-) diff --git a/server/gameserver/android_agent.h b/server/gameserver/android_agent.h index 2df33750..72c99ee1 100644 --- a/server/gameserver/android_agent.h +++ b/server/gameserver/android_agent.h @@ -7,7 +7,7 @@ class AndroidAgent : public HeroAgent public: AndroidAgent(); - virtual ~AndroidAgent(); + virtual ~AndroidAgent() override; BEHAVIAC_DECLARE_AGENTTYPE(AndroidAgent, HeroAgent) diff --git a/server/gameserver/base_agent.cc b/server/gameserver/base_agent.cc index d9231482..3e9b4083 100644 --- a/server/gameserver/base_agent.cc +++ b/server/gameserver/base_agent.cc @@ -5,14 +5,16 @@ #include #include "room.h" +#include "perft.h" BaseAgent::BaseAgent():behaviac::Agent() { - + ++Perf::Instance()->agent_num; } BaseAgent::~BaseAgent() { + --Perf::Instance()->agent_num; } bool BaseAgent::IsGameOver() diff --git a/server/gameserver/btcoroutine.cc b/server/gameserver/btcoroutine.cc index 174a4297..abaff255 100644 --- a/server/gameserver/btcoroutine.cc +++ b/server/gameserver/btcoroutine.cc @@ -6,6 +6,21 @@ #include "base_agent.h" #include "btcontext.h" #include "btevent.h" +#include "perft.h" + +BtCoroutine::BtCoroutine(std::shared_ptr context, int id, const char* name) +{ + context_ = context; + id_ = id; + name_ = name; + INIT_LIST_HEAD(&entry); + ++Perf::Instance()->bt_co_num; +} + +BtCoroutine::~BtCoroutine() +{ + --Perf::Instance()->bt_co_num; +} void BtCoroutine::Abort(long long frameno) { diff --git a/server/gameserver/btcoroutine.h b/server/gameserver/btcoroutine.h index a3292548..6a17fdfe 100644 --- a/server/gameserver/btcoroutine.h +++ b/server/gameserver/btcoroutine.h @@ -17,13 +17,8 @@ class BtCoroutine long long abort_frameno = 0; behaviac::EBTStatus status = behaviac::BT_RUNNING; - BtCoroutine(std::shared_ptr context, int id, const char* name) - { - context_ = context; - id_ = id; - name_ = name; - INIT_LIST_HEAD(&entry); - } + BtCoroutine(std::shared_ptr context, int id, const char* name); + virtual ~BtCoroutine(); const char* GetName() const { return name_; } auto GetContext() { return context_; } diff --git a/server/gameserver/buff.cc b/server/gameserver/buff.cc index c268a51a..1cdea3d0 100644 --- a/server/gameserver/buff.cc +++ b/server/gameserver/buff.cc @@ -18,6 +18,7 @@ #include "glmhelper.h" #include "pbutils.h" #include "creature.h" +#include "perf.h" #include "mt/Param.h" #include "mt/Buff.h" @@ -27,12 +28,12 @@ Buff::Buff() { - + ++Perf::Instance()->buff_num; } Buff::~Buff() { - int i = 0; + --Perf::Instance()->buff_num; } void Buff::Init() diff --git a/server/gameserver/buff.h b/server/gameserver/buff.h index abb6509d..44acf8a9 100644 --- a/server/gameserver/buff.h +++ b/server/gameserver/buff.h @@ -39,7 +39,7 @@ class Buff std::shared_ptr> buff_vars; Buff(); - ~Buff(); + virtual ~Buff(); void Init(); void UnInit(); int GetLeftTime(); diff --git a/server/gameserver/entity.cc b/server/gameserver/entity.cc index 347168e6..7d59ad14 100644 --- a/server/gameserver/entity.cc +++ b/server/gameserver/entity.cc @@ -5,14 +5,17 @@ #include "human.h" #include "app.h" #include "perfmonitor.h" +#include "perft.h" Entity::Entity() { entity_weak_ptr_chunk_.Set(this); + ++Perf::Instance()->entity_num; } Entity::~Entity() { + --Perf::Instance()->entity_num; } void Entity::Initialize() diff --git a/server/gameserver/hero_agent.h b/server/gameserver/hero_agent.h index f3cf7d17..88a3015a 100644 --- a/server/gameserver/hero_agent.h +++ b/server/gameserver/hero_agent.h @@ -21,7 +21,7 @@ class HeroAgent : public BaseAgent public: HeroAgent(); - virtual ~HeroAgent(); + virtual ~HeroAgent() override; BEHAVIAC_DECLARE_AGENTTYPE(HeroAgent, BaseAgent) diff --git a/server/gameserver/master_agent.h b/server/gameserver/master_agent.h index 3d0545b0..8b4e519d 100644 --- a/server/gameserver/master_agent.h +++ b/server/gameserver/master_agent.h @@ -9,7 +9,7 @@ class MasterAgent : public BaseAgent public: MasterAgent(); - virtual ~MasterAgent(); + virtual ~MasterAgent() override; BEHAVIAC_DECLARE_AGENTTYPE(MasterAgent, BaseAgent) diff --git a/server/gameserver/room_agent.h b/server/gameserver/room_agent.h index 3250f1c5..704f05cd 100644 --- a/server/gameserver/room_agent.h +++ b/server/gameserver/room_agent.h @@ -9,7 +9,7 @@ class RoomAgent : public BaseAgent public: RoomAgent(); - virtual ~RoomAgent(); + virtual ~RoomAgent() override; BEHAVIAC_DECLARE_AGENTTYPE(RoomAgent, BaseAgent) diff --git a/server/gameserver/target_agent.h b/server/gameserver/target_agent.h index 8e29decb..648465d2 100644 --- a/server/gameserver/target_agent.h +++ b/server/gameserver/target_agent.h @@ -9,7 +9,7 @@ class TargetAgent : public BaseAgent public: TargetAgent(); - virtual ~TargetAgent(); + virtual ~TargetAgent() override; BEHAVIAC_DECLARE_AGENTTYPE(TargetAgent, BaseAgent) diff --git a/server/gameserver/team_agent.h b/server/gameserver/team_agent.h index af9c65e9..85ac0126 100644 --- a/server/gameserver/team_agent.h +++ b/server/gameserver/team_agent.h @@ -9,7 +9,7 @@ class TeamAgent : public BaseAgent public: TeamAgent(); - virtual ~TeamAgent(); + virtual ~TeamAgent() override; BEHAVIAC_DECLARE_AGENTTYPE(TeamAgent, BaseAgent)