forked from osmocom/wireshark
remove another slow GMemChunk from ethereal making ethereal a little bit faster
svn path=/trunk/; revision=9085
This commit is contained in:
Ronnie Sahlberg
parent
04d07e6578
commit
9d88e58e51
69
epan/proto.c
69
epan/proto.c
|
|
@ -1,7 +1,7 @@
|
|||
/* proto.c
|
||||
* Routines for protocol tree
|
||||
*
|
||||
* $Id: proto.c,v 1.110 2003/11/25 13:23:10 sahlberg Exp $
|
||||
* $Id: proto.c,v 1.111 2003/11/25 14:07:44 sahlberg Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -166,7 +166,28 @@ static field_info *field_info_tmp=NULL;
|
|||
static GMemChunk *gmc_proto_node = NULL;
|
||||
|
||||
/* String space for protocol and field items for the GUI */
|
||||
static GMemChunk *gmc_item_labels = NULL;
|
||||
static item_label_t *item_label_free_list = NULL;
|
||||
#define ITEM_LABEL_FREE(il) \
|
||||
if (il) { \
|
||||
il->next=item_label_free_list; \
|
||||
item_label_free_list=il; \
|
||||
}
|
||||
#define ITEM_LABEL_NEW(il) \
|
||||
if(!item_label_free_list){ \
|
||||
int i; \
|
||||
item_label_t *pil; \
|
||||
pil=g_malloc(INITIAL_NUM_ITEM_LABEL*sizeof(item_label_t));\
|
||||
for(i=0;i<INITIAL_NUM_ITEM_LABEL;i++){ \
|
||||
item_label_t *tmpil; \
|
||||
tmpil=&pil[i]; \
|
||||
tmpil->representation=g_malloc(ITEM_LABEL_LENGTH);\
|
||||
tmpil->next=item_label_free_list;\
|
||||
item_label_free_list=tmpil; \
|
||||
} \
|
||||
} \
|
||||
il=item_label_free_list; \
|
||||
item_label_free_list=il->next;
|
||||
|
||||
|
||||
/* List which stores protocols and fields that have been registered */
|
||||
typedef struct _gpa_hfinfo_t {
|
||||
|
|
@ -215,11 +236,6 @@ proto_init(const char *plugin_dir
|
|||
INITIAL_NUM_PROTO_NODE * sizeof(proto_node),
|
||||
G_ALLOC_AND_FREE);
|
||||
|
||||
gmc_item_labels = g_mem_chunk_new("gmc_item_labels",
|
||||
ITEM_LABEL_LENGTH,
|
||||
INITIAL_NUM_ITEM_LABEL* ITEM_LABEL_LENGTH,
|
||||
G_ALLOC_AND_FREE);
|
||||
|
||||
gpa_hfinfo.len=0;
|
||||
gpa_hfinfo.allocated_len=0;
|
||||
gpa_hfinfo.hfi=NULL;
|
||||
|
|
@ -294,8 +310,15 @@ proto_cleanup(void)
|
|||
|
||||
if (gmc_proto_node)
|
||||
g_mem_chunk_destroy(gmc_proto_node);
|
||||
if (gmc_item_labels)
|
||||
g_mem_chunk_destroy(gmc_item_labels);
|
||||
|
||||
while(item_label_free_list){
|
||||
item_label_t *tmpil;
|
||||
tmpil=item_label_free_list->next;
|
||||
g_free(item_label_free_list->representation);
|
||||
g_free(item_label_free_list);
|
||||
item_label_free_list=tmpil;
|
||||
}
|
||||
|
||||
if(gpa_hfinfo.allocated_len){
|
||||
gpa_hfinfo.len=0;
|
||||
gpa_hfinfo.allocated_len=0;
|
||||
|
|
@ -346,10 +369,7 @@ free_node_tree_data(tree_data_t *tree_data)
|
|||
static void
|
||||
free_node_field_info(field_info* finfo)
|
||||
{
|
||||
if (finfo->representation) {
|
||||
g_mem_chunk_free(gmc_item_labels, finfo->representation);
|
||||
}
|
||||
|
||||
ITEM_LABEL_FREE(finfo->rep);
|
||||
FVALUE_FREE(finfo->value);
|
||||
FREE_FIELD_INFO(finfo);
|
||||
}
|
||||
|
|
@ -1922,7 +1942,7 @@ alloc_field_info(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint start,
|
|||
fi->length = *length;
|
||||
fi->tree_type = -1;
|
||||
fi->visible = PTREE_DATA(tree)->visible;
|
||||
fi->representation = NULL;
|
||||
fi->rep = NULL;
|
||||
|
||||
fi->value = fvalue_new(fi->ptr_u.hfinfo->type);
|
||||
|
||||
|
|
@ -1945,10 +1965,10 @@ proto_tree_set_representation(proto_item *pi, const char *format, va_list ap)
|
|||
field_info *fi = PITEM_FINFO(pi);
|
||||
|
||||
if (fi->visible) {
|
||||
fi->representation = g_mem_chunk_alloc(gmc_item_labels);
|
||||
ret = vsnprintf(fi->representation, ITEM_LABEL_LENGTH, format, ap);
|
||||
ITEM_LABEL_NEW(fi->rep);
|
||||
ret = vsnprintf(fi->rep->representation, ITEM_LABEL_LENGTH, format, ap);
|
||||
if ((ret == -1) || (ret >= ITEM_LABEL_LENGTH))
|
||||
fi->representation[ITEM_LABEL_LENGTH - 1] = '\0';
|
||||
fi->rep->representation[ITEM_LABEL_LENGTH - 1] = '\0';
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1965,8 +1985,7 @@ proto_item_set_text(proto_item *pi, const char *format, ...)
|
|||
|
||||
fi = PITEM_FINFO(pi);
|
||||
|
||||
if (fi->representation)
|
||||
g_mem_chunk_free(gmc_item_labels, fi->representation);
|
||||
ITEM_LABEL_FREE(fi->rep);
|
||||
|
||||
va_start(ap, format);
|
||||
proto_tree_set_representation(pi, format, ap);
|
||||
|
|
@ -1995,17 +2014,17 @@ proto_item_append_text(proto_item *pi, const char *format, ...)
|
|||
* If we don't already have a representation,
|
||||
* generate the default representation.
|
||||
*/
|
||||
if (fi->representation == NULL) {
|
||||
fi->representation = g_mem_chunk_alloc(gmc_item_labels);
|
||||
proto_item_fill_label(fi, fi->representation);
|
||||
if (fi->rep == NULL) {
|
||||
ITEM_LABEL_NEW(fi->rep);
|
||||
proto_item_fill_label(fi, fi->rep->representation);
|
||||
}
|
||||
|
||||
curlen = strlen(fi->representation);
|
||||
curlen = strlen(fi->rep->representation);
|
||||
if (ITEM_LABEL_LENGTH > curlen) {
|
||||
ret = vsnprintf(fi->representation + curlen,
|
||||
ret = vsnprintf(fi->rep->representation + curlen,
|
||||
ITEM_LABEL_LENGTH - curlen, format, ap);
|
||||
if ((ret == -1) || (ret >= (int)(ITEM_LABEL_LENGTH - curlen)))
|
||||
fi->representation[ITEM_LABEL_LENGTH - 1] = '\0';
|
||||
fi->rep->representation[ITEM_LABEL_LENGTH - 1] = '\0';
|
||||
}
|
||||
va_end(ap);
|
||||
}
|
||||
|
|
|
|||
10
epan/proto.h
10
epan/proto.h
|
|
@ -1,7 +1,7 @@
|
|||
/* proto.h
|
||||
* Definitions for protocol display
|
||||
*
|
||||
* $Id: proto.h,v 1.46 2003/11/24 22:11:54 guy Exp $
|
||||
* $Id: proto.h,v 1.47 2003/11/25 14:07:44 sahlberg Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -102,6 +102,12 @@ typedef struct hf_register_info {
|
|||
header_field_info hfinfo;
|
||||
} hf_register_info;
|
||||
|
||||
|
||||
typedef struct _item_label_t {
|
||||
struct _item_label_t *next;
|
||||
char *representation;
|
||||
} item_label_t;
|
||||
|
||||
/* Contains the field information for the proto_item. */
|
||||
typedef struct field_info {
|
||||
union {
|
||||
|
|
@ -115,7 +121,7 @@ typedef struct field_info {
|
|||
gint start;
|
||||
gint length;
|
||||
gint tree_type; /* ETT_* */
|
||||
char *representation; /* for GUI tree */
|
||||
item_label_t *rep; /* string for GUI tree */
|
||||
int visible;
|
||||
fvalue_t *value;
|
||||
tvbuff_t *ds_tvb; /* data source tvbuff */
|
||||
|
|
|
|||
6
file.c
6
file.c
|
|
@ -1,7 +1,7 @@
|
|||
/* file.c
|
||||
* File I/O routines
|
||||
*
|
||||
* $Id: file.c,v 1.323 2003/11/15 10:06:44 ulfl Exp $
|
||||
* $Id: file.c,v 1.324 2003/11/25 14:07:42 sahlberg Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -1650,8 +1650,8 @@ match_subtree_text(GNode *node, gpointer data)
|
|||
return;
|
||||
|
||||
/* was a free format label produced? */
|
||||
if (fi->representation) {
|
||||
label_ptr = fi->representation;
|
||||
if (fi->rep) {
|
||||
label_ptr = fi->rep->representation;
|
||||
} else {
|
||||
/* no, make a generic label */
|
||||
label_ptr = label_str;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/* proto_draw.c
|
||||
* Routines for GTK+ packet display
|
||||
*
|
||||
* $Id: proto_draw.c,v 1.64 2003/11/03 21:00:05 guy Exp $
|
||||
* $Id: proto_draw.c,v 1.65 2003/11/25 14:07:45 sahlberg Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -1457,8 +1457,8 @@ proto_tree_draw_node(GNode *node, gpointer data)
|
|||
return;
|
||||
|
||||
/* was a free format label produced? */
|
||||
if (fi->representation) {
|
||||
label_ptr = fi->representation;
|
||||
if (fi->rep) {
|
||||
label_ptr = fi->rep->representation;
|
||||
}
|
||||
else { /* no, make a generic label */
|
||||
label_ptr = label_str;
|
||||
|
|
|
|||
6
print.c
6
print.c
|
|
@ -1,7 +1,7 @@
|
|||
/* print.c
|
||||
* Routines for printing packet analysis trees.
|
||||
*
|
||||
* $Id: print.c,v 1.58 2003/11/24 22:11:53 guy Exp $
|
||||
* $Id: print.c,v 1.59 2003/11/25 14:07:42 sahlberg Exp $
|
||||
*
|
||||
* Gilbert Ramirez <gram@alumni.rice.edu>
|
||||
*
|
||||
|
|
@ -143,8 +143,8 @@ void proto_tree_print_node(GNode *node, gpointer data)
|
|||
return;
|
||||
|
||||
/* was a free format label produced? */
|
||||
if (fi->representation) {
|
||||
label_ptr = fi->representation;
|
||||
if (fi->rep) {
|
||||
label_ptr = fi->rep->representation;
|
||||
}
|
||||
else { /* no, make a generic label */
|
||||
label_ptr = label_str;
|
||||
|
|
|
|||
Loading…
Reference in New Issue