diff options
| author | Dmitry Kozlov <xeb@mail.ru> | 2011-01-27 08:27:39 +0300 |
|---|---|---|
| committer | Dmitry Kozlov <xeb@mail.ru> | 2011-01-27 08:27:39 +0300 |
| commit | 673bea74d2beb8d4260355f928499230c7ff9b17 (patch) | |
| tree | 4b5474b9623f0b6f5a8dbdde48f1dc906fdd322e /accel-pppd/radius/acct.c | |
| parent | 7f8d3e240fe9544b22846ea05b09515922d1de57 (diff) | |
| download | accel-ppp-673bea74d2beb8d4260355f928499230c7ff9b17.tar.gz accel-ppp-673bea74d2beb8d4260355f928499230c7ff9b17.zip | |
radius: extended statistics calculation
Diffstat (limited to 'accel-pppd/radius/acct.c')
| -rw-r--r-- | accel-pppd/radius/acct.c | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/accel-pppd/radius/acct.c b/accel-pppd/radius/acct.c index 40f6f810..62387934 100644 --- a/accel-pppd/radius/acct.c +++ b/accel-pppd/radius/acct.c @@ -73,6 +73,7 @@ static int rad_acct_read(struct triton_md_handler_t *h) struct rad_req_t *req = container_of(h, typeof(*req), hnd); struct rad_packet_t *pack; int r; + unsigned int dt; if (req->reply) { rad_packet_free(req->reply); @@ -99,6 +100,11 @@ static int rad_acct_read(struct triton_md_handler_t *h) if (!req->reply) return 0; + dt = (req->reply->tv.tv_sec - req->pack->tv.tv_sec) * 1000 + + (req->reply->tv.tv_usec - req->pack->tv.tv_usec) / 1000; + stat_accm_add(stat_interim_query_1m, dt); + stat_accm_add(stat_interim_query_5m, dt); + if (req->reply->code != CODE_ACCOUNTING_RESPONSE || req->reply->id != req->pack->id) { rad_packet_free(req->reply); req->reply = NULL; @@ -116,6 +122,8 @@ static void rad_acct_timeout(struct triton_timer_t *t) time_t ts, dt; __sync_add_and_fetch(&stat_interim_lost, 1); + stat_accm_add(stat_interim_lost_1m, 1); + stat_accm_add(stat_interim_lost_5m, 1); time(&ts); @@ -177,6 +185,7 @@ int rad_acct_start(struct radius_pd_t *rpd) { int i; time_t ts; + unsigned int dt; rpd->acct_req = rad_req_alloc(rpd, CODE_ACCOUNTING_REQUEST, rpd->ppp->username); if (!rpd->acct_req) { @@ -213,13 +222,23 @@ int rad_acct_start(struct radius_pd_t *rpd) if (!rpd->acct_req->reply) { rpd->acct_req->pack->id++; __sync_add_and_fetch(&stat_acct_lost, 1); + stat_accm_add(stat_acct_lost_1m, 1); + stat_accm_add(stat_acct_lost_5m, 1); continue; } + + dt = (rpd->acct_req->reply->tv.tv_sec - rpd->acct_req->pack->tv.tv_sec) * 1000 + + (rpd->acct_req->reply->tv.tv_usec - rpd->acct_req->pack->tv.tv_usec) / 1000; + stat_accm_add(stat_acct_query_1m, dt); + stat_accm_add(stat_acct_query_5m, dt); + if (rpd->acct_req->reply->id != rpd->acct_req->pack->id || rpd->acct_req->reply->code != CODE_ACCOUNTING_RESPONSE) { rad_packet_free(rpd->acct_req->reply); rpd->acct_req->reply = NULL; rpd->acct_req->pack->id++; __sync_add_and_fetch(&stat_acct_lost, 1); + stat_accm_add(stat_acct_lost_1m, 1); + stat_accm_add(stat_acct_lost_5m, 1); } else break; } @@ -257,6 +276,7 @@ void rad_acct_stop(struct radius_pd_t *rpd) { int i; time_t ts; + unsigned int dt; if (rpd->acct_interim_timer.tpd) triton_timer_del(&rpd->acct_interim_timer); @@ -317,12 +337,22 @@ void rad_acct_stop(struct radius_pd_t *rpd) rad_req_wait(rpd->acct_req, conf_timeout); if (!rpd->acct_req->reply) { __sync_add_and_fetch(&stat_acct_lost, 1); + stat_accm_add(stat_acct_lost_1m, 1); + stat_accm_add(stat_acct_lost_5m, 1); continue; } + + dt = (rpd->acct_req->reply->tv.tv_sec - rpd->acct_req->pack->tv.tv_sec) * 1000 + + (rpd->acct_req->reply->tv.tv_usec - rpd->acct_req->pack->tv.tv_usec) / 1000; + stat_accm_add(stat_acct_query_1m, dt); + stat_accm_add(stat_acct_query_5m, dt); + if (rpd->acct_req->reply->id != rpd->acct_req->pack->id || rpd->acct_req->reply->code != CODE_ACCOUNTING_RESPONSE) { rad_packet_free(rpd->acct_req->reply); rpd->acct_req->reply = NULL; __sync_add_and_fetch(&stat_acct_lost, 1); + stat_accm_add(stat_acct_lost_1m, 1); + stat_accm_add(stat_acct_lost_5m, 1); } else break; } |