osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

When having more than one matching item in a frame the MAX and MIN calculation 

could return an invalid value.  Also fixed AVG calculation.

svn path=/trunk/; revision=24220
This commit is contained in:
Stig Bjørlykke 2008-01-29 14:27:02 +00:00
parent c024c88a0b
commit 7ec0e26318
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
gtk/io_stat.c
View File

@ -116,6 +116,7 @@ typedef struct _io_stat_calc_type_t {
typedef struct _io_item_t { typedef struct _io_item_t {
guint32 frames; /* always calculated, will hold number of frames*/ guint32 frames; /* always calculated, will hold number of frames*/
guint32 bytes; /* always calculated, will hold number of bytes*/ guint32 bytes; /* always calculated, will hold number of bytes*/
guint32 fields;
gint32 int_max; gint32 int_max;
gint32 int_min; gint32 int_min;
gint32 int_tot; gint32 int_tot;
@ -201,6 +202,7 @@ io_stat_reset(io_stat_t *io)
ioi->frames=0; ioi->frames=0;
ioi->bytes=0; ioi->bytes=0;
ioi->fields=0;
ioi->int_max=0; ioi->int_max=0;
ioi->int_min=0; ioi->int_min=0;
ioi->int_tot=0; ioi->int_tot=0;
@ -293,7 +295,7 @@ gtk_iostat_packet(void *g, packet_info *pinfo, epan_dissect_t *edt, const void *
} }
/* update the appropriate counters, make sure that if /* update the appropriate counters, make sure that if
* frames==0 then this is the first seen value so * fields==0 then this is the first seen value so
* set any min/max values accordingly * set any min/max values accordingly
*/ */
for(i=0;i<gp->len;i++){ for(i=0;i<gp->len;i++){
@ -307,26 +309,28 @@ gtk_iostat_packet(void *g, packet_info *pinfo, epan_dissect_t *edt, const void *
case FT_UINT32: case FT_UINT32:
new_int=fvalue_get_uinteger(&((field_info *)gp->pdata[i])->value); new_int=fvalue_get_uinteger(&((field_info *)gp->pdata[i])->value);
if((new_int>it->int_max)||(it->frames==0)){ if((new_int>it->int_max)||(it->fields==0)){
it->int_max=new_int; it->int_max=new_int;
} }
if((new_int<it->int_min)||(it->frames==0)){ if((new_int<it->int_min)||(it->fields==0)){
it->int_min=new_int; it->int_min=new_int;
} }
it->int_tot+=new_int; it->int_tot+=new_int;
it->fields++;
break; break;
case FT_INT8: case FT_INT8:
case FT_INT16: case FT_INT16:
case FT_INT24: case FT_INT24:
case FT_INT32: case FT_INT32:
new_int=fvalue_get_sinteger(&((field_info *)gp->pdata[i])->value); new_int=fvalue_get_sinteger(&((field_info *)gp->pdata[i])->value);
if((new_int>it->int_max)||(it->frames==0)){ if((new_int>it->int_max)||(it->fields==0)){
it->int_max=new_int; it->int_max=new_int;
} }
if((new_int<it->int_min)||(it->frames==0)){ if((new_int<it->int_min)||(it->fields==0)){
it->int_min=new_int; it->int_min=new_int;
} }
it->int_tot+=new_int; it->int_tot+=new_int;
it->fields++;
break; break;
case FT_RELATIVE_TIME: case FT_RELATIVE_TIME:
new_time=fvalue_get(&((field_info *)gp->pdata[0])->value); new_time=fvalue_get(&((field_info *)gp->pdata[0])->value);
@ -372,18 +376,18 @@ gtk_iostat_packet(void *g, packet_info *pinfo, epan_dissect_t *edt, const void *
if( (new_time->secs>it->time_max.secs) if( (new_time->secs>it->time_max.secs)
||( (new_time->secs==it->time_max.secs) ||( (new_time->secs==it->time_max.secs)
&&(new_time->nsecs>it->time_max.nsecs)) &&(new_time->nsecs>it->time_max.nsecs))
||(it->frames==0)){ ||(it->fields==0)){
it->time_max=*new_time; it->time_max=*new_time;
} }
if( (new_time->secs<it->time_min.secs) if( (new_time->secs<it->time_min.secs)
||( (new_time->secs==it->time_min.secs) ||( (new_time->secs==it->time_min.secs)
&&(new_time->nsecs<it->time_min.nsecs)) &&(new_time->nsecs<it->time_min.nsecs))
||(it->frames==0)){ ||(it->fields==0)){
it->time_min=*new_time; it->time_min=*new_time;
} }
nstime_add(&it->time_tot, new_time); nstime_add(&it->time_tot, new_time);
it->fields++;
} }
} }
} }
} }
@ -447,8 +451,8 @@ get_it_value(io_stat_t *io, int graph_id, int idx)
value=it->int_min; value=it->int_min;
break; break;
case CALC_TYPE_AVG: case CALC_TYPE_AVG:
if(it->frames){ if(it->fields){
value=(it->int_max+it->int_min)/2; value=it->int_tot/it->fields;
} else { } else {
value=0; value=0;
} }
@ -472,14 +476,12 @@ get_it_value(io_stat_t *io, int graph_id, int idx)
value=(guint32) (it->time_tot.secs*1000000+it->time_tot.nsecs/1000); value=(guint32) (it->time_tot.secs*1000000+it->time_tot.nsecs/1000);
break; break;
case CALC_TYPE_AVG: case CALC_TYPE_AVG:
if(it->frames){ if(it->fields){
guint64 t1, t2; /* time in us */ guint64 t; /* time in us */
t1=it->time_max.secs; t=it->time_tot.secs;
t1=t1*1000000+it->time_max.nsecs/1000; t=t*1000000+it->time_tot.nsecs/1000;
t2=it->time_min.secs; value=(guint32) (t/it->fields);
t2=t2*1000000+it->time_min.nsecs/1000;
value=(guint32) ((t1+t2)/2);
} else { } else {
value=0; value=0;
} }