Implementation of % bytes column.
Cleanup of souce code. svn path=/trunk/; revision=32103
This commit is contained in:
Jaap Keuter
parent
4e6821c3aa
commit
98d800bae8
|
|
@ -45,6 +45,7 @@ enum {
|
|||
PROTOCOL_COLUMN,
|
||||
PRCT_PKTS_COLUMN,
|
||||
PKTS_COLUMN,
|
||||
PRCT_BYTES_COLUMN,
|
||||
BYTES_COLUMN,
|
||||
BANDWIDTH_COLUMN,
|
||||
END_PKTS_COLUMN,
|
||||
|
|
@ -52,6 +53,7 @@ enum {
|
|||
END_BANDWIDTH_COLUMN,
|
||||
FILTER_NAME,
|
||||
PRCT_PKTS_VALUE_COLUMN,
|
||||
PRCT_BYTES_VALUE_COLUMN,
|
||||
NUM_STAT_COLUMNS /* must be the last */
|
||||
};
|
||||
|
||||
|
|
@ -64,7 +66,7 @@ typedef struct {
|
|||
static GtkWidget *tree;
|
||||
|
||||
#define PCT(x,y) (100.0 * (float)(x) / (float)(y))
|
||||
#define BANDWITDH(bytes,secs) ((bytes) * 8.0 / ((secs) * 1000.0 * 1000.0))
|
||||
#define BANDWIDTH(bytes,secs) ((bytes) * 8.0 / ((secs) * 1000.0 * 1000.0))
|
||||
|
||||
static void
|
||||
proto_hier_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data _U_, guint callback_action)
|
||||
|
|
@ -147,7 +149,7 @@ fill_in_tree_node(GNode *node, gpointer data)
|
|||
draw_info_t child_di;
|
||||
double seconds;
|
||||
gchar *text[NUM_STAT_COLUMNS];
|
||||
float percent;
|
||||
float percent_packets, percent_bytes;
|
||||
GtkTreeView *tree_view = di->tree_view;
|
||||
GtkTreeIter *iter = di->iter;
|
||||
GtkTreeStore *store;
|
||||
|
|
@ -155,49 +157,53 @@ fill_in_tree_node(GNode *node, gpointer data)
|
|||
|
||||
seconds = ps->last_time - ps->first_time;
|
||||
|
||||
percent = (float) PCT(stats->num_pkts_total, ps->tot_packets);
|
||||
text[0] = (gchar *) (stats->hfinfo->name);
|
||||
text[1] = g_strdup_printf("%.2f %%", percent);
|
||||
|
||||
text[2] = g_strdup_printf("%u", stats->num_pkts_total);
|
||||
text[3] = g_strdup_printf("%u", stats->num_bytes_total);
|
||||
percent_packets = (float) PCT(stats->num_pkts_total, ps->tot_packets);
|
||||
percent_bytes = (float) PCT(stats->num_bytes_total, ps->tot_bytes);
|
||||
text[PROTOCOL_COLUMN] = (gchar *) (stats->hfinfo->name);
|
||||
text[PRCT_PKTS_COLUMN] = g_strdup_printf("%.2f %%", percent_packets);
|
||||
text[PKTS_COLUMN] = g_strdup_printf("%u", stats->num_pkts_total);
|
||||
text[PRCT_BYTES_COLUMN] = g_strdup_printf("%.2f %%", percent_bytes);
|
||||
text[BYTES_COLUMN] = g_strdup_printf("%u", stats->num_bytes_total);
|
||||
if (seconds > 0.0) {
|
||||
text[4] = g_strdup_printf("%.3f",
|
||||
BANDWITDH(stats->num_bytes_total, seconds));
|
||||
text[BANDWIDTH_COLUMN] = g_strdup_printf("%.3f",
|
||||
BANDWIDTH(stats->num_bytes_total, seconds));
|
||||
} else {
|
||||
text[4] = "n.c.";
|
||||
text[BANDWIDTH_COLUMN] = "n.c.";
|
||||
}
|
||||
text[5] = g_strdup_printf("%u", stats->num_pkts_last);
|
||||
text[6] = g_strdup_printf("%u", stats->num_bytes_last);
|
||||
text[END_PKTS_COLUMN] = g_strdup_printf("%u", stats->num_pkts_last);
|
||||
text[END_BYTES_COLUMN] = g_strdup_printf("%u", stats->num_bytes_last);
|
||||
if (seconds > 0.0) {
|
||||
text[7] = g_strdup_printf("%.3f",
|
||||
BANDWITDH(stats->num_bytes_last, seconds));
|
||||
text[END_BANDWIDTH_COLUMN] = g_strdup_printf("%.3f",
|
||||
BANDWIDTH(stats->num_bytes_last, seconds));
|
||||
} else {
|
||||
text[7] = "n.c.";
|
||||
text[END_BANDWIDTH_COLUMN] = "n.c.";
|
||||
}
|
||||
|
||||
store = GTK_TREE_STORE(gtk_tree_view_get_model(tree_view));
|
||||
gtk_tree_store_append(store, &new_iter, iter);
|
||||
gtk_tree_store_set(store, &new_iter,
|
||||
PROTOCOL_COLUMN, text[0],
|
||||
PRCT_PKTS_COLUMN, text[1],
|
||||
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],
|
||||
FILTER_NAME, stats->hfinfo->abbrev,
|
||||
PRCT_PKTS_VALUE_COLUMN, percent,
|
||||
PROTOCOL_COLUMN, text[PROTOCOL_COLUMN],
|
||||
PRCT_PKTS_COLUMN, text[PRCT_PKTS_COLUMN],
|
||||
PKTS_COLUMN, text[PKTS_COLUMN],
|
||||
PRCT_BYTES_COLUMN, text[PRCT_BYTES_COLUMN],
|
||||
BYTES_COLUMN, text[BYTES_COLUMN],
|
||||
BANDWIDTH_COLUMN, text[BANDWIDTH_COLUMN],
|
||||
END_PKTS_COLUMN, text[END_PKTS_COLUMN],
|
||||
END_BYTES_COLUMN, text[END_BYTES_COLUMN],
|
||||
END_BANDWIDTH_COLUMN, text[END_BANDWIDTH_COLUMN],
|
||||
FILTER_NAME, stats->hfinfo->abbrev,
|
||||
PRCT_PKTS_VALUE_COLUMN, percent_packets,
|
||||
PRCT_BYTES_VALUE_COLUMN, percent_bytes,
|
||||
-1);
|
||||
|
||||
g_free(text[1]);
|
||||
g_free(text[2]);
|
||||
g_free(text[3]);
|
||||
if (seconds > 0.0) g_free(text[4]);
|
||||
g_free(text[5]);
|
||||
g_free(text[6]);
|
||||
if (seconds > 0.0) g_free(text[7]);
|
||||
g_free(text[PRCT_PKTS_COLUMN]);
|
||||
g_free(text[PKTS_COLUMN]);
|
||||
g_free(text[PRCT_BYTES_COLUMN]);
|
||||
g_free(text[BYTES_COLUMN]);
|
||||
if (seconds > 0.0) g_free(text[BANDWIDTH_COLUMN]);
|
||||
g_free(text[END_PKTS_COLUMN]);
|
||||
g_free(text[END_BYTES_COLUMN]);
|
||||
if (seconds > 0.0) g_free(text[END_BANDWIDTH_COLUMN]);
|
||||
|
||||
child_di.tree_view = tree_view;
|
||||
child_di.iter = &new_iter;
|
||||
|
|
@ -210,7 +216,7 @@ fill_in_tree_node(GNode *node, gpointer data)
|
|||
static void
|
||||
fill_in_tree(GtkWidget *tree_lcl, ph_stats_t *ps)
|
||||
{
|
||||
draw_info_t di;
|
||||
draw_info_t di;
|
||||
|
||||
di.tree_view = GTK_TREE_VIEW(tree_lcl);
|
||||
di.iter = NULL;
|
||||
|
|
@ -227,10 +233,9 @@ proto_hier_show_popup_menu_cb(GtkWidget *widget _U_, GdkEvent *event, gpointer d
|
|||
{
|
||||
GdkEventButton *bevent = (GdkEventButton *)event;
|
||||
|
||||
if(event->type==GDK_BUTTON_PRESS && bevent->button==3){
|
||||
if (event->type==GDK_BUTTON_PRESS && bevent->button==3) {
|
||||
/* If this is a right click on one of our columns, popup the context menu */
|
||||
gtk_menu_popup(GTK_MENU(popup_menu_object), NULL, NULL, NULL, NULL,
|
||||
bevent->button, bevent->time);
|
||||
gtk_menu_popup(GTK_MENU(popup_menu_object), NULL, NULL, NULL, NULL, bevent->button, bevent->time);
|
||||
}
|
||||
|
||||
return FALSE;
|
||||
|
|
@ -264,10 +269,11 @@ create_tree(GtkWidget *container, ph_stats_t *ps)
|
|||
GTK_SHADOW_IN);
|
||||
gtk_container_add(GTK_CONTAINER(container), sw);
|
||||
|
||||
store = gtk_tree_store_new(NUM_STAT_COLUMNS, G_TYPE_STRING,
|
||||
store = gtk_tree_store_new(NUM_STAT_COLUMNS, G_TYPE_STRING, G_TYPE_STRING,
|
||||
G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,
|
||||
G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,
|
||||
G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_FLOAT);
|
||||
G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_FLOAT,
|
||||
G_TYPE_FLOAT);
|
||||
tree = tree_view_new(GTK_TREE_MODEL(store));
|
||||
g_object_unref(G_OBJECT(store));
|
||||
tree_view = GTK_TREE_VIEW(tree);
|
||||
|
|
@ -283,11 +289,11 @@ create_tree(GtkWidget *container, ph_stats_t *ps)
|
|||
renderer = gtk_cell_renderer_progress_new();
|
||||
column = gtk_tree_view_column_new_with_attributes("% Packets", renderer,
|
||||
"text", PRCT_PKTS_COLUMN,
|
||||
"value", PRCT_PKTS_VALUE_COLUMN,
|
||||
"value", PRCT_PKTS_VALUE_COLUMN,
|
||||
NULL);
|
||||
gtk_tree_view_column_set_expand(column, TRUE); /* Expand % Packets column */
|
||||
gtk_tree_view_column_set_expand(column, TRUE);
|
||||
#else
|
||||
gtk_tree_view_column_set_expand(column, TRUE); /* Expand Protocol column */
|
||||
gtk_tree_view_column_set_expand(column, TRUE);
|
||||
renderer = gtk_cell_renderer_text_new();
|
||||
column = gtk_tree_view_column_new_with_attributes("% Packets", renderer,
|
||||
"text", PRCT_PKTS_COLUMN,
|
||||
|
|
@ -303,6 +309,22 @@ 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);
|
||||
#if GTK_CHECK_VERSION(2,6,0)
|
||||
renderer = gtk_cell_renderer_progress_new();
|
||||
column = gtk_tree_view_column_new_with_attributes("% Bytes", renderer,
|
||||
"text", PRCT_BYTES_COLUMN,
|
||||
"value", PRCT_BYTES_VALUE_COLUMN,
|
||||
NULL);
|
||||
gtk_tree_view_column_set_expand(column, TRUE);
|
||||
#else
|
||||
renderer = gtk_cell_renderer_text_new();
|
||||
column = gtk_tree_view_column_new_with_attributes("% Bytes", renderer,
|
||||
"text", PRCT_BYTES_COLUMN,
|
||||
NULL);
|
||||
g_object_set(G_OBJECT(renderer), "xalign", 1.0, NULL);
|
||||
#endif
|
||||
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("Bytes", renderer,
|
||||
"text", BYTES_COLUMN,
|
||||
|
|
@ -312,16 +334,15 @@ create_tree(GtkWidget *container, ph_stats_t *ps)
|
|||
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,
|
||||
"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);
|
||||
column = gtk_tree_view_column_new_with_attributes("End Packets", renderer,
|
||||
"text", END_PKTS_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);
|
||||
|
|
@ -334,8 +355,7 @@ create_tree(GtkWidget *container, ph_stats_t *ps)
|
|||
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,
|
||||
"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);
|
||||
|
|
@ -355,11 +375,11 @@ create_tree(GtkWidget *container, ph_stats_t *ps)
|
|||
void
|
||||
proto_hier_stats_cb(GtkWidget *w _U_, gpointer d _U_)
|
||||
{
|
||||
ph_stats_t *ps;
|
||||
GtkWidget *dlg, *close_bt, *help_bt, *vbox, *bbox;
|
||||
GtkWidget *label;
|
||||
char title[256];
|
||||
const char *current_filter;
|
||||
ph_stats_t *ps;
|
||||
GtkWidget *dlg, *close_bt, *help_bt, *vbox, *bbox;
|
||||
GtkWidget *label;
|
||||
char title[256];
|
||||
const char *current_filter;
|
||||
|
||||
/* Get the statistics. */
|
||||
ps = ph_stats_new();
|
||||
|
|
|
|||
Loading…
Reference in New Issue