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

core_whowas Change the FIFO to be an intrusive list

Browse Source
This commit is contained in:
Attila Molnar 2014-07-09 15:14:30 +02:00
parent 18d9adff0f
commit eef472fb62
2 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/commands/cmd_whowas.h
View File

@ -34,7 +34,7 @@ namespace WhoWas
{
/** Everything known about one nick
*/
struct Nick
struct Nick : public intrusive_list_node<Nick>
{
/** Container where each element has information about one occurrence of this nick
*/
@ -56,16 +56,16 @@ namespace WhoWas
*/
~Nick();
};
/** Order in which the users were added into the map, used to remove oldest nick
*/
typedef intrusive_list_tail<Nick> FIFO;
}
/** Sets of users in the whowas system
*/
typedef std::map<irc::string, WhoWas::Nick*> whowas_users;
/** Sets of time and users in whowas list
*/
typedef std::deque<std::pair<time_t,irc::string> > whowas_users_fifo;
/** Handle /WHOWAS. These command handlers can be reloaded by the core,
* and handle basic RFC1459 commands. Commands within modules work
* the same way, however, they can be fully unloaded, where these
@ -80,7 +80,7 @@ class CommandWhowas : public Command
/** List of nicknames in the order they were inserted into the map
*/
whowas_users_fifo whowas_fifo;
WhoWas::FIFO whowas_fifo;
public:
/** Max number of WhoWas entries per user.

23
src/coremods/core_whowas.cpp
View File

@ -109,19 +109,15 @@ void CommandWhowas::AddToWhoWas(User* user)
ret.first->second = nick;
// Add this nick to the fifo too
whowas_fifo.push_back(std::make_pair(ServerInstance->Time(), ret.first->first));
whowas_fifo.push_back(nick);
if (whowas.size() > this->MaxGroups)
{
// Too many nicks, remove the nick which was inserted the longest time ago from both the map and the fifo
whowas_users::iterator it = whowas.find(whowas_fifo.front().second);
if (it != whowas.end())
{
WhoWas::Nick* set = it->second;
delete set;
whowas.erase(it);
}
nick = whowas_fifo.front();
whowas_fifo.pop_front();
whowas.erase(nick->nick);
delete nick;
}
}
else
@ -147,22 +143,19 @@ void CommandWhowas::Prune()
/* first cut the list to new size (maxgroups) and also prune entries that are timed out. */
while (!whowas_fifo.empty())
{
if ((whowas_fifo.size() > this->MaxGroups) || (whowas_fifo.front().first < min))
WhoWas::Nick* nick = whowas_fifo.front();
if ((whowas_fifo.size() > this->MaxGroups) || (nick->addtime < min))
{
whowas_users::iterator iter = whowas.find(whowas_fifo.front().second);
/* hopefully redundant integrity check, but added while debugging r6216 */
if (iter == whowas.end())
if (!whowas.erase(nick->nick))
{
/* this should never happen, if it does maps are corrupt */
ServerInstance->Logs->Log("WHOWAS", LOG_DEFAULT, "BUG: Whowas maps got corrupted! (1)");
return;
}
WhoWas::Nick* nick = iter->second;
delete nick;
whowas.erase(iter);
whowas_fifo.pop_front();
delete nick;
}
else
break;