|
|
|
|
@ -204,18 +204,23 @@ public:
|
|
|
|
|
if (this->sbc_show_state.template is<show_all>()
|
|
|
|
|
|| lpc == (size_t) ident_to_show)
|
|
|
|
|
{
|
|
|
|
|
overall_stats.merge(this->sbc_idents[lpc].ci_stats,
|
|
|
|
|
this->sbc_do_stacking);
|
|
|
|
|
overall_stats.merge(this->sbc_idents[lpc].ci_stats);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (this->sbc_max_row_value > overall_stats.bs_max_value) {
|
|
|
|
|
overall_stats.bs_max_value = this->sbc_max_row_value;
|
|
|
|
|
}
|
|
|
|
|
if (this->sbc_row_sum > overall_stats.bs_max_value) {
|
|
|
|
|
overall_stats.bs_max_value = this->sbc_row_sum;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (this->sbc_show_state.template is<show_all>()) {
|
|
|
|
|
if (this->sbc_idents.size() == 1) {
|
|
|
|
|
avail_width = width;
|
|
|
|
|
} else if (width < this->sbc_idents.size()) {
|
|
|
|
|
} else if (width < this->sbc_max_row_items) {
|
|
|
|
|
avail_width = 0;
|
|
|
|
|
} else {
|
|
|
|
|
avail_width = width - this->sbc_idents.size();
|
|
|
|
|
avail_width = width;
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
avail_width = width - 1;
|
|
|
|
|
@ -256,12 +261,34 @@ public:
|
|
|
|
|
this->sbc_idents.clear();
|
|
|
|
|
this->sbc_ident_lookup.clear();
|
|
|
|
|
this->sbc_show_state = show_none();
|
|
|
|
|
this->sbc_row_sum = 0;
|
|
|
|
|
this->sbc_row_items = 0;
|
|
|
|
|
this->sbc_max_row_value = 0;
|
|
|
|
|
this->sbc_max_row_items = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void add_value(const T& ident, double amount = 1.0)
|
|
|
|
|
{
|
|
|
|
|
struct chart_ident& ci = this->find_ident(ident);
|
|
|
|
|
ci.ci_stats.update(amount);
|
|
|
|
|
this->sbc_row_sum += amount;
|
|
|
|
|
if (ci.ci_last_seen_row != this->sbc_row_counter) {
|
|
|
|
|
ci.ci_last_seen_row = this->sbc_row_counter;
|
|
|
|
|
this->sbc_row_items += 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void next_row()
|
|
|
|
|
{
|
|
|
|
|
if (this->sbc_row_sum > this->sbc_max_row_value) {
|
|
|
|
|
this->sbc_max_row_value = this->sbc_row_sum;
|
|
|
|
|
}
|
|
|
|
|
if (this->sbc_row_items > this->sbc_max_row_items) {
|
|
|
|
|
this->sbc_max_row_items = this->sbc_row_items;
|
|
|
|
|
}
|
|
|
|
|
this->sbc_row_sum = 0;
|
|
|
|
|
this->sbc_row_items = 0;
|
|
|
|
|
this->sbc_row_counter += 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct bucket_stats_t {
|
|
|
|
|
@ -270,15 +297,10 @@ public:
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void merge(const bucket_stats_t& rhs, bool do_stacking)
|
|
|
|
|
void merge(const bucket_stats_t& rhs)
|
|
|
|
|
{
|
|
|
|
|
this->bs_min_value = std::min(this->bs_min_value, rhs.bs_min_value);
|
|
|
|
|
if (do_stacking) {
|
|
|
|
|
this->bs_max_value += rhs.bs_max_value;
|
|
|
|
|
} else {
|
|
|
|
|
this->bs_max_value
|
|
|
|
|
= std::max(this->bs_max_value, rhs.bs_max_value);
|
|
|
|
|
}
|
|
|
|
|
this->bs_max_value = std::max(this->bs_max_value, rhs.bs_max_value);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
double width() const
|
|
|
|
|
@ -310,6 +332,7 @@ protected:
|
|
|
|
|
T ci_ident;
|
|
|
|
|
text_attrs ci_attrs;
|
|
|
|
|
bucket_stats_t ci_stats;
|
|
|
|
|
ssize_t ci_last_seen_row{-1};
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct chart_ident& find_ident(const T& ident)
|
|
|
|
|
@ -328,6 +351,12 @@ protected:
|
|
|
|
|
std::vector<struct chart_ident> sbc_idents;
|
|
|
|
|
std::unordered_map<T, unsigned int> sbc_ident_lookup;
|
|
|
|
|
show_state sbc_show_state{show_none()};
|
|
|
|
|
|
|
|
|
|
ssize_t sbc_row_counter{0};
|
|
|
|
|
double sbc_row_sum{0};
|
|
|
|
|
size_t sbc_row_items{0};
|
|
|
|
|
double sbc_max_row_value{0};
|
|
|
|
|
size_t sbc_max_row_items{0};
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
class hist_source2
|
|
|
|
|
@ -417,6 +446,7 @@ private:
|
|
|
|
|
time_t hs_last_row;
|
|
|
|
|
std::map<int64_t, struct bucket_block> hs_blocks;
|
|
|
|
|
stacked_bar_chart<hist_type_t> hs_chart;
|
|
|
|
|
bool hs_needs_flush{false};
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
Tim Stack
4 weeks ago