updated AVL_TREE #def

Author: gonsie

Doxyfile.user.in

@@ -1012,7 +1012,7 @@ INCLUDE_FILE_PATTERNS  =
 # undefined via #undef or recursively expanded use the := operator 
 # instead of the = operator.
 
-PREDEFINED             = USE_AVL_TREE RAND_NORMAL ROSS_timing ROSS_QUEUE_splay ROSS_RAND_clcg4 ROSS_NETWORK_mpi ROSS_CLOCK_amd64 ROSS_GVT_mpi_allreduce ARCH_x86_64
+PREDEFINED             = AVL_TREE RAND_NORMAL ROSS_timing ROSS_QUEUE_splay ROSS_RAND_clcg4 ROSS_NETWORK_mpi ROSS_CLOCK_amd64 ROSS_GVT_mpi_allreduce ARCH_x86_64
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
 # this tag can be used to specify a list of macro names that should be expanded. 

core/gvt/mpi_allreduce.h

@@ -34,7 +34,7 @@ gvt_print(tw_stime gvt)
 
 	printf(").\n");
 
-#ifdef USE_AVL_TREE
+#ifdef AVL_TREE
     printf("AVL tree size: %d\n", g_tw_pe[0]->avl_tree_size);
 #endif
 

core/hash-quadratic.c

@@ -1,7 +1,7 @@
 #include <ross.h>
-#ifdef USE_AVL_TREE
+#ifdef AVL_TREE
 #include "avl_tree.h"
-#endif /* USE_AVL_TREE */
+#endif /* AVL_TREE */
 
 static void     rehash(tw_hash * hash_t, int pe);
 static int find_empty(tw_event ** hash_t, tw_event * event, int hash_size);
@@ -27,7 +27,7 @@ hash_(tw_eventid event_id, int hash_size)
 void           *
 tw_hash_create()
 {
-#ifdef USE_AVL_TREE
+#ifdef AVL_TREE
   int i;
   AvlTree avl_list;
 
@@ -74,7 +74,7 @@ tw_hash_create()
 void
 tw_hash_insert(void *h, tw_event * event, long pe)
 {
-#ifdef USE_AVL_TREE
+#ifdef AVL_TREE
   tw_clock start;
 
   g_tw_pe[0]->avl_tree_size++;
@@ -196,7 +196,7 @@ allocate_table(int hash_size)
 tw_event       *
 tw_hash_remove(void *h, tw_event * event, long pe)
 {
-#if USE_AVL_TREE
+#if AVL_TREE
   tw_event *ret;
   tw_clock start;
 

core/ross-types.h

@@ -351,7 +351,7 @@ struct tw_kp {
     tw_kp *up;
 #endif
 
-#ifdef USE_AVL_TREE
+#ifdef AVL_TREE
     /* AVL tree root */
     AvlTree avl_tree;
 #endif
@@ -389,7 +389,7 @@ struct tw_pe {
     tw_event *cur_event; /**< @brief Current event being processed */
     tw_eventq sevent_q; /**< @brief events already sent over the network */
 
-#ifdef USE_AVL_TREE
+#ifdef AVL_TREE
     /* AVL node head pointer and size */
     AvlTree avl_list_head;
     unsigned avl_tree_size;