性能优化

server/gameserver/GGListener.h

@@ -19,6 +19,8 @@ public:
     void Init();
     void UnInit();
 
+    int max_packet_size = 0;
+
     template <typename T>
     void SendProxyMsg(int sockhandle, T& msg)
     {
@@ -30,7 +32,10 @@ public:
     void SendToClient(int sockhandle, unsigned int seqid, T& msg)
     {
         static int msgid = f8::Net_GetMessageId(msg);
-        f8::Net_SendProxyMsg(tcp_listener_, sockhandle, seqid, 0, msgid, msg);
+        int packet_size = f8::Net_SendProxyMsg(tcp_listener_, sockhandle, seqid, 0, msgid, msg);
+        if (packet_size > max_packet_size) {
+            max_packet_size = packet_size;
+        }
     }
     void SendText(int sockhandle, const std::string& text);
 

server/gameserver/app.cc

@@ -63,7 +63,8 @@ static void SavePerfLog()
     a8::UdpLog::Instance()->Info
         ("max_rundelay:%d room_num:%d player_num:%d online_num:%d alive_count:%d "
          "sys_request_delay:%d user_request_delay:%d http_pending_num:%d real_alive_count:%d "
-         "account_num:%d level0_num:%d level1_num:%d",
+         "account_num:%d level0_num:%d level1_num:%d max_full_obj:%d max_part_obj:%d max_bullet:%d "
+         "max_packet:%d",
          {
           PerfMonitor::Instance()->max_run_delay_time,
           RoomMgr::Instance()->RoomNum(),
@@ -76,20 +77,28 @@ static void SavePerfLog()
           PerfMonitor::Instance()->real_alive_count,
           PlayerMgr::Instance()->GetAccountNum(),
           PerfMonitor::Instance()->room_num[RT_NewBrid],
-          PerfMonitor::Instance()->room_num[RT_MidBrid]
+          PerfMonitor::Instance()->room_num[RT_MidBrid],
+          PerfMonitor::Instance()->max_full_objects_num,
+          PerfMonitor::Instance()->max_part_objects_num,
+          PerfMonitor::Instance()->max_bullet_num,
+          GGListener::Instance()->max_packet_size
          });
     PerfMonitor::Instance()->max_run_delay_time = 0;
     PerfMonitor::Instance()->max_dispatchmsg_time = 0;
     PerfMonitor::Instance()->max_timer_idle = 0;
     PerfMonitor::Instance()->grid_chg_times = 0;
     PerfMonitor::Instance()->test_times = 0;
-    PerfMonitor::Instance()->params[0] = 0,
+    PerfMonitor::Instance()->params[0] = 0;
-    PerfMonitor::Instance()->params[1] = 0,
+    PerfMonitor::Instance()->params[1] = 0;
-    PerfMonitor::Instance()->params[2] = 0,
+    PerfMonitor::Instance()->params[2] = 0;
-    PerfMonitor::Instance()->params[3] = 0,
+    PerfMonitor::Instance()->params[3] = 0;
-    PerfMonitor::Instance()->params[4] = 0,
+    PerfMonitor::Instance()->params[4] = 0;
-    PerfMonitor::Instance()->params[5] = 0,
+    PerfMonitor::Instance()->params[5] = 0;
-    PerfMonitor::Instance()->params[6] = 0,
+    PerfMonitor::Instance()->params[6] = 0;
+    PerfMonitor::Instance()->max_full_objects_num = 0;
+    PerfMonitor::Instance()->max_part_objects_num = 0;
+    PerfMonitor::Instance()->max_bullet_num = 0;
+    GGListener::Instance()->max_packet_size = 0;
     f8::HttpClientPool::Instance()->max_sys_request_delay = 0;
     f8::HttpClientPool::Instance()->max_user_request_delay = 0;
 }

server/gameserver/framemaker.cc

@@ -9,6 +9,7 @@
 #include "metamgr.h"
 #include "car.h"
 #include "app.h"
+#include "perfmonitor.h"
 
 void FrameMaker::Debug_FullObject(Human* hum)
 {
@@ -45,6 +46,7 @@ void FrameMaker::Debug_FullObject(Human* hum)
                                                   }));
                  }
              });
+        delete out_data;
     }
     #endif
 }
@@ -80,6 +82,7 @@ void FrameMaker::Debug_OutObject(Human* hum)
                                                   }));
                  }
              });
+        delete out_data;
     }
     #endif
 }
@@ -89,15 +92,8 @@ cs::SMUpdate* FrameMaker::MakeUpdateMsg(Human* hum)
     FrameData* framedata = &hum->GetFrameData();
     cs::SMUpdate* msg = new cs::SMUpdate;
     Room* room = hum->room;
-    {
+
-        msg->set_frameno(hum->room->GetFrameNo() / 2);
+    PreProcess(msg, room, hum, framedata);
-        if (hum->room->GetGasData().gas_mode == GasJump) {
-            cs::MFPlane* p = msg->mutable_plane();
-            TypeConvert::ToPb(hum->room->plane.start_point, p->mutable_start_point());
-            TypeConvert::ToPb(hum->room->plane.end_point, p->mutable_end_point());
-            TypeConvert::ToPb(hum->room->plane.curr_pos, p->mutable_pos());
-        }
-    }
     SerializeNewObjects(msg, room, hum, framedata);
     SerializePartObjects(msg, room, hum, framedata);
     SerializeDelObjects(msg, room, hum, framedata);
@@ -119,6 +115,38 @@ cs::SMUpdate* FrameMaker::MakeUpdateMsg(Human* hum)
     SerializeChgedCars(msg, room, hum, framedata);
     SerializeChgedProps(msg, room, hum, framedata);
     SerializeDelBullets(msg, room, hum, framedata);
+    PostProcess(msg, room, hum, framedata);
+
+    return msg;
+}
+
+void FrameMaker::PreProcess(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata)
+{
+    {
+        msg->set_frameno(hum->room->GetFrameNo() / 2);
+        if (hum->room->GetGasData().gas_mode == GasJump) {
+            cs::MFPlane* p = msg->mutable_plane();
+            TypeConvert::ToPb(hum->room->plane.start_point, p->mutable_start_point());
+            TypeConvert::ToPb(hum->room->plane.end_point, p->mutable_end_point());
+            TypeConvert::ToPb(hum->room->plane.curr_pos, p->mutable_pos());
+        }
+    }
+    {
+        size_t chg_prop_size = framedata->chged_bullet_nums_.size() +
+            framedata->chged_hps_.size() * 2 +
+            framedata->chged_skillcds_.size() +
+            framedata->chged_skill_curr_times_.size() +
+            framedata->chged_items_.size() +
+            framedata->chged_weapon_ammo_.size() +
+            framedata->chged_cars_.size() +
+            framedata->chged_props_.size();
+        if (chg_prop_size > 0) {
+            msg->mutable_chged_property_list()->Reserve(chg_prop_size);
+        }
+    }
+}
+
+void FrameMaker::PostProcess(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata)
 {
     if (room->frame_event.airdrops_.size() > 0) {
         *msg->mutable_airdrop() = room->frame_event.airdrops_.Get(0);
@@ -135,24 +163,22 @@ cs::SMUpdate* FrameMaker::MakeUpdateMsg(Human* hum)
         msg->set_alive_count(room->AliveCount());
     }
 }
-    return msg;
-}
 
 void FrameMaker::SerializeNewObjects(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata)
 {
+    if (!framedata->new_objects.empty()) {
 #ifdef DEBUG
         Debug_FullObject(hum);
 #endif
+        msg->mutable_full_objects()->Reserve(framedata->new_objects.size());
+        if (framedata->new_objects.size() > PerfMonitor::Instance()->max_full_objects_num) {
+            PerfMonitor::Instance()->max_full_objects_num = framedata->new_objects.size();
+        }
         for (auto& pair : framedata->new_objects) {
             Entity* e = pair.second.Get();
             if (!e) {
                 continue;
             }
-#ifdef DEBUG
-        if (framedata->del_objects.find(e->GetUniId()) != framedata->del_objects.end()) {
-            abort();
-        }
-#endif
             if (e != hum &&
                 e->GetEntityType() == ET_Player &&
                 ((Human*)e)->HasBuffEffect(kBET_Fly)){
@@ -160,11 +186,6 @@ void FrameMaker::SerializeNewObjects(cs::SMUpdate* msg, Room* room, Human* hum,
             }
             if ((hum->IsPlayer() || hum->HasObserver()) && e->CanSeeMe(hum)) {
                 e->FillMFObjectFull(room, (Human*)hum, msg->add_full_objects());
-#ifdef DEBUG
-            if (e->GetEntityType() == ET_Car) {
-                hum->SendDebugMsg(a8::Format("载具出现", {}));
-            }
-#endif
             }
 #ifdef DEBUG
             if (App::Instance()->HasFlag(2) && e->GetEntityType() == ET_Player) {
@@ -178,9 +199,15 @@ void FrameMaker::SerializeNewObjects(cs::SMUpdate* msg, Room* room, Human* hum,
 #endif
         }
     }
+}
 
 void FrameMaker::SerializePartObjects(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata)
 {
+    if (!framedata->part_objects.empty()) {
+        msg->mutable_part_objects()->Reserve(framedata->part_objects.size());
+        if (framedata->part_objects.size() > PerfMonitor::Instance()->max_part_objects_num) {
+            PerfMonitor::Instance()->max_part_objects_num = framedata->part_objects.size();
+        }
         int deleted_uniid = 0;
         for (auto& pair : framedata->part_objects) {
             Entity* entity = pair.second.object.Get();
@@ -213,9 +240,12 @@ void FrameMaker::SerializePartObjects(cs::SMUpdate* msg, Room* room, Human* hum,
             framedata->part_objects.erase(deleted_uniid);
         }
     }
+}
 
 void FrameMaker::SerializeDelObjects(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata)
 {
+    if (!framedata->del_objects.empty()) {
+        msg->mutable_del_objids()->Reserve(framedata->del_objects.size());
         for (auto& itr : framedata->del_objects) {
             msg->add_del_objids(itr);
 #ifdef DEBUG
@@ -228,9 +258,12 @@ void FrameMaker::SerializeDelObjects(cs::SMUpdate* msg, Room* room, Human* hum,
 #endif
         }
     }
+}
 
 void FrameMaker::SerializeOutObjects(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata)
 {
+    if (!framedata->out_objects.empty()) {
+        msg->mutable_out_objids()->Reserve(framedata->out_objects.size());
 #ifdef DEBUG
         Debug_OutObject(hum);
 #endif
@@ -246,9 +279,12 @@ void FrameMaker::SerializeOutObjects(cs::SMUpdate* msg, Room* room, Human* hum,
 #endif
         }
     }
+}
 
 void FrameMaker::SerializeShots(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata)
 {
+    if (!framedata->shots_.empty()) {
+        msg->mutable_shots()->Reserve(framedata->shots_.size());
         for (size_t idx : framedata->shots_) {
             if (idx < room->frame_event.shots_.size()) {
                 auto& tuple = room->frame_event.shots_[idx];
@@ -259,10 +295,7 @@ void FrameMaker::SerializeShots(cs::SMUpdate* msg, Room* room, Human* hum, Frame
                     abort();
 #endif
                 }
-        } else {
+            }
-#ifdef DEBUG
-            abort();
-#endif
         }
     }
 }
@@ -270,6 +303,7 @@ void FrameMaker::SerializeShots(cs::SMUpdate* msg, Room* room, Human* hum, Frame
 void FrameMaker::SerializeEmotes(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata)
 {
     for (size_t idx : framedata->emotes_) {
+        msg->mutable_emotes()->Reserve(framedata->emotes_.size());
         if (idx < room->frame_event.emotes_.size()) {
             auto& tuple = room->frame_event.emotes_[idx];
             if (std::get<0>(tuple).Get() && hum->CanSee(std::get<0>(tuple).Get())) {
@@ -281,6 +315,11 @@ void FrameMaker::SerializeEmotes(cs::SMUpdate* msg, Room* room, Human* hum, Fram
 
 void FrameMaker::SerializeBullets(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata)
 {
+    if (!framedata->bullets_.empty()) {
+        msg->mutable_bullets()->Reserve(framedata->bullets_.size());
+        if (framedata->bullets_.size() > PerfMonitor::Instance()->max_bullet_num) {
+            PerfMonitor::Instance()->max_bullet_num = framedata->bullets_.size();
+        }
         for (size_t idx : framedata->bullets_) {
             if (idx < room->frame_event.bullets_.size()) {
                 auto& tuple = room->frame_event.bullets_[idx];
@@ -290,10 +329,12 @@ void FrameMaker::SerializeBullets(cs::SMUpdate* msg, Room* room, Human* hum, Fra
             }
         }
     }
+}
 
 void FrameMaker::SerializeSmokes(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata)
 {
     for (size_t idx : framedata->smokes_) {
+        msg->mutable_smokes()->Reserve(framedata->smokes_.size());
         if (idx < room->frame_event.smokes_.size()) {
             auto& tuple = room->frame_event.smokes_[idx];
             if (std::get<0>(tuple).Get() && hum->CanSee(std::get<0>(tuple).Get())) {
@@ -306,6 +347,7 @@ void FrameMaker::SerializeSmokes(cs::SMUpdate* msg, Room* room, Human* hum, Fram
 void FrameMaker::SerializePlaySkills(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata)
 {
     for (size_t idx : framedata->play_skills_) {
+        msg->mutable_play_skill_list(framedata->play_skills_.size());
         if (idx < room->frame_event.play_skills_.size()) {
             auto& tuple = room->frame_event.play_skills_[idx];
             if (std::get<0>(tuple).Get() && hum->CanSee(std::get<0>(tuple).Get())) {
@@ -318,10 +360,11 @@ void FrameMaker::SerializePlaySkills(cs::SMUpdate* msg, Room* room, Human* hum,
 void FrameMaker::SerializeExplosions(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata)
 {
     for (size_t idx : framedata->explosions_) {
+        msg->mutable_explosions()->Reserve(framedata->explosions_.size());
         if (idx < room->frame_event.explosions_.size()) {
             auto& tuple = room->frame_event.explosions_[idx];
             *msg->add_explosions() = std::get<1>(tuple);
-#ifdef DEBUG
+#ifdef DEBUG1
             a8::XPrintf("AddExplosion %d, %s pos=%d,%d effect:%d\n",
                         {
                          hum->GetUniId(),
@@ -337,6 +380,8 @@ void FrameMaker::SerializeExplosions(cs::SMUpdate* msg, Room* room, Human* hum,
 
 void FrameMaker::SerializeChgedBuffs(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata)
 {
+    if (!framedata->chged_buffs_.empty()) {
+        msg->mutable_chged_buff_list()->Reserve(framedata->chged_buffs_.size());
         for (size_t idx : framedata->chged_buffs_) {
             if (idx < room->frame_event.chged_buffs_.size()) {
                 auto p = msg->add_chged_buff_list();
@@ -344,9 +389,11 @@ void FrameMaker::SerializeChgedBuffs(cs::SMUpdate* msg, Room* room, Human* hum,
             }
         }
     }
+}
 
 void FrameMaker::SerializeChgedBulletNums(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata)
 {
+    if (!framedata->chged_bullet_nums_.empty()) {
         for (size_t idx : framedata->chged_bullet_nums_) {
             if (idx < room->frame_event.chged_bullet_nums_.size()) {
                 CreatureWeakPtr& target = room->frame_event.chged_bullet_nums_[idx];
@@ -359,6 +406,7 @@ void FrameMaker::SerializeChgedBulletNums(cs::SMUpdate* msg, Room* room, Human*
             }
         }
     }
+}
 
 void FrameMaker::SerializeChgedHps(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata)
 {
@@ -385,6 +433,7 @@ void FrameMaker::SerializeChgedHps(cs::SMUpdate* msg, Room* room, Human* hum, Fr
 
 void FrameMaker::SerializeChgedSkillCds(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata)
 {
+    if (!framedata->chged_skillcds_.empty()) {
         for (size_t idx : framedata->chged_skillcds_) {
             if (idx < room->frame_event.chged_skillcds_.size()) {
                 auto tuple = room->frame_event.chged_skillcds_[idx];
@@ -401,6 +450,7 @@ void FrameMaker::SerializeChgedSkillCds(cs::SMUpdate* msg, Room* room, Human* hu
             }
         }
     }
+}
 
 void FrameMaker::SerializeChgedSkillCurrTimes(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata)
 {
@@ -455,6 +505,8 @@ void FrameMaker::SerializeChgedWeaponAmmo(cs::SMUpdate* msg, Room* room, Human*
 
 void FrameMaker::SerializeDeadAliveObjs(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata)
 {
+    if (!framedata->dead_alive_objs_.empty()) {
+        msg->mutable_dead_alive_objs()->Reserve(framedata->dead_alive_objs_.size());
         for (size_t idx : framedata->dead_alive_objs_) {
             if (idx < room->frame_event.dead_alive_objs_.size()) {
                 auto p = msg->add_dead_alive_objs();
@@ -464,6 +516,7 @@ void FrameMaker::SerializeDeadAliveObjs(cs::SMUpdate* msg, Room* room, Human* hu
             }
         }
     }
+}
 
 void FrameMaker::SerializeChgedCars(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata)
 {
@@ -488,6 +541,8 @@ void FrameMaker::SerializeChgedCars(cs::SMUpdate* msg, Room* room, Human* hum, F
 
 void FrameMaker::SerializeChgedProps(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata)
 {
+    if (!framedata->chged_props_.empty()) {
+        msg->mutable_chged_property_list()->Reserve(framedata->chged_props_.size());
         for (size_t idx : framedata->chged_props_) {
             if (idx < room->frame_event.chged_props_.size()) {
                 auto& p = room->frame_event.chged_props_[idx];
@@ -498,9 +553,12 @@ void FrameMaker::SerializeChgedProps(cs::SMUpdate* msg, Room* room, Human* hum,
             }
         }
     }
+}
 
 void FrameMaker::SerializeDelBullets(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata)
 {
+    if (!framedata->del_bullets_.empty()) {
+        msg->mutable_del_bullets()->Reserve(framedata->del_bullets_.size());
         for (size_t idx : framedata->del_bullets_) {
             if (idx < room->frame_event.del_bullets_.size()) {
                 int bullet_uniid = room->frame_event.del_bullets_[idx];
@@ -508,3 +566,4 @@ void FrameMaker::SerializeDelBullets(cs::SMUpdate* msg, Room* room, Human* hum,
             }
         }
     }
+}

server/gameserver/framemaker.h

@@ -15,6 +15,8 @@ private:
     void Debug_FullObject(Human* hum);
     void Debug_OutObject(Human* hum);
 
+    void PreProcess(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata);
+    void PostProcess(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata);
     void SerializeNewObjects(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata);
     void SerializePartObjects(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata);
     void SerializeDelObjects(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata);

server/gameserver/human.cc

@@ -1278,6 +1278,10 @@ bool Human::HasObserver()
 
 void Human::SendUpdateMsg()
 {
+#ifdef DEBUG
+    long long begin_tick1 = a8::XGetTickCount();
+    long long end_tick1 = a8::XGetTickCount();
+#endif
     if (!follow_target_ && !a8::HasBitFlag(status, CS_Disable)) {
         #ifdef DEBUG
         long long begin_tick = a8::XGetTickCount();
@@ -1319,6 +1323,12 @@ void Human::SendUpdateMsg()
     } else {
         need_sync_active_player = false;
     }
+#ifdef DEBUG
+    end_tick1 = a8::XGetTickCount();
+    if (end_tick1 - begin_tick1 > 100) {
+        abort();
+    }
+#endif
     framedata_.ClearFrameData(this);
 }
 

server/gameserver/human.h

@@ -216,8 +216,10 @@ class Human : public Creature
     template <typename T>
     void SendNotifyMsg(T& msg)
     {
+        if (socket_handle != 0) {
             GGListener::Instance()->SendToClient(socket_handle, 0, msg);
         }
+    }
     void SendGameOver();
     void FollowTarget(Human* target);
     virtual void SendDebugMsg(const std::string& debug_msg) override;

server/gameserver/perfmonitor.h

@@ -20,6 +20,9 @@ class PerfMonitor : public a8::Singleton<PerfMonitor>
     std::array<long long, 30> params = {};
     std::array<int, 30> entity_num = {};
     std::array<int, RT_Max + 1> room_num = {};
+    int max_full_objects_num = 0;
+    int max_part_objects_num = 0;
+    int max_bullet_num = 0;
 
     void Init();
     void UnInit();

server/gameserver/room.cc

@@ -2323,12 +2323,14 @@ void Room::EnableHuman(Human* target)
     }
     #ifdef DEBUG
     CheckPartObjects();
+    #if 0
     a8::UdpLog::Instance()->Debug("enablehuman %d %d",
                                   {
                                    (long long)target,
                                    target->GetUniId()
                                   });
     #endif
+    #endif
     #if 0
     target->OnEnable();
     AddToMoveableHash(target);
@@ -2360,12 +2362,14 @@ void Room::DisableHuman(Human* target)
     #endif
     #ifdef DEBUG
     CheckPartObjects();
+    #if 0
     a8::UdpLog::Instance()->Debug("disablehuman %d %d",
                                   {
                                    (long long)target,
                                    target->GetUniId()
                                   });
     #endif
+    #endif
     if (!a8::HasBitFlag(target->status, CS_Disable)) {
         target->OnDisable();
         RemoveFromMoveableHash(target);
@@ -2796,6 +2800,7 @@ void Room::ShuaGridRound(Human* target)
 
 void Room::CheckPartObjects(Human* testa, Human* testb)
 {
+    #if 0
     for (auto& pair1 : human_hash_) {
         Human* a = pair1.second;
         for (auto& pair2 : human_hash_) {
@@ -2835,6 +2840,7 @@ void Room::CheckPartObjects(Human* testa, Human* testb)
                 }
              });
     }
+    #endif
 }
 
 void Room::GetAliveHumans(std::vector<Human*>& alive_humans, size_t num, Human* exclude_hum)