ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-09 10:39:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Cache the number of global and local servers.

Browse Source
This commit is contained in:
Sadie Powell 2025-01-25 22:53:13 +00:00
parent 1d96b3cc5d
commit ae6d57ff0b
1 changed files with 38 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/coremods/core_lusers.cpp
View File

@ -23,6 +23,7 @@
#include "inspircd.h" #include "inspircd.h"
#include "modules/server.h"
enum enum
{ {
@ -42,6 +43,8 @@ struct LusersCounters final
size_t max_local; size_t max_local;
size_t max_global; size_t max_global;
size_t invisible = 0; size_t invisible = 0;
size_t global_servers;
size_t local_servers;
LusersCounters(UserModeReference& invisiblemode) LusersCounters(UserModeReference& invisiblemode)
: max_local(ServerInstance->Users.LocalUserCount()) : max_local(ServerInstance->Users.LocalUserCount())
@ -52,6 +55,7 @@ struct LusersCounters final
if (u->IsModeSet(invisiblemode)) if (u->IsModeSet(invisiblemode))
invisible++; invisible++;
} }
UpdateServerCount();
} }
inline void UpdateMaxUsers() inline void UpdateMaxUsers()
@ -64,6 +68,25 @@ struct LusersCounters final
if (current > max_global) if (current > max_global)
max_global = current; max_global = current;
} }
inline void UpdateServerCount()
{
// XXX: Currently we don't have a way to find out whether a
// server is directly connected from a Server object so we
// have to do this via the protocol interface.
ProtocolInterface::ServerList serverlist;
ServerInstance->PI->GetServerList(serverlist);
// If spanningtree is not loaded GetServerList does nothing.
global_servers = std::max<size_t>(serverlist.size(), 1);
local_servers = 0;
for (const auto& server : serverlist)
{
if (server.parentname == ServerInstance->Config->ServerName)
local_servers++;
}
}
}; };
class CommandLusers final class CommandLusers final
@ -84,23 +107,11 @@ public:
CmdResult CommandLusers::Handle(User* user, const Params& parameters) CmdResult CommandLusers::Handle(User* user, const Params& parameters)
{ {
ProtocolInterface::ServerList serverlist;
ServerInstance->PI->GetServerList(serverlist);
// If spanningtree is not loaded GetServerList does nothing.
size_t global_servers = std::max<size_t>(serverlist.size(), 1);
size_t local_servers = 0;
for (const auto& server : serverlist)
{
if (server.parentname == ServerInstance->Config->ServerName)
local_servers++;
}
counters.UpdateMaxUsers(); counters.UpdateMaxUsers();
user->WriteNumeric(RPL_LUSERCLIENT, INSP_FORMAT("There are {} users and {} invisible on {} servers", user->WriteNumeric(RPL_LUSERCLIENT, INSP_FORMAT("There are {} users and {} invisible on {} servers",
ServerInstance->Users.GlobalUserCount() - counters.invisible, counters.invisible, global_servers)); ServerInstance->Users.GlobalUserCount() - counters.invisible, counters.invisible,
counters.global_servers));
size_t opercount = ServerInstance->Users.all_opers.size(); size_t opercount = ServerInstance->Users.all_opers.size();
if (opercount) if (opercount)
@ -110,7 +121,7 @@ CmdResult CommandLusers::Handle(User* user, const Params& parameters)
user->WriteNumeric(RPL_LUSERUNKNOWN, ServerInstance->Users.UnknownUserCount(), "unknown connections"); user->WriteNumeric(RPL_LUSERUNKNOWN, ServerInstance->Users.UnknownUserCount(), "unknown connections");
user->WriteNumeric(RPL_LUSERCHANNELS, ServerInstance->Channels.GetChans().size(), "channels formed"); user->WriteNumeric(RPL_LUSERCHANNELS, ServerInstance->Channels.GetChans().size(), "channels formed");
user->WriteNumeric(RPL_LUSERME, INSP_FORMAT("I have {} clients and {} servers", ServerInstance->Users.LocalUserCount(), local_servers)); user->WriteNumeric(RPL_LUSERME, INSP_FORMAT("I have {} clients and {} servers", ServerInstance->Users.LocalUserCount(), counters.local_servers));
user->WriteNumeric(RPL_LOCALUSERS, INSP_FORMAT("Current local users: {} Max: {}", ServerInstance->Users.LocalUserCount(), counters.max_local)); user->WriteNumeric(RPL_LOCALUSERS, INSP_FORMAT("Current local users: {} Max: {}", ServerInstance->Users.LocalUserCount(), counters.max_local));
user->WriteNumeric(RPL_GLOBALUSERS, INSP_FORMAT("Current global users: {} Max: {}", ServerInstance->Users.GlobalUserCount(), counters.max_global)); user->WriteNumeric(RPL_GLOBALUSERS, INSP_FORMAT("Current global users: {} Max: {}", ServerInstance->Users.GlobalUserCount(), counters.max_global));
return CmdResult::SUCCESS; return CmdResult::SUCCESS;
@ -141,6 +152,7 @@ public:
class ModuleLusers final class ModuleLusers final
: public Module : public Module
, public ServerProtocol::LinkEventListener
{ {
UserModeReference invisiblemode; UserModeReference invisiblemode;
LusersCounters counters; LusersCounters counters;
@ -150,6 +162,7 @@ class ModuleLusers final
public: public:
ModuleLusers() ModuleLusers()
: Module(VF_CORE | VF_VENDOR, "Provides the LUSERS command") : Module(VF_CORE | VF_VENDOR, "Provides the LUSERS command")
, ServerProtocol::LinkEventListener(this)
, invisiblemode(this, "invisible") , invisiblemode(this, "invisible")
, counters(invisiblemode) , counters(invisiblemode)
, cmd(this, counters) , cmd(this, counters)
@ -169,6 +182,16 @@ public:
if (user->IsModeSet(invisiblemode)) if (user->IsModeSet(invisiblemode))
counters.invisible--; counters.invisible--;
} }
void OnServerLink(const Server* server) override
{
counters.UpdateServerCount();
}
void OnServerSplit(const Server* server, bool error) override
{
counters.UpdateServerCount();
}
}; };
MODULE_INIT(ModuleLusers) MODULE_INIT(ModuleLusers)