osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Optimize display_signed_time() - remove g_snprintf 

When tshark is printing columns (default) display_signed_time() is called for every frame.
Current implemention is using g_snprintf() which makes this function costly when there is lot frames.

Change-Id: I109c8699d38bfbd05475d457ae4173e937c6812d
Reviewed-on: https://code.wireshark.org/review/1447
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Jakub Zawadzki 2014-04-30 21:39:54 +02:00 committed by Anders Broman
parent 5dfd543aa3
commit b3bb951562
2 changed files with 61 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
epan/to_str-int.h
View File

@ -35,6 +35,7 @@ char *bytes_to_hexstr_punct(char *out, const guint8 *ad, guint32 len, char punct
char *oct_to_str_back(char *ptr, guint32 value);
char *hex_to_str_back(char *ptr, int pad, guint32 value);
char *uint_to_str_back(char *ptr, guint32 value);
char *uint_to_str_back_len(char *ptr, unsigned int value, int len);
char *int_to_str_back(char *ptr, gint32 value);
#endif /* __TO_STR_INT_H__ */

70
epan/to_str.c
View File

@ -725,6 +725,15 @@ void
display_signed_time(gchar *buf, int buflen, const gint32 sec, gint32 frac,
const to_str_time_res_t units)
{
/* this buffer is not NUL terminated */
gint8 num_buf[16]; /* max: '-2147483648', '.1000000000' */
gint8 *num_end = &num_buf[16];
gint8 *num_ptr;
int num_len;
if (buflen < 1)
return;
/* If the fractional part of the time stamp is negative,
print its absolute value and, if the seconds part isn't
(the seconds part should be zero in that case), stick
@ -732,40 +741,61 @@ display_signed_time(gchar *buf, int buflen, const gint32 sec, gint32 frac,
if (frac < 0) {
frac = -frac;
if (sec >= 0) {
if (buflen < 1) {
return;
}
buf[0] = '-';
buf++;
buflen--;
}
}
switch (units) {
num_ptr = int_to_str_back(num_end, sec);
num_len = MIN((int) (num_end - num_ptr), buflen);
memcpy(buf, num_ptr, num_len);
buf += num_len;
buflen -= num_len;
switch (units) {
case TO_STR_TIME_RES_T_SECS:
g_snprintf(buf, buflen, "%d", sec);
default:
/* no fraction */
num_ptr = NULL;
break;
case TO_STR_TIME_RES_T_DSECS:
g_snprintf(buf, buflen, "%d.%01d", sec, frac);
num_ptr = uint_to_str_back_len(num_end, frac, 1);
break;
case TO_STR_TIME_RES_T_CSECS:
g_snprintf(buf, buflen, "%d.%02d", sec, frac);
num_ptr = uint_to_str_back_len(num_end, frac, 2);
break;
case TO_STR_TIME_RES_T_MSECS:
g_snprintf(buf, buflen, "%d.%03d", sec, frac);
num_ptr = uint_to_str_back_len(num_end, frac, 3);
break;
case TO_STR_TIME_RES_T_USECS:
g_snprintf(buf, buflen, "%d.%06d", sec, frac);
num_ptr = uint_to_str_back_len(num_end, frac, 6);
break;
case TO_STR_TIME_RES_T_NSECS:
g_snprintf(buf, buflen, "%d.%09d", sec, frac);
num_ptr = uint_to_str_back_len(num_end, frac, 9);
break;
}
if (num_ptr != NULL)
{
*(--num_ptr) = '.';
num_len = MIN((int) (num_end - num_ptr), buflen);
memcpy(buf, num_ptr, num_len);
buf += num_len;
buflen -= num_len;
}
/* need to NUL terminate, we know that buffer had at least 1 byte */
if (buflen == 0)
buf--;
*buf = '\0';
}
@ -1158,6 +1188,26 @@ uint_to_str_back(char *ptr, guint32 value)
return ptr;
}
char *
uint_to_str_back_len(char *ptr, unsigned int value, int len)
{
char *new_ptr;
new_ptr = uint_to_str_back(ptr, value);
/* substract from len number of generated characters */
len -= (ptr - new_ptr);
/* pad remaining with '0' */
while (len > 0)
{
*(--new_ptr) = '0';
len--;
}
return new_ptr;
}
char *
int_to_str_back(char *ptr, gint32 value)
{