dallasgroot/0ad
1
0
Fork 0
mirror of https://gitea.wildfiregames.com/0ad/0ad synced 2026-06-16 05:13:58 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Use RootedValueVector in XmppClient

Browse source 
This removes the manual tracing.
This commit is contained in:
phosit 2026-03-26 18:49:22 +01:00
parent 3d866fe7a1
commit 09c1cc4ec7
No known key found for this signature in database
GPG key ID: C9430B600671C268
2 changed files with 13 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
source/lobby/XmppClient.cpp
View file

@ -40,10 +40,8 @@
#include "scriptinterface/StructuredClone.h"
#include <iostream>
#include <js/GCAPI.h>
#include <js/PropertyAndElement.h>
#include <js/PropertyDescriptor.h>
#include <js/TracingAPI.h>
#include <memory>
#include <tuple>
#include <unicode/locid.h>
@ -129,11 +127,10 @@ XmppClient::XmppClient(const ScriptInterface* scriptInterface, const std::string
m_certStatus(gloox::CertStatus::CertOk),
m_PlayerMapUpdate(false),
m_connectionDataJid(),
m_connectionDataIqId()
m_connectionDataIqId(),
m_GuiMessageQueue{m_ScriptInterface->GetGeneralJSContext()},
m_HistoricGuiMessages{m_ScriptInterface->GetGeneralJSContext()}
{
if (m_ScriptInterface)
JS_AddExtraGCRootsTracer(m_ScriptInterface->GetGeneralJSContext(), XmppClient::Trace, this);
// Generate a unique, unpredictable resource to allow multiple 0 A.D. instances to connect to the lobby.
gloox::JID clientJid(sUsername + "@" + m_server + "/0ad-" + ps_generate_guid());
gloox::JID roomJid(m_room + "@conference." + m_server + "/" + sNick);
@ -221,18 +218,6 @@ XmppClient::~XmppClient()
delete t;
for (const gloox::Tag* const& t : m_Profile)
delete t;
if (m_ScriptInterface)
JS_RemoveExtraGCRootsTracer(m_ScriptInterface->GetGeneralJSContext(), XmppClient::Trace, this);
}
void XmppClient::TraceMember(JSTracer* trc)
{
for (JS::Heap<JS::Value>& guiMessage : m_GuiMessageQueue)
JS::TraceEdge(trc, &guiMessage, "m_GuiMessageQueue");
for (JS::Heap<JS::Value>& guiMessage : m_HistoricGuiMessages)
JS::TraceEdge(trc, &guiMessage, "m_HistoricGuiMessages");
}
/// Network
@ -737,7 +722,8 @@ void XmppClient::CreateGUIMessage(
JS::RootedObject messageObj(rq.cx, message.toObjectOrNull());
SetGUIMessageProperty(rq, messageObj, args...);
Script::DeepFreezeObject(rq, message);
m_GuiMessageQueue.push_back(JS::Heap<JS::Value>(message));
if (!m_GuiMessageQueue.append(message))
throw std::runtime_error{"Append failed"};
}
bool XmppClient::GuiPollHasPlayerListUpdate()
@ -761,7 +747,7 @@ JS::Value XmppClient::GuiPollNewMessages(const ScriptInterface& guiInterface)
// performance demanding than processing a lone message.
JS::RootedValueVector messages{rq.cx};
for (const JS::Heap<JS::Value>& message : m_GuiMessageQueue)
for (const JS::Value& message : m_GuiMessageQueue)
{
if (!messages.append(message))
throw std::runtime_error{"Append failed"};
@ -784,7 +770,8 @@ JS::Value XmppClient::GuiPollNewMessages(const ScriptInterface& guiInterface)
{
Script::SetProperty(rq, historicMessage, "historic", true);
Script::DeepFreezeObject(rq, historicMessage);
m_HistoricGuiMessages.push_back(JS::Heap<JS::Value>(historicMessage));
if (!m_HistoricGuiMessages.append(historicMessage))
throw std::runtime_error{"Append failed"};
}
else
LOGERROR("Could not clone historic lobby GUI message!");
@ -805,7 +792,7 @@ JS::Value XmppClient::GuiPollHistoricMessages(const ScriptInterface& guiInterfac
JS::RootedValueVector messages{rq.cx};
for (const JS::Heap<JS::Value>& message : m_HistoricGuiMessages)
for (const JS::Value& message : m_HistoricGuiMessages)
{
if (!messages.append(message))
throw std::runtime_error{"Append failed"};

15
source/lobby/XmppClient.h
View file

@ -29,11 +29,12 @@
#include <js/RootingAPI.h>
#include <js/TypeDecls.h>
#include <js/Value.h>
#include <js/Vector.h>
#include <js/GCVector.h>
#include <map>
#include <string>
#include <vector>
class JSTracer;
class ScriptInterface;
class XmppClient : public IXmppClient, public gloox::ConnectionListener, public gloox::MUCRoomHandler, public gloox::IqHandler, public gloox::RegistrationHandler, public gloox::MessageHandler, public gloox::Jingle::SessionHandler, public gloox::LogHandler
@ -70,14 +71,6 @@ public:
XmppClient(const ScriptInterface* scriptInterface, const std::string& sUsername, const std::string& sPassword, const std::string& sRoom, const std::string& sNick, const int historyRequestSize = 0, const bool regOpt = false);
virtual ~XmppClient();
// JS::Heap is better for GC performance than JS::PersistentRooted
static void Trace(JSTracer *trc, void *data)
{
static_cast<XmppClient*>(data)->TraceMember(trc);
}
void TraceMember(JSTracer *trc);
// Network
void connect() override;
void disconnect() override;
@ -196,9 +189,9 @@ private:
/// ScriptInterface to root the values
const ScriptInterface* m_ScriptInterface;
/// Queue of messages for the GUI
std::deque<JS::Heap<JS::Value> > m_GuiMessageQueue;
JS::PersistentRootedVector<JS::Value> m_GuiMessageQueue;
/// Cache of all GUI messages received since the login
std::vector<JS::Heap<JS::Value> > m_HistoricGuiMessages;
JS::PersistentRootedVector<JS::Value> m_HistoricGuiMessages;
/// Current room subject/topic.
std::wstring m_Subject;
};