stats: Added support for "global" stats type.

diff --git a/src/stats/client-export.c b/src/stats/client-export.c
index 4b8ad213c54f6d33cd47c11be69d59e1c40e4fb9..483e8e9decb2d6a750184747a06903edf022eb4e 100644 (file)
--- a/src/stats/client-export.c
+++ b/src/stats/client-export.c
@@ -20,10 +20,11 @@ enum mail_export_level {
        MAIL_EXPORT_LEVEL_SESSION,
        MAIL_EXPORT_LEVEL_USER,
        MAIL_EXPORT_LEVEL_DOMAIN,
-       MAIL_EXPORT_LEVEL_IP
+       MAIL_EXPORT_LEVEL_IP,
+       MAIL_EXPORT_LEVEL_GLOBAL
 };
 static const char *mail_export_level_names[] = {
-       "command", "session", "user", "domain", "ip"
+       "command", "session", "user", "domain", "ip", "global"
 };
 
 struct mail_export_filter {
@@ -475,6 +476,32 @@ static int client_export_iter_ip(struct client *client)
        return 1;
 }
 
+static int client_export_iter_global(struct client *client)
+{
+       struct client_export_cmd *cmd = client->cmd_export;
+       struct mail_global *g = &mail_global_stats;
+
+       i_assert(cmd->level == MAIL_EXPORT_LEVEL_GLOBAL);
+
+       if (!cmd->header_sent) {
+               o_stream_nsend_str(client->output,
+                       "reset_timestamp\tlast_update"
+                       "\tnum_logins\tnum_cmds\tnum_connected_sessions"MAIL_STATS_HEADER);
+               cmd->header_sent = TRUE;
+       }
+
+       str_truncate(cmd->str, 0);
+       str_printfa(cmd->str, "\t%ld", (long)g->reset_timestamp);
+       client_export_timeval(cmd->str, &g->last_update);
+       str_printfa(cmd->str, "\t%u\t%u\t%u",
+                   g->num_logins, g->num_cmds, g->num_connected_sessions);
+       client_export_mail_stats(cmd->str, &g->stats);
+       str_append_c(cmd->str, '\n');
+       o_stream_nsend(client->output, str_data(cmd->str),
+                      str_len(cmd->str));
+       return 1;
+}
+
 static int client_export_more(struct client *client)
 {
        if (client->cmd_export->export_iter(client) == 0)
@@ -584,6 +611,9 @@ static bool client_export_iter_init(struct client *client)
                mail_ip_ref(client->mail_ip_iter);
                cmd->export_iter = client_export_iter_ip;
                break;
+       case MAIL_EXPORT_LEVEL_GLOBAL:
+               cmd->export_iter = client_export_iter_global;
+               break;
        }
        i_assert(cmd->export_iter != NULL);
        return TRUE;

diff --git a/src/stats/mail-domain.c b/src/stats/mail-domain.c
index dabc9afbf8825d6ee18c3192794267f5db4aa01a..d7a61dd4b28d9cb175776bcddb9b750f562f2d18 100644 (file)
--- a/src/stats/mail-domain.c
+++ b/src/stats/mail-domain.c
@@ -45,6 +45,7 @@ void mail_domain_login(struct mail_domain *domain)
 {
        domain->num_logins++;
        domain->num_connected_sessions++;
+       mail_global_login();
        mail_domain_refresh(domain, NULL);
 }
 
@@ -52,6 +53,7 @@ void mail_domain_disconnected(struct mail_domain *domain)
 {
        i_assert(domain->num_connected_sessions > 0);
        domain->num_connected_sessions--;
+       mail_global_disconnected();
 }
 
 struct mail_domain *mail_domain_lookup(const char *name)
@@ -100,6 +102,7 @@ void mail_domain_refresh(struct mail_domain *domain,
                            sorted_prev, sorted_next);
        DLLIST2_APPEND_FULL(&mail_domains_head, &mail_domains_tail, domain,
                            sorted_prev, sorted_next);
+       mail_global_refresh(diff_stats);
 }
 
 void mail_domains_free_memory(void)

diff --git a/src/stats/mail-stats.c b/src/stats/mail-stats.c
index c75fed991a3e1ee6b9f6d9ac58e7634bc8e713d8..074b7d092b09ad37aee57c7f3e1f275f65521847 100644 (file)
--- a/src/stats/mail-stats.c
+++ b/src/stats/mail-stats.c
@@ -1,6 +1,7 @@
 /* Copyright (c) 2011-2014 Dovecot authors, see the included COPYING file */
 
 #include "lib.h"
+#include "ioloop.h"
 #include "time-util.h"
 #include "mail-stats.h"
 
@@ -39,6 +40,8 @@ static struct mail_stats_parse_map {
        EN("mcache", mail_cache_hits)
 };
 
+struct mail_global mail_global_stats;
+
 static int mail_stats_parse_timeval(const char *value, struct timeval *tv)
 {
        const char *p, *secs_str;
@@ -270,3 +273,27 @@ void mail_stats_add(struct mail_stats *dest, const struct mail_stats *src)
                }
        }
 }
+
+void mail_global_init(void)
+{
+       mail_global_stats.reset_timestamp = ioloop_time;
+}
+
+void mail_global_login(void)
+{
+       mail_global_stats.num_logins++;
+       mail_global_stats.num_connected_sessions++;
+}
+
+void mail_global_disconnected(void)
+{
+       i_assert(mail_global_stats.num_connected_sessions > 0);
+       mail_global_stats.num_connected_sessions--;
+}
+
+void mail_global_refresh(const struct mail_stats *diff_stats)
+{
+       if (diff_stats != NULL)
+               mail_stats_add(&mail_global_stats.stats, diff_stats);
+       mail_global_stats.last_update = ioloop_timeval;
+}

diff --git a/src/stats/mail-stats.h b/src/stats/mail-stats.h
index d7202e044365d2b0af1d5b5476a670c2bfc15145..b08fc3befdd9b2ae1a0a1ff4ab59f5a320d8486d 100644 (file)
--- a/src/stats/mail-stats.h
+++ b/src/stats/mail-stats.h
@@ -107,6 +107,18 @@ struct mail_ip {
        struct mail_session *sessions;
 };
 
+struct mail_global {
+       time_t reset_timestamp;
+
+       struct timeval last_update;
+       struct mail_stats stats;
+       unsigned int num_logins;
+       unsigned int num_cmds;
+       unsigned int num_connected_sessions;
+};
+
+extern struct mail_global mail_global_stats;
+
 int mail_stats_parse(const char *const *args, struct mail_stats *stats_r,
                     const char **error_r);
 /* diff1 is supposed to have smaller values than diff2. Returns TRUE if this
@@ -116,4 +128,9 @@ bool mail_stats_diff(const struct mail_stats *stats1,
                     struct mail_stats *diff_stats_r, const char **error_r);
 void mail_stats_add(struct mail_stats *dest, const struct mail_stats *src);
 
+void mail_global_init(void);
+void mail_global_login(void);
+void mail_global_disconnected(void);
+void mail_global_refresh(const struct mail_stats *diff_stats);
+
 #endif

diff --git a/src/stats/main.c b/src/stats/main.c
index 8549fadeab6b7a50ab240e678d92c4b050bcc10b..c6b9fa78ba44235155d635b32b6a86b7c179ed98 100644 (file)
--- a/src/stats/main.c
+++ b/src/stats/main.c
@@ -12,6 +12,7 @@
 #include "mail-user.h"
 #include "mail-domain.h"
 #include "mail-ip.h"
+#include "mail-stats.h"
 #include "client.h"
 
 static struct mail_server_connection *mail_server_conn = NULL;
@@ -62,6 +63,7 @@ int main(int argc, char *argv[])
        mail_users_init();
        mail_domains_init();
        mail_ips_init();
+       mail_global_init();
 
        master_service_init_finish(master_service);
        master_service_run(master_service, client_connected);