stats: Added mail_ prefix to mail transaction statistics.

Also added "m" prefix for them in the internal protocol.

diff --git a/src/plugins/stats/stats-plugin.c b/src/plugins/stats/stats-plugin.c
index 01085c60e6794ff721c5dc86e9e2ede66986c8d6..d74a9a7663f7a09daa97d38f4e1866832a1effd4 100644 (file)
--- a/src/plugins/stats/stats-plugin.c
+++ b/src/plugins/stats/stats-plugin.c
@@ -238,13 +238,13 @@ void mail_stats_export(string_t *str, const struct mail_stats *stats)
                    (unsigned long long)stats->disk_input);
        str_printfa(str, "\tdiskout=%llu",
                    (unsigned long long)stats->disk_output);
-       str_printfa(str, "\tlpath=%lu",
+       str_printfa(str, "\tmlpath=%lu",
                    tstats->open_lookup_count + tstats->stat_lookup_count);
-       str_printfa(str, "\tlattr=%lu",
+       str_printfa(str, "\tmlattr=%lu",
                    tstats->fstat_lookup_count + tstats->stat_lookup_count);
-       str_printfa(str, "\trcount=%lu", tstats->files_read_count);
-       str_printfa(str, "\trbytes=%llu", tstats->files_read_bytes);
-       str_printfa(str, "\tcache=%lu", tstats->cache_hit_count);
+       str_printfa(str, "\tmrcount=%lu", tstats->files_read_count);
+       str_printfa(str, "\tmrbytes=%llu", tstats->files_read_bytes);
+       str_printfa(str, "\tmcache=%lu", tstats->cache_hit_count);
 }
 
 static void stats_add_session(struct mail_user *user)

diff --git a/src/stats/client-export.c b/src/stats/client-export.c
index 924b6f3dc944df881afe62c40b1b6d9f801ed200..2f324ff3d933f2492719cc0dac5709b4a454248d 100644 (file)
--- a/src/stats/client-export.c
+++ b/src/stats/client-export.c
@@ -100,7 +100,8 @@ client_export_mail_stats(string_t *str, const struct mail_stats *stats)
 #define MAIL_STATS_HEADER "\tuser_cpu\tsys_cpu" \
        "\tmin_faults\tmaj_faults\tvol_cs\tinvol_cs" \
        "\tdisk_input\tdisk_output" \
-       "\tlookup_path\tlookup_attr\tread_count\tread_bytes\tcache_hits\n"
+       "\tmail_lookup_path\tmail_lookup_attr" \
+       "\tmail_read_count\tmail_read_bytes\tmail_cache_hits\n"
 
        str_printfa(str, "\t%ld.%06u", (long)stats->user_cpu.tv_sec,
                    (unsigned int)stats->user_cpu.tv_usec);
@@ -112,10 +113,10 @@ client_export_mail_stats(string_t *str, const struct mail_stats *stats)
                    (unsigned long long)stats->disk_input,
                    (unsigned long long)stats->disk_output);
        str_printfa(str, "\t%u\t%u\t%u\t%llu\t%u",
-                   stats->lookup_path, stats->lookup_attr,
-                   stats->read_count,
-                   (unsigned long long)stats->read_bytes,
-                   stats->cache_hits);
+                   stats->mail_lookup_path, stats->mail_lookup_attr,
+                   stats->mail_read_count,
+                   (unsigned long long)stats->mail_read_bytes,
+                   stats->mail_cache_hits);
 }
 
 static bool

diff --git a/src/stats/mail-stats.c b/src/stats/mail-stats.c
index 04d5f8a8375f690465c4d96977701935664222b7..605f0ad0bf2b37158cec42ea4b323e4118049c63 100644 (file)
--- a/src/stats/mail-stats.c
+++ b/src/stats/mail-stats.c
@@ -25,11 +25,12 @@ struct mail_stats_parse_map {
        EN("involcs", invol_cs),
        EN("diskin", disk_input),
        EN("diskout", disk_output),
-       EN("lpath", lookup_path),
-       EN("lattr", lookup_attr),
-       EN("rcount", read_count),
-       EN("rbytes", read_bytes),
-       EN("cache", cache_hits)
+
+       EN("mlpath", mail_lookup_path),
+       EN("mlattr", mail_lookup_attr),
+       EN("mrcount", mail_read_count),
+       EN("mrbytes", mail_read_bytes),
+       EN("mcache", mail_cache_hits)
 };
 
 static int mail_stats_parse_timeval(const char *value, struct timeval *tv)

diff --git a/src/stats/mail-stats.h b/src/stats/mail-stats.h
index d00d8884b5786b950a152cbc7336acc4e2688bab..c99d8813aa6219b9b7e227f36bb19c395ced91cb 100644 (file)
--- a/src/stats/mail-stats.h
+++ b/src/stats/mail-stats.h
@@ -10,8 +10,9 @@ struct mail_stats {
        uint32_t vol_cs, invol_cs;
        uint64_t disk_input, disk_output;
 
-       uint32_t lookup_path, lookup_attr, read_count, cache_hits;
-       uint64_t read_bytes;
+       uint32_t mail_lookup_path, mail_lookup_attr, mail_read_count;
+       uint32_t mail_cache_hits;
+       uint64_t mail_read_bytes;
 };
 
 struct mail_command {