From 2f55ddd5d33690d337f769b94ba9d3ac975d8af2 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Tue, 27 Dec 2022 09:33:27 +0800
Subject: [PATCH] 1

---
 server/gameserver/gamelog.cc | 21 ++++++---------------
 server/gameserver/mt/Text.cc |  7 +++----
 server/gameserver/roommgr.cc |  3 +--
 third_party/a8               |  2 +-
 third_party/f8               |  2 +-
 5 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/server/gameserver/gamelog.cc b/server/gameserver/gamelog.cc
index 86ac5649..40d0d5b7 100644
--- a/server/gameserver/gamelog.cc
+++ b/server/gameserver/gamelog.cc
@@ -16,7 +16,7 @@ void GameLog::GameStart(Player* hum)
     int game_id = f8::ExtractGameIdFromAccountId(hum->account_id);
     std::string channel = a8::XValue(f8::ExtractChannelIdFromAccountId(hum->account_id));
 
-    a8::MutableXObject* prop = a8::MutableXObject::NewObject();
+    auto prop = a8::MutableXObject::CreateObject();
     prop->SetVal("channel", channel);
     prop->SetVal("ad_channel", "");
     prop->SetVal("from_appid", hum->from_appid);
@@ -40,10 +40,7 @@ void GameLog::GameStart(Player* hum)
     prop->SetVal("map_name", hum->room->GetMapMeta()->map_name());
     prop->SetVal("map_tpl_name", hum->room->GetMapTplName());
 
-    f8::TGLog::Instance()->AddTrackLog(game_id, hum->account_id, hum->ip_saddr, logclass1, logclass2, prop);
-
-    delete prop;
-    prop = nullptr;
+    f8::TGLog::Instance()->AddTrackLog(game_id, hum->account_id, hum->ip_saddr, logclass1, logclass2, prop.get());
 }
 
 void GameLog::GameEnd(Player* hum)
@@ -53,7 +50,7 @@ void GameLog::GameEnd(Player* hum)
     int game_id = f8::ExtractGameIdFromAccountId(hum->account_id);
     std::string channel = a8::XValue(f8::ExtractChannelIdFromAccountId(hum->account_id));
 
-    a8::MutableXObject* prop = a8::MutableXObject::NewObject();
+    auto prop = a8::MutableXObject::CreateObject();
     prop->SetVal("channel", channel);
     prop->SetVal("ad_channel", "");
     prop->SetVal("from_appid", hum->from_appid);
@@ -90,17 +87,14 @@ void GameLog::GameEnd(Player* hum)
     prop->SetVal("gameover_pass_frame_num", hum->room->GetFrameNo() - hum->last_cmmove_frameno);
     prop->SetVal("socket_handle", hum->socket_handle);
 
-    f8::TGLog::Instance()->AddTrackLog(game_id, hum->account_id, hum->ip_saddr, logclass1, logclass2, prop);
-
-    delete prop;
-    prop = nullptr;
+    f8::TGLog::Instance()->AddTrackLog(game_id, hum->account_id, hum->ip_saddr, logclass1, logclass2, prop.get());
 }
 
 void GameLog::ForceOver(Room* room)
 {
     int game_id = GAME_ID;
 
-    a8::MutableXObject* prop = a8::MutableXObject::NewObject();
+    auto prop = a8::MutableXObject::CreateObject();
     prop->SetVal("game_uniid", a8::XValue(room->GetRoomUuid()).GetString());
     prop->SetVal("room_type", a8::XValue(room->GetRoomType()).GetString());
     prop->SetVal("room_mode", a8::XValue((int)room->GetRoomMode()));
@@ -108,8 +102,5 @@ void GameLog::ForceOver(Room* room)
     prop->SetVal("game_duration", room->GetFrameNo() * SERVER_FRAME_RATE);
     prop->SetVal("player_num", room->GetRealPlayerNum());
 
-    f8::TGLog::Instance()->AddTrackLog(game_id, "forceover", 0, "forceover", prop);
-
-    delete prop;
-    prop = nullptr;
+    f8::TGLog::Instance()->AddTrackLog(game_id, "forceover", 0, "forceover", prop.get());
 }
diff --git a/server/gameserver/mt/Text.cc b/server/gameserver/mt/Text.cc
index 56e09101..e2744dd1 100644
--- a/server/gameserver/mt/Text.cc
+++ b/server/gameserver/mt/Text.cc
@@ -102,10 +102,10 @@ static void ParseElemets(const std::string& textid,
     }
 
     {
-        a8::MutableXObject* obj = a8::MutableXObject::NewObject();
-        a8::MutableXObject* arr = a8::MutableXObject::NewArray();
+        auto obj = a8::MutableXObject::CreateObject();
+        auto arr = a8::MutableXObject::CreateArray();
         for (auto& e : elements) {
-            a8::MutableXObject* obj_el = a8::MutableXObject::NewObject();
+            auto obj_el = a8::MutableXObject::CreateObject();
             obj_el->SetVal("type", std::get<0>(e));
             obj_el->SetVal("val", std::get<1>(e));
             arr->Push(*obj_el);
@@ -121,7 +121,6 @@ static void ParseElemets(const std::string& textid,
              }
              );
         #endif
-        delete obj;
     }
 }
 
diff --git a/server/gameserver/roommgr.cc b/server/gameserver/roommgr.cc
index 7ae2a48f..5f33dd31 100644
--- a/server/gameserver/roommgr.cc
+++ b/server/gameserver/roommgr.cc
@@ -466,7 +466,7 @@ void RoomMgr::ReportServerState(int instance_id, const std::string& host, int po
                                      host,
                                      port
                                  });
-    a8::MutableXObject* url_params = a8::MutableXObject::NewObject();
+    auto url_params = a8::MutableXObject::CreateObject();
     url_params->SetVal("node_id", App::Instance()->node_id);
     url_params->SetVal("instance_id", App::Instance()->instance_id);
     url_params->SetVal("ip", JsonDataMgr::Instance()->ip);
@@ -483,7 +483,6 @@ void RoomMgr::ReportServerState(int instance_id, const std::string& host, int po
          *url_params,
          rand() % MAX_SYS_HTTP_NUM
          );
-    delete url_params;
 }
 
 void RoomMgr::FreeOverRoom(long long room_uuid)
diff --git a/third_party/a8 b/third_party/a8
index 399eed8b..73177454 160000
--- a/third_party/a8
+++ b/third_party/a8
@@ -1 +1 @@
-Subproject commit 399eed8bd84c79e51960247bf75415088b9f3de1
+Subproject commit 73177454ccb815e7e117a20dff16962b334991f3
diff --git a/third_party/f8 b/third_party/f8
index 39ad1180..4933bf3d 160000
--- a/third_party/f8
+++ b/third_party/f8
@@ -1 +1 @@
-Subproject commit 39ad1180c865f0e640ff8e07c85be5a64258236b
+Subproject commit 4933bf3dde65a20dbcb11b296e7a3a1aa4ac6ef6