Add a dict parameter to dictelm functions.

[simgrid.git] / src / xbt / dict_private.h

diff --git a/src/xbt/dict_private.h b/src/xbt/dict_private.h
index bbb2ffb..a641b51 100644 (file)
--- a/src/xbt/dict_private.h
+++ b/src/xbt/dict_private.h
@@ -1,9 +1,8 @@
-/* $Id$ */
-
 /* dict_elm - elements of generic dictionnaries                             */
 /* This file is not to be loaded from anywhere but dict.c                   */
 
-/* Copyright (c) 2003, 2004 Martin Quinson. All rights reserved.            */
+/* Copyright (c) 2004-2011. The SimGrid Team.
+ * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -18,39 +17,41 @@
 #include "xbt/dict.h"
 #include "xbt/mallocator.h"
 
-typedef struct xbt_dictelm_ *xbt_dictelm_t;
+typedef struct s_xbt_dictelm *xbt_dictelm_t;
 
-#define MAX_FILL_PERCENT 60
+#define MAX_FILL_PERCENT 80
 
-typedef struct xbt_dictelm_ {
+typedef struct s_xbt_dictelm {
   char *key;
   int key_len;
   unsigned int hash_code;
-   
+
   void *content;
   void_f_pvoid_t free_f;
-   
+
   xbt_dictelm_t next;
 } s_xbt_dictelm_t;
 
-typedef struct xbt_dict_ {
+typedef struct s_xbt_dict {
+  void_f_pvoid_t free_f;
   xbt_dictelm_t *table;
   int table_size;
   int count;
   int fill;
+  int homogeneous;
 } s_xbt_dict_t;
 
-typedef struct xbt_dict_cursor_ s_xbt_dict_cursor_t;
+typedef struct s_xbt_dict_cursor s_xbt_dict_cursor_t;
 
 extern xbt_mallocator_t dict_elm_mallocator;
-extern void* dict_elm_mallocator_new_f(void);
-extern void dict_elm_mallocator_free_f(void* elem);
-extern void dict_elm_mallocator_reset_f(void* elem);
+extern void *dict_elm_mallocator_new_f(void);
+#define dict_elm_mallocator_free_f xbt_free_f
+#define dict_elm_mallocator_reset_f ((void_f_pvoid_t)NULL)
 
 /*####[ Function prototypes ]################################################*/
-xbt_dictelm_t xbt_dictelm_new(const char *key, int key_len, unsigned int hash_code,
-                             void *content, void_f_pvoid_t free_f);
-void xbt_dictelm_free(xbt_dictelm_t element);
-void xbt_dict_add_element(xbt_dict_t dict, xbt_dictelm_t element);
+xbt_dictelm_t xbt_dictelm_new(xbt_dict_t dict, const char *key, int key_len,
+                              unsigned int hash_code, void *content,
+                              void_f_pvoid_t free_f);
+void xbt_dictelm_free(xbt_dict_t dict, xbt_dictelm_t element);
 
-#endif  /* _XBT_DICT_PRIVATE_H_ */
+#endif                          /* _XBT_DICT_PRIVATE_H_ */