give se_trees names so that it is easier to debug and to log how often certain trees are accessed

svn path=/trunk/; revision=17587

7 files changed, 24 insertions, 21 deletions

diff --git a/asn1/h248/packet-h248-template.c b/asn1/h248/packet-h248-template.c
index 34e65b5e9e..a84d3db460 100644
--- a/asn1/h248/packet-h248-template.c
+++ b/asn1/h248/packet-h248-template.c
@@ -2116,10 +2116,10 @@ void proto_register_h248(void) {
   
   register_init_routine( &h248_init );
 
-  msgs = se_tree_create(SE_TREE_TYPE_RED_BLACK);
-  trxs = se_tree_create(SE_TREE_TYPE_RED_BLACK);
-  ctxs_by_trx = se_tree_create(SE_TREE_TYPE_RED_BLACK);
-  ctxs = se_tree_create(SE_TREE_TYPE_RED_BLACK);
+  msgs = se_tree_create(SE_TREE_TYPE_RED_BLACK, "h248_msgs");
+  trxs = se_tree_create(SE_TREE_TYPE_RED_BLACK, "h248_trxs");
+  ctxs_by_trx = se_tree_create(SE_TREE_TYPE_RED_BLACK, "h248_ctxs_by_trx");
+  ctxs = se_tree_create(SE_TREE_TYPE_RED_BLACK, "h248_ctxs");
 
 }
 
diff --git a/epan/dissectors/packet-alcap.c b/epan/dissectors/packet-alcap.c
index 3c0fda91a5..081100875d 100644
--- a/epan/dissectors/packet-alcap.c
+++ b/epan/dissectors/packet-alcap.c
@@ -1788,9 +1788,9 @@ proto_register_alcap(void)
                                    "Whether persistent call leg information is to be kept",
                                    &keep_persistent_info);
     
-	legs_by_dsaid = se_tree_create(SE_TREE_TYPE_RED_BLACK);
-	legs_by_osaid = se_tree_create(SE_TREE_TYPE_RED_BLACK);
-	legs_by_bearer = se_tree_create(SE_TREE_TYPE_RED_BLACK);
+	legs_by_dsaid = se_tree_create(SE_TREE_TYPE_RED_BLACK, "legs_by_dsaid");
+	legs_by_osaid = se_tree_create(SE_TREE_TYPE_RED_BLACK, "legs_by_osaid");
+	legs_by_bearer = se_tree_create(SE_TREE_TYPE_RED_BLACK, "legs_by_bearer");
 	
 }
 
diff --git a/epan/dissectors/packet-h248.c b/epan/dissectors/packet-h248.c
index 9cb59f92e9..49dbda10a4 100644
--- a/epan/dissectors/packet-h248.c
+++ b/epan/dissectors/packet-h248.c
@@ -7320,10 +7320,10 @@ void proto_register_h248(void) {
   
   register_init_routine( &h248_init );
 
-  msgs = se_tree_create(SE_TREE_TYPE_RED_BLACK);
-  trxs = se_tree_create(SE_TREE_TYPE_RED_BLACK);
-  ctxs_by_trx = se_tree_create(SE_TREE_TYPE_RED_BLACK);
-  ctxs = se_tree_create(SE_TREE_TYPE_RED_BLACK);
+  msgs = se_tree_create(SE_TREE_TYPE_RED_BLACK, "h248_msgs");
+  trxs = se_tree_create(SE_TREE_TYPE_RED_BLACK, "h248_trxs");
+  ctxs_by_trx = se_tree_create(SE_TREE_TYPE_RED_BLACK, "h248_ctxs_by_trx");
+  ctxs = se_tree_create(SE_TREE_TYPE_RED_BLACK, "h248_ctxs");
 
 }
 
diff --git a/epan/dissectors/packet-nfs.c b/epan/dissectors/packet-nfs.c
index f52ec8ae51..0d2121544f 100644
--- a/epan/dissectors/packet-nfs.c
+++ b/epan/dissectors/packet-nfs.c
@@ -8778,9 +8778,9 @@ proto_register_nfs(void)
 				       "Fhandle filters finds both request/response",
 				       "With this option display filters for nfs fhandles (nfs.fh.{name|full_name|hash}) will find both the request and response packets for a RPC call, even if the actual fhandle is only present in one of the packets",
 					&nfs_fhandle_reqrep_matching);
-	nfs_name_snoop_known=se_tree_create(SE_TREE_TYPE_RED_BLACK);
-	nfs_file_handles=se_tree_create(SE_TREE_TYPE_RED_BLACK);
-	nfs_fhandle_frame_table=se_tree_create(SE_TREE_TYPE_RED_BLACK);
+	nfs_name_snoop_known=se_tree_create(SE_TREE_TYPE_RED_BLACK, "nfs_name_snoop_known");
+	nfs_file_handles=se_tree_create(SE_TREE_TYPE_RED_BLACK, "nfs_file_handles");
+	nfs_fhandle_frame_table=se_tree_create(SE_TREE_TYPE_RED_BLACK, "nfs_fhandle_frame_table");
 	register_init_routine(nfs_name_snoop_init);
 }
 
diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c
index 9ce8bd4a69..d84aec0bdc 100644
--- a/epan/dissectors/packet-tcp.c
+++ b/epan/dissectors/packet-tcp.c
@@ -3078,8 +3078,8 @@ proto_register_tcp(void)
 	    "Try to decode a packet using an heuristic sub-dissector before using a sub-dissector registered to a specific port",
 	    &try_heuristic_first);
 
-	tcp_pdu_time_table=se_tree_create(SE_TREE_TYPE_RED_BLACK);
-	tcp_analyze_acked_table=se_tree_create(SE_TREE_TYPE_RED_BLACK);
+	tcp_pdu_time_table=se_tree_create(SE_TREE_TYPE_RED_BLACK, "tcp_pdu_time_table");
+	tcp_analyze_acked_table=se_tree_create(SE_TREE_TYPE_RED_BLACK, "tcp_analyze_acked_table");
 	register_init_routine(tcp_analyze_seq_init);
 	register_init_routine(tcp_desegment_init);
 	register_init_routine(tcp_fragment_init);
diff --git a/epan/emem.c b/epan/emem.c
index 985d428674..5ba7463659 100644
--- a/epan/emem.c
+++ b/epan/emem.c
@@ -812,7 +812,7 @@ void print_tree(se_tree_node_t *node){
 se_tree_t *se_trees=NULL;
 
 se_tree_t *
-se_tree_create(int type)
+se_tree_create(int type, char *name)
 {
 	se_tree_t *tree_list;
 
@@ -820,6 +820,7 @@ se_tree_create(int type)
 	tree_list->next=se_trees;
 	tree_list->type=type;
 	tree_list->tree=NULL;
+	tree_list->name=name;
 	se_trees=tree_list;
 
 	return tree_list;
@@ -1177,7 +1178,7 @@ static void* lookup_or_insert32(se_tree_t *se_tree, guint32 key, void*(*func)(vo
  * never existed including all metadata associated with the tree.
  */
 se_tree_t *
-se_tree_create_non_persistent(int type)
+se_tree_create_non_persistent(int type, char *name)
 {
 	se_tree_t *tree_list;
 
@@ -1185,13 +1186,14 @@ se_tree_create_non_persistent(int type)
 	tree_list->next=NULL;
 	tree_list->type=type;
 	tree_list->tree=NULL;
+	tree_list->name=name;
 
 	return tree_list;
 }
 
 static void* create_sub_tree(void* d) {
 	se_tree_t *se_tree = d;
-	return se_tree_create_non_persistent(se_tree->type);
+	return se_tree_create_non_persistent(se_tree->type, "subtree");
 }
 
 /* insert a new node in the tree. if this node matches an already existing node
diff --git a/epan/emem.h b/epan/emem.h
index 4a4eee91bb..efbe7b9f4a 100644
--- a/epan/emem.h
+++ b/epan/emem.h
@@ -186,6 +186,7 @@ typedef struct _se_tree_node_t {
 typedef struct _se_tree_t {
 	struct _se_tree_t *next;
 	int type;
+	char *name;    /* just a string to make debugging easier */
 	se_tree_node_t *tree;
 } se_tree_t;
 extern se_tree_t *se_trees;
@@ -197,7 +198,7 @@ extern se_tree_t *se_trees;
  *
  * type is : SE_TREE_TYPE_RED_BLACK for a standard red/black tree.
  */
-se_tree_t *se_tree_create(int type);
+se_tree_t *se_tree_create(int type, char *name);
 
 /* This function is used to insert a node indexed by a guint32 key value.
  * The data pointer should be allocated by SE allocators so that the
@@ -220,7 +221,7 @@ void *se_tree_lookup32(se_tree_t *se_tree, guint32 key);
  * another structure that is also se allocated so that when the structure is
  * released, the tree will be completely released as well.
  */
-se_tree_t *se_tree_create_non_persistent(int type);
+se_tree_t *se_tree_create_non_persistent(int type, char *name);
 
 typedef struct _se_tree_key_t {
 	guint32 length;			/*length in guint32 words */