more lint for stats

git-svn-id: file:///svn/unbound/trunk@4123 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/daemon/stats.c b/daemon/stats.c
index 2781867e06da2c90bb57c31ddb817bff004e722d..55648649a29b54fe7f4cf4a95715dcbbc2cd30cc 100644 (file)
--- a/daemon/stats.c
+++ b/daemon/stats.c
@@ -86,7 +86,7 @@ void server_stats_querymiss(struct ub_server_stats* stats, struct worker* worker
        stats->num_queries_missed_cache++;
        stats->sum_query_list_size += worker->env.mesh->all.count;
        if((long long)worker->env.mesh->all.count > stats->max_query_list_size)
-               stats->max_query_list_size = worker->env.mesh->all.count;
+               stats->max_query_list_size = (long long)worker->env.mesh->all.count;
 }
 
 void server_stats_prefetch(struct ub_server_stats* stats, struct worker* worker)
@@ -95,7 +95,7 @@ void server_stats_prefetch(struct ub_server_stats* stats, struct worker* worker)
        /* changes the query list size so account that, like a querymiss */
        stats->sum_query_list_size += worker->env.mesh->all.count;
        if((long long)worker->env.mesh->all.count > stats->max_query_list_size)
-               stats->max_query_list_size = worker->env.mesh->all.count;
+               stats->max_query_list_size = (long long)worker->env.mesh->all.count;
 }
 
 void server_stats_log(struct ub_server_stats* stats, struct worker* worker,
@@ -115,7 +115,7 @@ void server_stats_log(struct ub_server_stats* stats, struct worker* worker,
                (unsigned)stats->max_query_list_size,
                (stats->num_queries_missed_cache+stats->num_queries_prefetch)?
                        (double)stats->sum_query_list_size/
-                       (stats->num_queries_missed_cache+
+                       (double)(stats->num_queries_missed_cache+
                        stats->num_queries_prefetch) : 0.0,
                (unsigned)worker->env.mesh->stats_dropped,
                (unsigned)worker->env.mesh->stats_jostled);
@@ -146,44 +146,44 @@ server_stats_compile(struct worker* worker, struct ub_stats_info* s, int reset)
        struct listen_list* lp;
 
        s->svr = worker->stats;
-       s->mesh_num_states = worker->env.mesh->all.count;
-       s->mesh_num_reply_states = worker->env.mesh->num_reply_states;
-       s->mesh_jostled = worker->env.mesh->stats_jostled;
-       s->mesh_dropped = worker->env.mesh->stats_dropped;
-       s->mesh_replies_sent = worker->env.mesh->replies_sent;
-       s->mesh_replies_sum_wait_sec = worker->env.mesh->replies_sum_wait.tv_sec;
-       s->mesh_replies_sum_wait_usec = worker->env.mesh->replies_sum_wait.tv_usec;
+       s->mesh_num_states = (long long)worker->env.mesh->all.count;
+       s->mesh_num_reply_states = (long long)worker->env.mesh->num_reply_states;
+       s->mesh_jostled = (long long)worker->env.mesh->stats_jostled;
+       s->mesh_dropped = (long long)worker->env.mesh->stats_dropped;
+       s->mesh_replies_sent = (long long)worker->env.mesh->replies_sent;
+       s->mesh_replies_sum_wait_sec = (long long)worker->env.mesh->replies_sum_wait.tv_sec;
+       s->mesh_replies_sum_wait_usec = (long long)worker->env.mesh->replies_sum_wait.tv_usec;
        s->mesh_time_median = timehist_quartile(worker->env.mesh->histogram,
                0.50);
 
        /* add in the values from the mesh */
-       s->svr.ans_secure += worker->env.mesh->ans_secure;
-       s->svr.ans_bogus += worker->env.mesh->ans_bogus;
-       s->svr.ans_rcode_nodata += worker->env.mesh->ans_nodata;
+       s->svr.ans_secure += (long long)worker->env.mesh->ans_secure;
+       s->svr.ans_bogus += (long long)worker->env.mesh->ans_bogus;
+       s->svr.ans_rcode_nodata += (long long)worker->env.mesh->ans_nodata;
        for(i=0; i<16; i++)
-               s->svr.ans_rcode[i] += worker->env.mesh->ans_rcode[i];
+               s->svr.ans_rcode[i] += (long long)worker->env.mesh->ans_rcode[i];
        timehist_export(worker->env.mesh->histogram, s->svr.hist, 
                NUM_BUCKETS_HIST);
        /* values from outside network */
-       s->svr.unwanted_replies = worker->back->unwanted_replies;
-       s->svr.qtcp_outgoing = worker->back->num_tcp_outgoing;
+       s->svr.unwanted_replies = (long long)worker->back->unwanted_replies;
+       s->svr.qtcp_outgoing = (long long)worker->back->num_tcp_outgoing;
 
        /* get and reset validator rrset bogus number */
        s->svr.rrset_bogus = get_rrset_bogus(worker);
 
        /* get cache sizes */
-       s->svr.msg_cache_count = count_slabhash_entries(worker->env.msg_cache);
-       s->svr.rrset_cache_count = count_slabhash_entries(&worker->env.rrset_cache->table);
-       s->svr.infra_cache_count = count_slabhash_entries(worker->env.infra_cache->hosts);
+       s->svr.msg_cache_count = (long long)count_slabhash_entries(worker->env.msg_cache);
+       s->svr.rrset_cache_count = (long long)count_slabhash_entries(&worker->env.rrset_cache->table);
+       s->svr.infra_cache_count = (long long)count_slabhash_entries(worker->env.infra_cache->hosts);
        if(worker->env.key_cache)
-               s->svr.key_cache_count = count_slabhash_entries(worker->env.key_cache->slab);
+               s->svr.key_cache_count = (long long)count_slabhash_entries(worker->env.key_cache->slab);
        else    s->svr.key_cache_count = 0;
 
        /* get tcp accept usage */
        s->svr.tcp_accept_usage = 0;
        for(lp = worker->front->cps; lp; lp = lp->next) {
                if(lp->com->type == comm_tcp_accept)
-                       s->svr.tcp_accept_usage += lp->com->cur_tcp_count;
+                       s->svr.tcp_accept_usage += (long long)lp->com->cur_tcp_count;
        }
 
        if(reset && !worker->env.cfg->stat_cumulative) {