* configure.ac: New switch for disabling -O2 (--disable-optimizations).

[cacao.git] / src / toolbox / avl.h

diff --git a/src/toolbox/avl.h b/src/toolbox/avl.h
index d0a4afc536dba45574b3c67f2600207f031c8b69..c95513b30ea0312a43e77701b4452ab9046be80f 100644 (file)
--- a/src/toolbox/avl.h
+++ b/src/toolbox/avl.h
@@ -1,9 +1,7 @@
 /* src/toolbox/avl.h - AVL tree implementation
 
-   Copyright (C) 1996-2005, 2006, 2007 R. Grafl, A. Krall, C. Kruegel,
-   C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
-   E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
-   J. Wenninger, Institut f. Computersprachen - TU Wien
+   Copyright (C) 1996-2005, 2006, 2007, 2008
+   CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 
    This file is part of CACAO.
 
@@ -22,8 +20,6 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: avl.h 7859 2007-05-03 08:29:16Z twisti $
-
 */
 
 
@@ -34,6 +30,8 @@
 
 #include "vm/types.h"
 
+#include "threads/mutex.hpp"
+
 #include "vm/global.h"
 
 
@@ -45,7 +43,7 @@
 
 /* tree comparator prototype **************************************************/
 
-typedef s4 avl_comparator(const void *a, const void *b);
+typedef s4 avl_comparator(const void *treenode, const void *node);
 
 
 /* forward typedefs ***********************************************************/
@@ -57,12 +55,10 @@ typedef struct avl_node_t avl_node_t;
 /* avl_tree_t *****************************************************************/
 
 struct avl_tree_t {
-#if defined(ENABLE_THREADS)
-       java_objectheader *lock;            /* threads lock object                */
-#endif
-       avl_node_t        *root;            /* pointer to root node               */
-       avl_comparator    *comparator;      /* pointer to comparison function     */
-       s4                 entries;         /* contains number of entries         */
+       Mutex*          mutex;              ///< Mutex to lock the tree.
+       avl_node_t     *root;               /* pointer to root node               */
+       avl_comparator *comparator;         /* pointer to comparison function     */
+       s4              entries;            /* contains number of entries         */
 };
 
 
@@ -77,6 +73,10 @@ struct avl_node_t {
 
 /* function prototypes ********************************************************/
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 avl_tree_t *avl_create(avl_comparator *comparator);
 bool        avl_insert(avl_tree_t *tree, void *data);
 void       *avl_find(avl_tree_t *tree, void *data);
@@ -85,6 +85,10 @@ void       *avl_find(avl_tree_t *tree, void *data);
 void        avl_dump(avl_node_t* node, s4 indent);
 #endif
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif /* _AVL_H */