Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

Seems strange (and the code backs up) that if the max and min of a statistic is expressed as a double, the last value would not also need to be a double.

Browse Source 
(closes issue #15807)
 Reported by: klaus3000


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@268773 65c4cc65-6c06-0410-ace0-fbb531ad65f3
certified/1.8.6
Tilghman Lesher 16 years ago
parent 0c5bce53ad
commit 17bd11b8aa
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File

2
channels/chan_sip.c
Unescape View File

@ -15977,7 +15977,7 @@ static char *sip_unregister(struct ast_cli_entry *e, int cmd, struct ast_cli_arg
static int show_chanstats_cb(void *__cur, void *__arg, int flags) static int show_chanstats_cb(void *__cur, void *__arg, int flags)
{ {
#define FORMAT2 "%-15.15s %-11.11s %-8.8s %-10.10s %-10.10s ( %%) %-6.6s %-10.10s %-10.10s ( %%) %-6.6s\n" #define FORMAT2 "%-15.15s %-11.11s %-8.8s %-10.10s %-10.10s ( %%) %-6.6s %-10.10s %-10.10s ( %%) %-6.6s\n"
#define FORMAT "%-15.15s %-11.11s %-8.8s %-10.10u%-1.1s %-10.10u (%5.2f%%) %-6.6u %-10.10u%-1.1s %-10.10u (%5.2f%%) %-6.6u\n" #define FORMAT "%-15.15s %-11.11s %-8.8s %-10.10u%-1.1s %-10.10u (%5.2f%%) %-6.4lf %-10.10u%-1.1s %-10.10u (%5.2f%%) %-6.4lf\n"
struct sip_pvt *cur = __cur; struct sip_pvt *cur = __cur;
struct ast_rtp_instance_stats stats; struct ast_rtp_instance_stats stats;
char durbuf[10]; char durbuf[10];

6
channels/sip/dialplan_functions.c
Unescape View File

@ -167,8 +167,8 @@ int sip_acf_channel_read(struct ast_channel *chan, const char *funcname, char *p
} lookup[] = { } lookup[] = {
{ "txcount", INT, { .i4 = &stats.txcount, }, }, { "txcount", INT, { .i4 = &stats.txcount, }, },
{ "rxcount", INT, { .i4 = &stats.rxcount, }, }, { "rxcount", INT, { .i4 = &stats.rxcount, }, },
{ "txjitter", INT, { .i4 = &stats.txjitter, }, }, { "txjitter", DBL, { .d8 = &stats.txjitter, }, },
{ "rxjitter", INT, { .i4 = &stats.rxjitter, }, }, { "rxjitter", DBL, { .d8 = &stats.rxjitter, }, },
{ "remote_maxjitter", DBL, { .d8 = &stats.remote_maxjitter, }, }, { "remote_maxjitter", DBL, { .d8 = &stats.remote_maxjitter, }, },
{ "remote_minjitter", DBL, { .d8 = &stats.remote_minjitter, }, }, { "remote_minjitter", DBL, { .d8 = &stats.remote_minjitter, }, },
{ "remote_normdevjitter", DBL, { .d8 = &stats.remote_normdevjitter, }, }, { "remote_normdevjitter", DBL, { .d8 = &stats.remote_normdevjitter, }, },
@ -187,7 +187,7 @@ int sip_acf_channel_read(struct ast_channel *chan, const char *funcname, char *p
{ "local_minrxploss", DBL, { .d8 = &stats.local_minrxploss, }, }, { "local_minrxploss", DBL, { .d8 = &stats.local_minrxploss, }, },
{ "local_normdevrxploss", DBL, { .d8 = &stats.local_normdevrxploss, }, }, { "local_normdevrxploss", DBL, { .d8 = &stats.local_normdevrxploss, }, },
{ "local_stdevrxploss", DBL, { .d8 = &stats.local_stdevrxploss, }, }, { "local_stdevrxploss", DBL, { .d8 = &stats.local_stdevrxploss, }, },
{ "rtt", INT, { .i4 = &stats.rtt, }, }, { "rtt", DBL, { .d8 = &stats.rtt, }, },
{ "maxrtt", DBL, { .d8 = &stats.maxrtt, }, }, { "maxrtt", DBL, { .d8 = &stats.maxrtt, }, },
{ "minrtt", DBL, { .d8 = &stats.minrtt, }, }, { "minrtt", DBL, { .d8 = &stats.minrtt, }, },
{ "normdevrtt", DBL, { .d8 = &stats.normdevrtt, }, }, { "normdevrtt", DBL, { .d8 = &stats.normdevrtt, }, },

6
include/asterisk/rtp_engine.h
Unescape View File

@ -235,9 +235,9 @@ struct ast_rtp_instance_stats {
/*! Number of packets received */ /*! Number of packets received */
unsigned int rxcount; unsigned int rxcount;
/*! Jitter on transmitted packets */ /*! Jitter on transmitted packets */
unsigned int txjitter; double txjitter;
/*! Jitter on received packets */ /*! Jitter on received packets */
unsigned int rxjitter; double rxjitter;
/*! Maximum jitter on remote side */ /*! Maximum jitter on remote side */
double remote_maxjitter; double remote_maxjitter;
/*! Minimum jitter on remote side */ /*! Minimum jitter on remote side */
@ -275,7 +275,7 @@ struct ast_rtp_instance_stats {
/*! Standard deviation packets lost on local side */ /*! Standard deviation packets lost on local side */
double local_stdevrxploss; double local_stdevrxploss;
/*! Total round trip time */ /*! Total round trip time */
unsigned int rtt; double rtt;
/*! Maximum round trip time */ /*! Maximum round trip time */
double maxrtt; double maxrtt;
/*! Minimum round trip time */ /*! Minimum round trip time */

2
main/rtp_engine.c
Unescape View File

@ -1518,7 +1518,7 @@ char *ast_rtp_instance_get_quality(struct ast_rtp_instance *instance, enum ast_r
/* Now actually fill the buffer with the good information */ /* Now actually fill the buffer with the good information */
if (field == AST_RTP_INSTANCE_STAT_FIELD_QUALITY) { if (field == AST_RTP_INSTANCE_STAT_FIELD_QUALITY) {
snprintf(buf, size, "ssrc=%i;themssrc=%u;lp=%u;rxjitter=%u;rxcount=%u;txjitter=%u;txcount=%u;rlp=%u;rtt=%u", snprintf(buf, size, "ssrc=%i;themssrc=%u;lp=%u;rxjitter=%f;rxcount=%u;txjitter=%f;txcount=%u;rlp=%u;rtt=%f",
stats.local_ssrc, stats.remote_ssrc, stats.rxploss, stats.txjitter, stats.rxcount, stats.rxjitter, stats.txcount, stats.txploss, stats.rtt); stats.local_ssrc, stats.remote_ssrc, stats.rxploss, stats.txjitter, stats.rxcount, stats.rxjitter, stats.txcount, stats.txploss, stats.rtt);
} else if (field == AST_RTP_INSTANCE_STAT_FIELD_QUALITY_JITTER) { } else if (field == AST_RTP_INSTANCE_STAT_FIELD_QUALITY_JITTER) {
snprintf(buf, size, "minrxjitter=%f;maxrxjitter=%f;avgrxjitter=%f;stdevrxjitter=%f;reported_minjitter=%f;reported_maxjitter=%f;reported_avgjitter=%f;reported_stdevjitter=%f;", snprintf(buf, size, "minrxjitter=%f;maxrxjitter=%f;avgrxjitter=%f;stdevrxjitter=%f;reported_minjitter=%f;reported_maxjitter=%f;reported_avgjitter=%f;reported_stdevjitter=%f;",

Write Preview
Loading…
Cancel
Save