diff options
| author | Sake Blok <sake@euronet.nl> | 2009-03-12 22:44:58 +0000 |
|---|---|---|
| committer | Sake Blok <sake@euronet.nl> | 2009-03-12 22:44:58 +0000 |
| commit | cf23f50e1add65d66e9f015fe7fdb277faca6465 (patch) | |
| tree | 2a6ce42b08212f28d8c5c692c4783aae7019bb3b /tap-iostat.c | |
| parent | cafdbc05f4c63ea18eb35912804fe1900c6503af (diff) | |
As suggested on wireshark-users, when using io,stat in tshark, make an
interval of 0 signify "all packets".
svn path=/trunk/; revision=27715
Diffstat (limited to 'tap-iostat.c')
| -rw-r--r-- | tap-iostat.c | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/tap-iostat.c b/tap-iostat.c index 456b5cdf5b..df4a1a1490 100644 --- a/tap-iostat.c +++ b/tap-iostat.c @@ -284,7 +284,8 @@ iostat_draw(void *arg) printf("\n"); printf("===================================================================\n"); printf("IO Statistics\n"); - printf("Interval: %d.%03d secs\n", iot->interval/1000, iot->interval%1000); + if(iot->interval!=G_MAXINT32) + printf("Interval: %d.%03d secs\n", iot->interval/1000, iot->interval%1000); for(i=0;i<iot->num_items;i++){ printf("Column #%d: %s\n",i,iot->filters[i]?iot->filters[i]:""); } @@ -353,9 +354,14 @@ iostat_draw(void *arg) } if(more_items){ - printf("%03d.%03d-%03d.%03d ", - t/1000,t%1000, - (t+iot->interval)/1000,(t+iot->interval)%1000); + if(iot->interval==G_MAXINT32) { + printf("000.000- "); + } else { + printf("%03d.%03d-%03d.%03d ", + t/1000,t%1000, + (t+iot->interval)/1000, + (t+iot->interval)%1000); + } for(i=0;i<iot->num_items;i++){ switch(iot->items[i].calc_type){ case CALC_TYPE_BYTES: @@ -625,11 +631,18 @@ iostat_init(const char *optarg, void* userdata _U_) exit(1); } + /* if interval is 0, calculate statistics over the whole file + * by setting the interval to G_MAXINT32 + */ + if(interval_float==0) { + interval=G_MAXINT32; + } else { + /* make interval be number of ms */ + interval=(gint32)(interval_float*1000.0+0.9); + } - /* make interval be number of ms */ - interval=(gint32)(interval_float*1000.0+0.9); if(interval<1){ - fprintf(stderr, "tshark: \"-z\" interval must be >=0.001 seconds.\n"); + fprintf(stderr, "tshark: \"-z\" interval must be >=0.001 seconds or 0.\n"); exit(10); } |