* Protocol Hierarchy Statistics:
- store times of first and last packets in ph_stats_t - add bandwidth columns in GUI - miscellaneous code cleaning svn path=/trunk/; revision=10398
This commit is contained in:
Laurent Deniel
parent
26875d5b71
commit
50a00153ea
|
|
@ -1,6 +1,6 @@
|
|||
/* proto_hier_stats_dlg.c
|
||||
*
|
||||
* $Id: proto_hier_stats_dlg.c,v 1.15 2004/02/06 19:19:10 ulfl Exp $
|
||||
* $Id: proto_hier_stats_dlg.c,v 1.16 2004/03/17 21:48:15 deniel Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -35,15 +35,17 @@
|
|||
#include "compat_macros.h"
|
||||
|
||||
#if GTK_MAJOR_VERSION < 2
|
||||
#define NUM_STAT_COLUMNS 6
|
||||
#define NUM_STAT_COLUMNS 8
|
||||
#else
|
||||
enum {
|
||||
PROTOCOL_COLUMN,
|
||||
PRCT_PKTS_COLUMN,
|
||||
PKTS_COLUMN,
|
||||
BYTES_COLUMN,
|
||||
BANDWIDTH_COLUMN,
|
||||
END_PKTS_COLUMN,
|
||||
END_BYTES_COLUMN,
|
||||
END_BANDWIDTH_COLUMN,
|
||||
NUM_STAT_COLUMNS /* must be the last */
|
||||
};
|
||||
#endif
|
||||
|
|
@ -61,30 +63,28 @@ typedef struct {
|
|||
|
||||
|
||||
#define PCT(x,y) (100.0 * (float)(x) / (float)(y))
|
||||
#define BANDWITDH(bytes,secs) ((bytes) * 8.0 / ((secs) * 1000.0 * 1000.0))
|
||||
|
||||
static void
|
||||
fill_in_tree_node(GNode *node, gpointer data)
|
||||
{
|
||||
ph_stats_node_t *stats = node->data;
|
||||
draw_info_t *di = data;
|
||||
|
||||
ph_stats_t *ps = di->ps;
|
||||
gboolean is_leaf;
|
||||
draw_info_t child_di;
|
||||
double seconds;
|
||||
gchar *text[NUM_STAT_COLUMNS];
|
||||
#if GTK_MAJOR_VERSION < 2
|
||||
GtkCTree *tree = di->tree;
|
||||
GtkCTreeNode *parent = di->parent;
|
||||
gchar *text[NUM_STAT_COLUMNS];
|
||||
GtkCTreeNode *new_node;
|
||||
#else
|
||||
GtkTreeView *tree_view = di->tree_view;
|
||||
GtkTreeIter *iter = di->iter;
|
||||
GtkTreeStore *store;
|
||||
gchar *text[2];
|
||||
GtkTreeIter new_iter;
|
||||
#endif
|
||||
ph_stats_t *ps = di->ps;
|
||||
|
||||
gboolean is_leaf;
|
||||
|
||||
draw_info_t child_di;
|
||||
|
||||
if (g_node_n_children(node) > 0) {
|
||||
is_leaf = FALSE;
|
||||
|
|
@ -93,17 +93,31 @@ fill_in_tree_node(GNode *node, gpointer data)
|
|||
is_leaf = TRUE;
|
||||
}
|
||||
|
||||
seconds = ps->last_time - ps->first_time;
|
||||
|
||||
text[0] = stats->hfinfo->name;
|
||||
text[1] = g_strdup_printf("%6.2f%%",
|
||||
PCT(stats->num_pkts_total, ps->tot_packets));
|
||||
#if GTK_MAJOR_VERSION < 2
|
||||
text[2] = g_strdup_printf("%u", stats->num_pkts_total);
|
||||
text[3] = g_strdup_printf("%u", stats->num_bytes_total);
|
||||
text[4] = g_strdup_printf("%u", stats->num_pkts_last);
|
||||
text[5] = g_strdup_printf("%u", stats->num_bytes_last);
|
||||
if (seconds > 0.0) {
|
||||
text[4] = g_strdup_printf("%.3f",
|
||||
BANDWITDH(stats->num_bytes_total, seconds));
|
||||
} else {
|
||||
text[4] = "n.c.";
|
||||
}
|
||||
text[5] = g_strdup_printf("%u", stats->num_pkts_last);
|
||||
text[6] = g_strdup_printf("%u", stats->num_bytes_last);
|
||||
if (seconds > 0.0) {
|
||||
text[7] = g_strdup_printf("%.3f",
|
||||
BANDWITDH(stats->num_bytes_last, seconds));
|
||||
} else {
|
||||
text[7] = "n.c.";
|
||||
}
|
||||
|
||||
#if GTK_MAJOR_VERSION < 2
|
||||
new_node = gtk_ctree_insert_node(tree, parent, NULL, text,
|
||||
5, NULL, NULL, NULL, NULL,
|
||||
7, NULL, NULL, NULL, NULL,
|
||||
is_leaf, TRUE);
|
||||
#else
|
||||
store = GTK_TREE_STORE(gtk_tree_view_get_model(tree_view));
|
||||
|
|
@ -111,20 +125,24 @@ fill_in_tree_node(GNode *node, gpointer data)
|
|||
gtk_tree_store_set(store, &new_iter,
|
||||
PROTOCOL_COLUMN, text[0],
|
||||
PRCT_PKTS_COLUMN, text[1],
|
||||
PKTS_COLUMN, stats->num_pkts_total,
|
||||
BYTES_COLUMN, stats->num_bytes_total,
|
||||
END_PKTS_COLUMN, stats->num_pkts_last,
|
||||
END_BYTES_COLUMN, stats->num_bytes_last,
|
||||
PKTS_COLUMN, text[2],
|
||||
BYTES_COLUMN, text[3],
|
||||
BANDWIDTH_COLUMN, text[4],
|
||||
END_PKTS_COLUMN, text[5],
|
||||
END_BYTES_COLUMN, text[6],
|
||||
END_BANDWIDTH_COLUMN, text[7],
|
||||
-1);
|
||||
#endif
|
||||
|
||||
g_free(text[1]);
|
||||
#if GTK_MAJOR_VERSION < 2
|
||||
g_free(text[2]);
|
||||
g_free(text[3]);
|
||||
g_free(text[4]);
|
||||
if (seconds > 0.0) g_free(text[4]);
|
||||
g_free(text[5]);
|
||||
g_free(text[6]);
|
||||
if (seconds > 0.0) g_free(text[7]);
|
||||
|
||||
#if GTK_MAJOR_VERSION < 2
|
||||
child_di.tree = tree;
|
||||
child_di.parent = new_node;
|
||||
#else
|
||||
|
|
@ -156,7 +174,7 @@ fill_in_tree(GtkWidget *tree, ph_stats_t *ps)
|
|||
}
|
||||
|
||||
#define MAX_DLG_HEIGHT 450
|
||||
#define DEF_DLG_WIDTH 600
|
||||
#define DEF_DLG_WIDTH 700
|
||||
static void
|
||||
create_tree(GtkWidget *container, ph_stats_t *ps)
|
||||
{
|
||||
|
|
@ -168,8 +186,10 @@ create_tree(GtkWidget *container, ph_stats_t *ps)
|
|||
"% Packets",
|
||||
"Packets",
|
||||
"Bytes",
|
||||
"Mbit/s",
|
||||
"End Packets",
|
||||
"End Bytes",
|
||||
"End Mbit/s"
|
||||
};
|
||||
#else
|
||||
GtkTreeView *tree_view;
|
||||
|
|
@ -201,14 +221,15 @@ create_tree(GtkWidget *container, ph_stats_t *ps)
|
|||
|
||||
|
||||
/* Right justify numeric columns */
|
||||
for (i = 1; i <= 5; i++) {
|
||||
for (i = 1; i < NUM_STAT_COLUMNS; i++) {
|
||||
gtk_clist_set_column_justification(GTK_CLIST(tree), i,
|
||||
GTK_JUSTIFY_RIGHT);
|
||||
}
|
||||
#else
|
||||
store = gtk_tree_store_new(NUM_STAT_COLUMNS, G_TYPE_STRING,
|
||||
G_TYPE_STRING, G_TYPE_UINT, G_TYPE_UINT,
|
||||
G_TYPE_UINT, G_TYPE_UINT);
|
||||
G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,
|
||||
G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,
|
||||
G_TYPE_STRING);
|
||||
tree = tree_view_new(GTK_TREE_MODEL(store));
|
||||
tree_view = GTK_TREE_VIEW(tree);
|
||||
gtk_tree_view_set_headers_visible(tree_view, TRUE);
|
||||
|
|
@ -241,6 +262,14 @@ create_tree(GtkWidget *container, ph_stats_t *ps)
|
|||
gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
|
||||
gtk_tree_view_append_column(tree_view, column);
|
||||
renderer = gtk_cell_renderer_text_new();
|
||||
column = gtk_tree_view_column_new_with_attributes("Mbit/s", renderer,
|
||||
"text",
|
||||
BANDWIDTH_COLUMN,
|
||||
NULL);
|
||||
g_object_set(G_OBJECT(renderer), "xalign", 1.0, NULL);
|
||||
gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
|
||||
gtk_tree_view_append_column(tree_view, column);
|
||||
renderer = gtk_cell_renderer_text_new();
|
||||
column = gtk_tree_view_column_new_with_attributes("End Packets",
|
||||
renderer, "text",
|
||||
END_PKTS_COLUMN, NULL);
|
||||
|
|
@ -254,6 +283,14 @@ create_tree(GtkWidget *container, ph_stats_t *ps)
|
|||
g_object_set(G_OBJECT(renderer), "xalign", 1.0, NULL);
|
||||
gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
|
||||
gtk_tree_view_append_column(tree_view, column);
|
||||
renderer = gtk_cell_renderer_text_new();
|
||||
column = gtk_tree_view_column_new_with_attributes("End Mbit/s", renderer,
|
||||
"text",
|
||||
END_BANDWIDTH_COLUMN,
|
||||
NULL);
|
||||
g_object_set(G_OBJECT(renderer), "xalign", 1.0, NULL);
|
||||
gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
|
||||
gtk_tree_view_append_column(tree_view, column);
|
||||
#endif
|
||||
|
||||
/* Fill in the data. */
|
||||
|
|
@ -268,7 +305,6 @@ create_tree(GtkWidget *container, ph_stats_t *ps)
|
|||
#endif
|
||||
|
||||
gtk_container_add(GTK_CONTAINER(sw), tree);
|
||||
ph_stats_free(ps);
|
||||
}
|
||||
|
||||
void
|
||||
|
|
@ -294,21 +330,22 @@ proto_hier_stats_cb(GtkWidget *w _U_, gpointer d _U_)
|
|||
/* Data section */
|
||||
create_tree(vbox, ps);
|
||||
|
||||
ph_stats_free(ps);
|
||||
|
||||
/* Button row. */
|
||||
bbox = dlg_button_row_new(GTK_STOCK_OK, NULL);
|
||||
gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
|
||||
gtk_widget_show(bbox);
|
||||
bbox = dlg_button_row_new(GTK_STOCK_OK, NULL);
|
||||
gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
|
||||
gtk_widget_show(bbox);
|
||||
|
||||
ok_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_OK);
|
||||
ok_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_OK);
|
||||
SIGNAL_CONNECT_OBJECT(ok_bt, "clicked", gtk_widget_destroy, dlg);
|
||||
gtk_widget_grab_default(ok_bt);
|
||||
gtk_widget_grab_default(ok_bt);
|
||||
|
||||
/* Catch the "key_press_event" signal in the window, so that we can catch
|
||||
the ESC key being pressed and act as if the "OK" button had
|
||||
been selected. */
|
||||
/* Catch the "key_press_event" signal in the window, so that we can
|
||||
catch the ESC key being pressed and act as if the "OK" button had
|
||||
been selected. */
|
||||
dlg_set_cancel(dlg, ok_bt);
|
||||
|
||||
gtk_widget_show_all(dlg);
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/* proto_hier_stats.c
|
||||
* Routines for calculating statistics based on protocol.
|
||||
*
|
||||
* $Id: proto_hier_stats.c,v 1.25 2004/01/31 03:22:37 guy Exp $
|
||||
* $Id: proto_hier_stats.c,v 1.26 2004/03/17 21:48:15 deniel Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -42,6 +42,12 @@
|
|||
#define STAT_NODE_STATS(n) ((ph_stats_node_t*)(n)->data)
|
||||
#define STAT_NODE_HFINFO(n) (STAT_NODE_STATS(n)->hfinfo)
|
||||
|
||||
static double
|
||||
secs_usecs(guint32 s, guint32 us)
|
||||
{
|
||||
return (us / 1000000.0) + (double)s;
|
||||
}
|
||||
|
||||
static GNode*
|
||||
find_stat_node(GNode *parent_stat_node, header_field_info *needle_hfinfo)
|
||||
{
|
||||
|
|
@ -129,6 +135,7 @@ process_frame(frame_data *frame, column_info *cinfo, ph_stats_t* ps)
|
|||
guint8 pd[WTAP_MAX_PACKET_SIZE];
|
||||
int err;
|
||||
gchar *err_info;
|
||||
double cur_time;
|
||||
|
||||
/* Load the frame from the capture file */
|
||||
if (!wtap_seek_read(cfile.wth, frame->file_off, &phdr, pd,
|
||||
|
|
@ -145,14 +152,21 @@ process_frame(frame_data *frame, column_info *cinfo, ph_stats_t* ps)
|
|||
/* Get stats from this protocol tree */
|
||||
process_tree(edt->tree, ps, frame->pkt_len);
|
||||
|
||||
/* Update times */
|
||||
cur_time = secs_usecs(frame->abs_secs, frame->abs_usecs);
|
||||
if (cur_time < ps->first_time) {
|
||||
ps->first_time = cur_time;
|
||||
}
|
||||
if (cur_time > ps->last_time){
|
||||
ps->last_time = cur_time;
|
||||
}
|
||||
|
||||
/* Free our memory. */
|
||||
epan_dissect_free(edt);
|
||||
|
||||
return TRUE; /* success */
|
||||
}
|
||||
|
||||
|
||||
|
||||
ph_stats_t*
|
||||
ph_stats_new(void)
|
||||
{
|
||||
|
|
@ -173,6 +187,8 @@ ph_stats_new(void)
|
|||
ps->tot_packets = 0;
|
||||
ps->tot_bytes = 0;
|
||||
ps->stats_tree = g_node_new(NULL);
|
||||
ps->first_time = 0.0;
|
||||
ps->last_time = 0.0;
|
||||
|
||||
/* Update the progress bar when it gets to this value. */
|
||||
progbar_nextstep = 0;
|
||||
|
|
@ -230,6 +246,14 @@ ph_stats_new(void)
|
|||
probably do so for other loops (see "file.c") that
|
||||
look only at those packets. */
|
||||
if (frame->flags.passed_dfilter) {
|
||||
|
||||
if (tot_packets == 0) {
|
||||
double cur_time = secs_usecs(frame->abs_secs,
|
||||
frame->abs_usecs);
|
||||
ps->first_time = cur_time;
|
||||
ps->last_time = cur_time;
|
||||
}
|
||||
|
||||
if (!process_frame(frame, &cfile.cinfo, ps)) {
|
||||
/*
|
||||
* Give up, and set "stop_flag" so we
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/* proto_hier_stats.h
|
||||
*
|
||||
* $Id: proto_hier_stats.h,v 1.4 2002/08/28 21:00:41 jmayer Exp $
|
||||
* $Id: proto_hier_stats.h,v 1.5 2004/03/17 21:48:15 deniel Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -39,6 +39,8 @@ typedef struct {
|
|||
guint tot_packets;
|
||||
guint tot_bytes;
|
||||
GNode *stats_tree;
|
||||
double first_time; /* seconds (msec resolution) of first packet */
|
||||
double last_time; /* seconds (msec resolution) of last packet */
|
||||
} ph_stats_t;
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue