Introduce Stats::Context, pass it to the OnStats hook and switch all code to it

1 files changed, 79 insertions, 74 deletions

diff --git a/src/coremods/core_stats.cpp b/src/coremods/core_stats.cpp
index 9fb232bc0..69f1f3cf8 100644
--- a/src/coremods/core_stats.cpp
+++ b/src/coremods/core_stats.cpp
@@ -31,7 +31,7 @@
  */
 class CommandStats : public Command
 {
-	void DoStats(char statschar, User* user, string_list &results);
+	void DoStats(Stats::Context& stats);
  public:
 	/** Constructor for stats.
 	 */
@@ -50,20 +50,23 @@ class CommandStats : public Command
 	}
 };
 
-static void GenerateStatsLl(User* user, string_list& results, char c)
+static void GenerateStatsLl(Stats::Context& stats)
 {
-	results.push_back(InspIRCd::Format("211 %s nick[ident@%s] sendq cmds_out bytes_out cmds_in bytes_in time_open", user->nick.c_str(), (c == 'l' ? "host" : "ip")));
+	stats.AddRow(211, InspIRCd::Format("nick[ident@%s] sendq cmds_out bytes_out cmds_in bytes_in time_open", (stats.GetSymbol() == 'l' ? "host" : "ip")));
 
 	const UserManager::LocalList& list = ServerInstance->Users.GetLocalUsers();
 	for (UserManager::LocalList::const_iterator i = list.begin(); i != list.end(); ++i)
 	{
 		LocalUser* u = *i;
-		results.push_back("211 "+user->nick+" "+u->nick+"["+u->ident+"@"+(c == 'l' ? u->dhost : u->GetIPString())+"] "+ConvToStr(u->eh.getSendQSize())+" "+ConvToStr(u->cmds_out)+" "+ConvToStr(u->bytes_out)+" "+ConvToStr(u->cmds_in)+" "+ConvToStr(u->bytes_in)+" "+ConvToStr(ServerInstance->Time() - u->signon));
+		stats.AddRow(211, u->nick+"["+u->ident+"@"+(stats.GetSymbol() == 'l' ? u->dhost : u->GetIPString())+"] "+ConvToStr(u->eh.getSendQSize())+" "+ConvToStr(u->cmds_out)+" "+ConvToStr(u->bytes_out)+" "+ConvToStr(u->cmds_in)+" "+ConvToStr(u->bytes_in)+" "+ConvToStr(ServerInstance->Time() - u->signon));
 	}
 }
 
-void CommandStats::DoStats(char statschar, User* user, string_list &results)
+void CommandStats::DoStats(Stats::Context& stats)
 {
+	User* const user = stats.GetSource();
+	const char statschar = stats.GetSymbol();
+
 	bool isPublic = ServerInstance->Config->UserStats.find(statschar) != std::string::npos;
 	bool isRemoteOper = IS_REMOTE(user) && (user->IsOper());
 	bool isLocalOperWithPrivs = IS_LOCAL(user) && user->HasPrivPermission("servers/auspex");
@@ -74,15 +77,15 @@ void CommandStats::DoStats(char statschar, User* user, string_list &results)
 				"%s '%c' denied for %s (%s@%s)",
 				(IS_LOCAL(user) ? "Stats" : "Remote stats"),
 				statschar, user->nick.c_str(), user->ident.c_str(), user->host.c_str());
-		results.push_back("481 " + user->nick + " :Permission Denied - STATS " + statschar + " requires the servers/auspex priv.");
+		stats.AddRow(481, (std::string("Permission Denied - STATS ") + statschar + " requires the servers/auspex priv."));
 		return;
 	}
 
 	ModResult MOD_RESULT;
-	FIRST_MOD_RESULT(OnStats, MOD_RESULT, (statschar, user, results));
+	FIRST_MOD_RESULT(OnStats, MOD_RESULT, (stats));
 	if (MOD_RESULT == MOD_RES_DENY)
 	{
-		results.push_back("219 "+user->nick+" "+statschar+" :End of /STATS report");
+		stats.AddRow(219, statschar, "End of /STATS report");
 		ServerInstance->SNO->WriteToSnoMask('t',"%s '%c' requested by %s (%s@%s)",
 			(IS_LOCAL(user) ? "Stats" : "Remote stats"), statschar, user->nick.c_str(), user->ident.c_str(), user->host.c_str());
 		return;
@@ -107,8 +110,7 @@ void CommandStats::DoStats(char statschar, User* user, string_list &results)
 				std::string type = ls->bind_tag->getString("type", "clients");
 				std::string hook = ls->bind_tag->getString("ssl", "plaintext");
 
-				results.push_back("249 "+user->nick+" :"+ ip + ":"+ConvToStr(ls->bind_port)+
-					" (" + type + ", " + hook + ")");
+				stats.AddRow(249, ip + ":"+ConvToStr(ls->bind_port) + " (" + type + ", " + hook + ")");
 			}
 		}
 		break;
@@ -123,25 +125,29 @@ void CommandStats::DoStats(char statschar, User* user, string_list &results)
 			for (ServerConfig::ClassVector::const_iterator i = ServerInstance->Config->Classes.begin(); i != ServerInstance->Config->Classes.end(); ++i)
 			{
 				ConnectClass* c = *i;
-				std::stringstream res;
-				res << "215 " << user->nick << " I " << c->name << ' ';
+				Stats::Row row(215);
+				row.push("I").push(c->name);
+
+				std::string param;
 				if (c->type == CC_ALLOW)
-					res << '+';
+					param.push_back('+');
 				if (c->type == CC_DENY)
-					res << '-';
+					param.push_back('-');
 
 				if (c->type == CC_NAMED)
-					res << '*';
+					param.push_back('*');
 				else
-					res << c->host;
+					param.append(c->host);
 
-				res << ' ' << c->config->getString("port", "*") << ' ';
+				row.push(param).push(c->config->getString("port", "*"));
+				row.push(ConvToStr(c->GetRecvqMax())).push(ConvToStr(c->GetSendqSoftMax())).push(ConvToStr(c->GetSendqHardMax())).push(ConvToStr(c->GetCommandRate()));
 
-				res << c->GetRecvqMax() << ' ' << c->GetSendqSoftMax() << ' ' << c->GetSendqHardMax()
-					<< ' ' << c->GetCommandRate() << ' ' << c->GetPenaltyThreshold();
+				param = ConvToStr(c->GetPenaltyThreshold());
 				if (c->fakelag)
-					res << '*';
-				results.push_back(res.str());
+					param.push_back('*');
+				row.push(param);
+
+				stats.AddRow(row);
 			}
 		}
 		break;
@@ -152,9 +158,8 @@ void CommandStats::DoStats(char statschar, User* user, string_list &results)
 			for (ServerConfig::ClassVector::const_iterator i = ServerInstance->Config->Classes.begin(); i != ServerInstance->Config->Classes.end(); i++)
 			{
 				ConnectClass* c = *i;
-				results.push_back("215 "+user->nick+" i NOMATCH * "+c->GetHost()+" "+ConvToStr(c->limit ? c->limit : SocketEngine::GetMaxFds())+" "+ConvToStr(idx)+" "+ServerInstance->Config->ServerName+" *");
-				results.push_back("218 "+user->nick+" Y "+ConvToStr(idx)+" "+ConvToStr(c->GetPingTime())+" 0 "+ConvToStr(c->GetSendqHardMax())+" :"+
-						ConvToStr(c->GetRecvqMax())+" "+ConvToStr(c->GetRegTimeout()));
+				stats.AddRow(215, 'i', "NOMATCH", '*', c->GetHost(), (c->limit ? c->limit : SocketEngine::GetMaxFds()), idx, ServerInstance->Config->ServerName, '*');
+				stats.AddRow(218, 'Y', idx, c->GetPingTime(), '0', c->GetSendqHardMax(), ConvToStr(c->GetRecvqMax())+" "+ConvToStr(c->GetRegTimeout()));
 				idx++;
 			}
 		}
@@ -170,37 +175,37 @@ void CommandStats::DoStats(char statschar, User* user, string_list &results)
 				if (!oper->server->IsULine())
 				{
 					LocalUser* lu = IS_LOCAL(oper);
-					results.push_back("249 " + user->nick + " :" + oper->nick + " (" + oper->ident + "@" + oper->dhost + ") Idle: " +
+					stats.AddRow(249, oper->nick + " (" + oper->ident + "@" + oper->dhost + ") Idle: " +
 							(lu ? ConvToStr(ServerInstance->Time() - lu->idle_lastmsg) + " secs" : "unavailable"));
 					idx++;
 				}
 			}
-			results.push_back("249 "+user->nick+" :"+ConvToStr(idx)+" OPER(s)");
+			stats.AddRow(249, ConvToStr(idx)+" OPER(s)");
 		}
 		break;
 
 		case 'k':
-			ServerInstance->XLines->InvokeStats("K",216,user,results);
+			ServerInstance->XLines->InvokeStats("K",216,stats);
 		break;
 		case 'g':
-			ServerInstance->XLines->InvokeStats("G",223,user,results);
+			ServerInstance->XLines->InvokeStats("G",223,stats);
 		break;
 		case 'q':
-			ServerInstance->XLines->InvokeStats("Q",217,user,results);
+			ServerInstance->XLines->InvokeStats("Q",217,stats);
 		break;
 		case 'Z':
-			ServerInstance->XLines->InvokeStats("Z",223,user,results);
+			ServerInstance->XLines->InvokeStats("Z",223,stats);
 		break;
 		case 'e':
-			ServerInstance->XLines->InvokeStats("E",223,user,results);
+			ServerInstance->XLines->InvokeStats("E",223,stats);
 		break;
 		case 'E':
 		{
-			const SocketEngine::Statistics& stats = SocketEngine::GetStats();
-			results.push_back("249 "+user->nick+" :Total events: "+ConvToStr(stats.TotalEvents));
-			results.push_back("249 "+user->nick+" :Read events:  "+ConvToStr(stats.ReadEvents));
-			results.push_back("249 "+user->nick+" :Write events: "+ConvToStr(stats.WriteEvents));
-			results.push_back("249 "+user->nick+" :Error events: "+ConvToStr(stats.ErrorEvents));
+			const SocketEngine::Statistics& sestats = SocketEngine::GetStats();
+			stats.AddRow(249, "Total events: "+ConvToStr(sestats.TotalEvents));
+			stats.AddRow(249, "Read events:  "+ConvToStr(sestats.ReadEvents));
+			stats.AddRow(249, "Write events: "+ConvToStr(sestats.WriteEvents));
+			stats.AddRow(249, "Error events: "+ConvToStr(sestats.ErrorEvents));
 			break;
 		}
 
@@ -213,7 +218,7 @@ void CommandStats::DoStats(char statschar, User* user, string_list &results)
 				if (i->second->use_count)
 				{
 					/* RPL_STATSCOMMANDS */
-					results.push_back("212 "+user->nick+" "+i->second->name+" "+ConvToStr(i->second->use_count));
+					stats.AddRow(212, i->second->name, i->second->use_count);
 				}
 			}
 		}
@@ -222,9 +227,9 @@ void CommandStats::DoStats(char statschar, User* user, string_list &results)
 		/* stats z (debug and memory info) */
 		case 'z':
 		{
-			results.push_back("249 "+user->nick+" :Users: "+ConvToStr(ServerInstance->Users->GetUsers().size()));
-			results.push_back("249 "+user->nick+" :Channels: "+ConvToStr(ServerInstance->GetChans().size()));
-			results.push_back("249 "+user->nick+" :Commands: "+ConvToStr(ServerInstance->Parser.GetCommands().size()));
+			stats.AddRow(249, "Users: "+ConvToStr(ServerInstance->Users->GetUsers().size()));
+			stats.AddRow(249, "Channels: "+ConvToStr(ServerInstance->GetChans().size()));
+			stats.AddRow(249, "Commands: "+ConvToStr(ServerInstance->Parser.GetCommands().size()));
 
 			float kbitpersec_in, kbitpersec_out, kbitpersec_total;
 			char kbitpersec_in_s[30], kbitpersec_out_s[30], kbitpersec_total_s[30];
@@ -235,9 +240,9 @@ void CommandStats::DoStats(char statschar, User* user, string_list &results)
 			snprintf(kbitpersec_out_s, 30, "%03.5f", kbitpersec_out);
 			snprintf(kbitpersec_in_s, 30, "%03.5f", kbitpersec_in);
 
-			results.push_back("249 "+user->nick+" :Bandwidth total:  "+ConvToStr(kbitpersec_total_s)+" kilobits/sec");
-			results.push_back("249 "+user->nick+" :Bandwidth out:    "+ConvToStr(kbitpersec_out_s)+" kilobits/sec");
-			results.push_back("249 "+user->nick+" :Bandwidth in:     "+ConvToStr(kbitpersec_in_s)+" kilobits/sec");
+			stats.AddRow(249, "Bandwidth total:  "+ConvToStr(kbitpersec_total_s)+" kilobits/sec");
+			stats.AddRow(249, "Bandwidth out:    "+ConvToStr(kbitpersec_out_s)+" kilobits/sec");
+			stats.AddRow(249, "Bandwidth in:     "+ConvToStr(kbitpersec_in_s)+" kilobits/sec");
 
 #ifndef _WIN32
 			/* Moved this down here so all the not-windows stuff (look w00tie, I didn't say win32!) is in one ifndef.
@@ -248,11 +253,11 @@ void CommandStats::DoStats(char statschar, User* user, string_list &results)
 			/* Not sure why we were doing '0' with a RUSAGE_SELF comment rather than just using RUSAGE_SELF -- Om */
 			if (!getrusage(RUSAGE_SELF,&R))	/* RUSAGE_SELF */
 			{
-				results.push_back("249 "+user->nick+" :Total allocation: "+ConvToStr(R.ru_maxrss)+"K");
-				results.push_back("249 "+user->nick+" :Signals:          "+ConvToStr(R.ru_nsignals));
-				results.push_back("249 "+user->nick+" :Page faults:      "+ConvToStr(R.ru_majflt));
-				results.push_back("249 "+user->nick+" :Swaps:            "+ConvToStr(R.ru_nswap));
-				results.push_back("249 "+user->nick+" :Context Switches: Voluntary; "+ConvToStr(R.ru_nvcsw)+" Involuntary; "+ConvToStr(R.ru_nivcsw));
+				stats.AddRow(249, "Total allocation: "+ConvToStr(R.ru_maxrss)+"K");
+				stats.AddRow(249, "Signals:          "+ConvToStr(R.ru_nsignals));
+				stats.AddRow(249, "Page faults:      "+ConvToStr(R.ru_majflt));
+				stats.AddRow(249, "Swaps:            "+ConvToStr(R.ru_nswap));
+				stats.AddRow(249, "Context Switches: Voluntary; "+ConvToStr(R.ru_nvcsw)+" Involuntary; "+ConvToStr(R.ru_nivcsw));
 
 				char percent[30];
 
@@ -262,21 +267,21 @@ void CommandStats::DoStats(char statschar, User* user, string_list &results)
 				float per = (n_eaten / n_elapsed) * 100;
 
 				snprintf(percent, 30, "%03.5f%%", per);
-				results.push_back("249 "+user->nick+" :CPU Use (now):    "+percent);
+				stats.AddRow(249, std::string("CPU Use (now):    ")+percent);
 
 				n_elapsed = ServerInstance->Time() - ServerInstance->startup_time;
 				n_eaten = (float)R.ru_utime.tv_sec + R.ru_utime.tv_usec / 100000.0;
 				per = (n_eaten / n_elapsed) * 100;
 				snprintf(percent, 30, "%03.5f%%", per);
-				results.push_back("249 "+user->nick+" :CPU Use (total):  "+percent);
+				stats.AddRow(249, std::string("CPU Use (total):  ")+percent);
 			}
 #else
 			PROCESS_MEMORY_COUNTERS MemCounters;
 			if (GetProcessMemoryInfo(GetCurrentProcess(), &MemCounters, sizeof(MemCounters)))
 			{
-				results.push_back("249 "+user->nick+" :Total allocation: "+ConvToStr((MemCounters.WorkingSetSize + MemCounters.PagefileUsage) / 1024)+"K");
-				results.push_back("249 "+user->nick+" :Pagefile usage:   "+ConvToStr(MemCounters.PagefileUsage / 1024)+"K");
-				results.push_back("249 "+user->nick+" :Page faults:      "+ConvToStr(MemCounters.PageFaultCount));
+				stats.AddRow(249, "Total allocation: "+ConvToStr((MemCounters.WorkingSetSize + MemCounters.PagefileUsage) / 1024)+"K");
+				stats.AddRow(249, "Pagefile usage:   "+ConvToStr(MemCounters.PagefileUsage / 1024)+"K");
+				stats.AddRow(249, "Page faults:      "+ConvToStr(MemCounters.PageFaultCount));
 			}
 
 			FILETIME CreationTime;
@@ -296,13 +301,13 @@ void CommandStats::DoStats(char statschar, User* user, string_list &results)
 				char percent[30];
 
 				snprintf(percent, 30, "%03.5f%%", per);
-				results.push_back("249 "+user->nick+" :CPU Use (now):    "+percent);
+				stats.AddRow(249, std::string("CPU Use (now):    ")+percent);
 
 				n_elapsed = ServerInstance->Time() - ServerInstance->startup_time;
 				n_eaten = (double)(( (uint64_t)(KernelTime.dwHighDateTime) << 32 ) + (uint64_t)(KernelTime.dwLowDateTime))/100000;
 				per = (n_eaten / n_elapsed);
 				snprintf(percent, 30, "%03.5f%%", per);
-				results.push_back("249 "+user->nick+" :CPU Use (total):  "+percent);
+				stats.AddRow(249, std::string("CPU Use (total):  ")+percent));
 			}
 #endif
 		}
@@ -310,12 +315,12 @@ void CommandStats::DoStats(char statschar, User* user, string_list &results)
 
 		case 'T':
 		{
-			results.push_back("249 "+user->nick+" :accepts "+ConvToStr(ServerInstance->stats.Accept)+" refused "+ConvToStr(ServerInstance->stats.Refused));
-			results.push_back("249 "+user->nick+" :unknown commands "+ConvToStr(ServerInstance->stats.Unknown));
-			results.push_back("249 "+user->nick+" :nick collisions "+ConvToStr(ServerInstance->stats.Collisions));
-			results.push_back("249 "+user->nick+" :dns requests "+ConvToStr(ServerInstance->stats.DnsGood+ServerInstance->stats.DnsBad)+" succeeded "+ConvToStr(ServerInstance->stats.DnsGood)+" failed "+ConvToStr(ServerInstance->stats.DnsBad));
-			results.push_back("249 "+user->nick+" :connection count "+ConvToStr(ServerInstance->stats.Connects));
-			results.push_back(InspIRCd::Format("249 %s :bytes sent %5.2fK recv %5.2fK", user->nick.c_str(),
+			stats.AddRow(249, "accepts "+ConvToStr(ServerInstance->stats.Accept)+" refused "+ConvToStr(ServerInstance->stats.Refused));
+			stats.AddRow(249, "unknown commands "+ConvToStr(ServerInstance->stats.Unknown));
+			stats.AddRow(249, "nick collisions "+ConvToStr(ServerInstance->stats.Collisions));
+			stats.AddRow(249, "dns requests "+ConvToStr(ServerInstance->stats.DnsGood+ServerInstance->stats.DnsBad)+" succeeded "+ConvToStr(ServerInstance->stats.DnsGood)+" failed "+ConvToStr(ServerInstance->stats.DnsBad));
+			stats.AddRow(249, "connection count "+ConvToStr(ServerInstance->stats.Connects));
+			stats.AddRow(249, InspIRCd::Format("bytes sent %5.2fK recv %5.2fK",
 				ServerInstance->stats.Sent / 1024.0, ServerInstance->stats.Recv / 1024.0));
 		}
 		break;
@@ -327,8 +332,7 @@ void CommandStats::DoStats(char statschar, User* user, string_list &results)
 			for(ConfigIter i = tags.first; i != tags.second; ++i)
 			{
 				ConfigTag* tag = i->second;
-				results.push_back("243 "+user->nick+" O "+tag->getString("host")+" * "+
-					tag->getString("name") + " " + tag->getString("type")+" 0");
+				stats.AddRow(243, 'O', tag->getString("host"), '*', tag->getString("name"), tag->getString("type"), '0');
 			}
 		}
 		break;
@@ -349,7 +353,7 @@ void CommandStats::DoStats(char statschar, User* user, string_list &results)
 					if (mh && mh->NeedsOper() && tag->AllowedChanModes[c - 'A'])
 						cmodes.push_back(c);
 				}
-				results.push_back("243 "+user->nick+" O "+tag->name.c_str() + " " + umodes + " " + cmodes);
+				stats.AddRow(243, 'O', tag->name, umodes, cmodes);
 			}
 		}
 		break;
@@ -358,14 +362,14 @@ void CommandStats::DoStats(char statschar, User* user, string_list &results)
 		case 'l':
 		/* stats L (show user I/O stats with IP addresses) */
 		case 'L':
-			GenerateStatsLl(user, results, statschar);
+			GenerateStatsLl(stats);
 		break;
 
 		/* stats u (show server uptime) */
 		case 'u':
 		{
 			unsigned int up = static_cast<unsigned int>(ServerInstance->Time() - ServerInstance->startup_time);
-			results.push_back(InspIRCd::Format("242 %s :Server up %u days, %.2u:%.2u:%.2u", user->nick.c_str(),
+			stats.AddRow(242, InspIRCd::Format("Server up %u days, %.2u:%.2u:%.2u",
 				up / 86400, (up / 3600) % 24, (up / 60) % 60, up % 60));
 		}
 		break;
@@ -374,7 +378,7 @@ void CommandStats::DoStats(char statschar, User* user, string_list &results)
 		break;
 	}
 
-	results.push_back("219 "+user->nick+" "+statschar+" :End of /STATS report");
+	stats.AddRow(219, statschar, "End of /STATS report");
 	ServerInstance->SNO->WriteToSnoMask('t',"%s '%c' requested by %s (%s@%s)",
 		(IS_LOCAL(user) ? "Stats" : "Remote stats"), statschar, user->nick.c_str(), user->ident.c_str(), user->host.c_str());
 	return;
@@ -390,13 +394,14 @@ CmdResult CommandStats::Handle (const std::vector<std::string>& parameters, User
 			localuser->CommandFloodPenalty += 2000;
 		return CMD_SUCCESS;
 	}
-	string_list values;
-	char search = parameters[0][0];
-	DoStats(search, user, values);
-
-	const std::string p = ":" + ServerInstance->Config->ServerName + " ";
-	for (size_t i = 0; i < values.size(); i++)
-		user->SendText(p + values[i]);
+	Stats::Context stats(user, parameters[0][0]);
+	DoStats(stats);
+	const std::vector<Stats::Row>& rows = stats.GetRows();
+	for (std::vector<Stats::Row>::const_iterator i = rows.begin(); i != rows.end(); ++i)
+	{
+		const Stats::Row& row = *i;
+		user->WriteRemoteNumeric(row);
+	}
 
 	return CMD_SUCCESS;
 }