kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-03 12:25:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adjust translation table column widths based upon the translation times.

Browse Source 
Previously, only 5 columns were displayed, and if a translation time exceeded
99,999 useconds, it would be displayed as 0, instead of its actual time.
(closes issue #14532)
 Reported by: pj
 Patches: 
       20090311__bug14532.diff.txt uploaded by tilghman (license 14)
 Tested by: pj


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@181731 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2009-03-12 17:32:13 +00:00
parent 815c56369f
commit 86d6cd8a94
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
main/translate.c
View File

@@ -29,6 +29,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include <sys/time.h> #include <sys/time.h>
#include <sys/resource.h> #include <sys/resource.h>
#include <math.h>
#include "asterisk/lock.h" #include "asterisk/lock.h"
#include "asterisk/channel.h" #include "asterisk/channel.h"
@@ -518,7 +519,7 @@ static char *handle_cli_core_show_translation(struct ast_cli_entry *e, int cmd,
{ {
#define SHOW_TRANS 16 #define SHOW_TRANS 16
int x, y, z; int x, y, z;
int curlen = 0, longest = 0; int curlen = 0, longest = 0, magnitude[SHOW_TRANS] = { 0, };
switch (cmd) { switch (cmd) {
case CLI_INIT: case CLI_INIT:
@@ -565,9 +566,14 @@ static char *handle_cli_core_show_translation(struct ast_cli_entry *e, int cmd,
curlen = strlen(ast_getformatname(1 << (x))); curlen = strlen(ast_getformatname(1 << (x)));
if (curlen > longest) if (curlen > longest)
longest = curlen; longest = curlen;
for (y = 0; y < SHOW_TRANS; y++) {
if (tr_matrix[x][y].cost > pow(10, magnitude[x])) {
magnitude[y] = floor(log10(tr_matrix[x][y].cost));
}
}
} }
for (x = -1; x < SHOW_TRANS; x++) { for (x = -1; x < SHOW_TRANS; x++) {
struct ast_str *out = ast_str_alloca(120); struct ast_str *out = ast_str_alloca(125);
/*Go ahead and move to next iteration if dealing with an unknown codec*/ /*Go ahead and move to next iteration if dealing with an unknown codec*/
if(x >= 0 && !strcmp(ast_getformatname(1 << (x)), "unknown")) if(x >= 0 && !strcmp(ast_getformatname(1 << (x)), "unknown"))
continue; continue;
@@ -578,13 +584,14 @@ static char *handle_cli_core_show_translation(struct ast_cli_entry *e, int cmd,
continue; continue;
if (y >= 0) if (y >= 0)
curlen = strlen(ast_getformatname(1 << (y))); curlen = strlen(ast_getformatname(1 << (y)));
if (y >= 0 && magnitude[y] + 1 > curlen) {
curlen = magnitude[y] + 1;
}
if (curlen < 5) if (curlen < 5)
curlen = 5; curlen = 5;
if (x >= 0 && y >= 0 && tr_matrix[x][y].step) { if (x >= 0 && y >= 0 && tr_matrix[x][y].step) {
/* XXX 99999 is a little hackish /* Actual codec output */
We don't want this number being larger than the shortest (or current) codec ast_str_append(&out, -1, "%*d", curlen + 1, tr_matrix[x][y].cost);
For now, that is "gsm" */
ast_str_append(&out, -1, "%*d", curlen + 1, tr_matrix[x][y].cost > 99999 ? 0 : tr_matrix[x][y].cost);
} else if (x == -1 && y >= 0) { } else if (x == -1 && y >= 0) {
/* Top row - use a dynamic size */ /* Top row - use a dynamic size */
ast_str_append(&out, -1, "%*s", curlen + 1, ast_getformatname(1 << (y)) ); ast_str_append(&out, -1, "%*s", curlen + 1, ast_getformatname(1 << (y)) );
@@ -592,8 +599,10 @@ static char *handle_cli_core_show_translation(struct ast_cli_entry *e, int cmd,
/* Left column - use a static size. */ /* Left column - use a static size. */
ast_str_append(&out, -1, "%*s", longest, ast_getformatname(1 << (x)) ); ast_str_append(&out, -1, "%*s", longest, ast_getformatname(1 << (x)) );
} else if (x >= 0 && y >= 0) { } else if (x >= 0 && y >= 0) {
/* Codec not supported */
ast_str_append(&out, -1, "%*s", curlen + 1, "-"); ast_str_append(&out, -1, "%*s", curlen + 1, "-");
} else { } else {
/* Upper left hand corner */
ast_str_append(&out, -1, "%*s", longest, ""); ast_str_append(&out, -1, "%*s", longest, "");
} }
} }