0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

backported: Fixed metrics compilation and added max procesing times for types

Browse source
This commit is contained in:
Pauli Nieminen 2008-09-03 02:11:39 +00:00
parent 4c7f4f2b83
commit 8fdeb979ad
2 changed files with 37 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/server/metrics.cpp
View file

@ -23,15 +23,12 @@
#include <time.h>
#include <iostream>
bool operator<(const metrics::sample& s, const simple_wml::string_span& name)
{
return s.name < name;
}
bool operator<(const simple_wml::string_span& name, const metrics::sample& s)
{
return name < s.name;
}
struct compare_samples_to_stringspan {
bool operator()(const simple_wml::string_span& a, const simple_wml::string_span& b)
{
return a < b;
}
};
struct compare_samples_by_time {
bool operator()(const metrics::sample& a, const metrics::sample& b) const {
@ -77,28 +74,26 @@ void metrics::no_requests()
void metrics::record_sample(const simple_wml::string_span& name,
clock_t parsing_time, clock_t processing_time)
{
std::pair<std::vector<sample>::iterator,std::vector<sample>::iterator>
range = std::equal_range(samples_.begin(), samples_.end(), name);
if(range.first == range.second) {
std::vector<sample>::iterator isample = std::lower_bound(samples_.begin(), samples_.end(), name,compare_samples_to_stringspan());
if(isample->name != name) {
//protect against DoS with memory exhaustion
if(samples_.size() > 30) {
return;
}
int index = range.first - samples_.begin();
int index = isample - samples_.begin();
simple_wml::string_span dup_name(name.duplicate());
sample new_sample;
new_sample.name = dup_name;
new_sample.nsamples = 0;
new_sample.parsing_time = 0;
new_sample.processing_time = 0;
samples_.insert(range.first, new_sample);
samples_.insert(isample, new_sample);
range.first = samples_.begin() + index;
isample = samples_.begin() + index;
}
range.first->nsamples++;
range.first->parsing_time += parsing_time;
range.first->processing_time += processing_time;
isample->nsamples++;
isample->parsing_time += parsing_time;
isample->processing_time += processing_time;
isample->max_parsing_time = std::max(parsing_time,isample->max_parsing_time);
isample->max_processing_time = std::max(processing_time,isample->max_processing_time);
}
void metrics::game_terminated(const std::string& reason)
@ -135,7 +130,10 @@ std::ostream& operator<<(std::ostream& out, metrics& met)
out << "\n\nRequest types:\n";
for(std::vector<metrics::sample>::const_iterator s = ordered_samples.begin(); s != ordered_samples.end(); ++s) {
out << "'" << s->name << "' called " << s->nsamples << " times " << s->parsing_time << " parsing time, " << s->processing_time << " processing time\n";
out << "'" << s->name
<< "' called " << s->nsamples << " times "
<< s->parsing_time << "("<< s->max_parsing_time <<") parsing time, "
<< s->processing_time << "("<<s->max_processing_time<<") processing time\n";
}
return out;

17
src/server/metrics.hpp
View file

@ -42,9 +42,26 @@ public:
friend std::ostream& operator<<(std::ostream& out, metrics& met);
struct sample {
sample() :
name(),
nsamples(0),
parsing_time(0),
processing_time(0),
max_parsing_time(0),
max_processing_time(0)
{
}
simple_wml::string_span name;
int nsamples;
clock_t parsing_time, processing_time;
clock_t max_parsing_time, max_processing_time;
operator const simple_wml::string_span&()
{
return name;
}
};
private: