#include "squid.h"
#include "cache_snmp.h"
-#include "Store.h"
+#include "globals.h"
#include "mem_node.h"
+#include "protos.h"
+#include "StatCounters.h"
+#include "StatHist.h"
#include "SquidMath.h"
#include "SquidTime.h"
+#include "Store.h"
/************************************************************************
case SYSSTOR:
Answer = snmp_var_new_integer(Var->name, Var->name_length,
- store_swap_size,
+ Store::Root().currentSize() >> 10,
ASN_INTEGER);
break;
case CONF_ST_SWMAXSZ:
Answer = snmp_var_new_integer(Var->name, Var->name_length,
- (snint) (Store::Root().maxSize() >> 10),
+ (snint) (Store::Root().maxSize() >> 20),
ASN_INTEGER);
break;
return Answer;
}
-
/*
* cacheMesh group
* - cachePeerTable
{
variable_list *Answer = NULL;
- IpAddress laddr;
+ Ip::Address laddr;
char *cp = NULL;
peer *p = NULL;
int cnt = 0;
*ErrP = SNMP_ERR_NOERROR;
u_int index = Var->name[LEN_SQ_MESH + 3] ;
- for (p = Config.peers; p != NULL; p = p->next, cnt++) {
+ for (p = Config.peers; p != NULL; p = p->next, ++cnt) {
if (p->index == index) {
laddr = p->in_addr ;
break;
return NULL;
}
-
switch (Var->name[LEN_SQ_MESH + 2]) {
case MESH_PTBL_INDEX: { // FIXME INET6: Should be visible?
Answer = snmp_var_new_integer(Var->name, Var->name_length,
}
break;
-
case MESH_PTBL_NAME:
cp = p->host;
Answer = snmp_var_new(Var->name, Var->name_length);
case PERF_PROTOSTAT_AGGR_CURSWAP:
Answer = snmp_var_new_integer(Var->name, Var->name_length,
- (snint) store_swap_size,
+ (snint) Store::Root().currentSize() >> 10,
SMI_GAUGE32);
break;
break;
case PERF_MEDIAN_HTTP_ALL:
- x = statHistDeltaMedian(&l->client_http.all_svc_time,
- &f->client_http.all_svc_time);
+ x = statHistDeltaMedian(l->client_http.allSvcTime,
+ f->client_http.allSvcTime);
break;
case PERF_MEDIAN_HTTP_MISS:
- x = statHistDeltaMedian(&l->client_http.miss_svc_time,
- &f->client_http.miss_svc_time);
+ x = statHistDeltaMedian(l->client_http.missSvcTime,
+ f->client_http.missSvcTime);
break;
case PERF_MEDIAN_HTTP_NM:
- x = statHistDeltaMedian(&l->client_http.nm_svc_time,
- &f->client_http.nm_svc_time);
+ x = statHistDeltaMedian(l->client_http.nearMissSvcTime,
+ f->client_http.nearMissSvcTime);
break;
case PERF_MEDIAN_HTTP_HIT:
- x = statHistDeltaMedian(&l->client_http.hit_svc_time,
- &f->client_http.hit_svc_time);
+ x = statHistDeltaMedian(l->client_http.hitSvcTime,
+ f->client_http.hitSvcTime);
break;
case PERF_MEDIAN_ICP_QUERY:
- x = statHistDeltaMedian(&l->icp.query_svc_time, &f->icp.query_svc_time);
+ x = statHistDeltaMedian(l->icp.querySvcTime, f->icp.querySvcTime);
break;
case PERF_MEDIAN_ICP_REPLY:
- x = statHistDeltaMedian(&l->icp.reply_svc_time, &f->icp.reply_svc_time);
+ x = statHistDeltaMedian(l->icp.replySvcTime, f->icp.replySvcTime);
break;
case PERF_MEDIAN_DNS:
- x = statHistDeltaMedian(&l->dns.svc_time, &f->dns.svc_time);
+ x = statHistDeltaMedian(l->dns.svcTime, f->dns.svcTime);
break;
case PERF_MEDIAN_RHR:
break;
case PERF_MEDIAN_HTTP_NH:
- x = statHistDeltaMedian(&l->client_http.nh_svc_time,
- &f->client_http.nh_svc_time);
+ x = statHistDeltaMedian(l->client_http.nearHitSvcTime,
+ f->client_http.nearHitSvcTime);
break;
default: