X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/25d6952dcf52e6ffc1e4a402af0e2d3c17ac3935..329823f4f8ac806d1ac58d48bbbf98c2b1d43b01:/src/xbt/dict_private.h

diff --git a/src/xbt/dict_private.h b/src/xbt/dict_private.h
index 7ad68349fa..a641b51d92 100644
--- a/src/xbt/dict_private.h
+++ b/src/xbt/dict_private.h
@@ -1,69 +1,57 @@
-/* $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. */
 
-#ifndef _XBT_DICT_ELM_T_
-#define _XBT_DICT_ELM_T_
+#ifndef _XBT_DICT_PRIVATE_H__
+#define _XBT_DICT_PRIVATE_H__
 
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
 #include "xbt/ex.h"
 #include "xbt/dynar.h"
 #include "xbt/dict.h"
+#include "xbt/mallocator.h"
 
-/*####[ Type definition ]####################################################*/
-typedef struct xbt_dictelm_ {
-  char           *key;
-  int             key_len;
-  int             offset; /* offset on the key */
-  int             internal; /* true if it's only an internal node */
-  void           *content;
-  void_f_pvoid_t *free_f; /*pointer to the function to call to free this ctn*/
-
-  xbt_dynar_t    sub; /* sub */
-} s_xbt_dictelm_t, *xbt_dictelm_t;
+typedef struct s_xbt_dictelm *xbt_dictelm_t;
 
-typedef struct xbt_dict_ {
-  s_xbt_dictelm_t *head;
-} s_xbt_dict_t;
+#define MAX_FILL_PERCENT 80
 
-typedef struct xbt_dict_cursor_ s_xbt_dict_cursor_t;
+typedef struct s_xbt_dictelm {
+  char *key;
+  int key_len;
+  unsigned int hash_code;
 
-/*####[ Function prototypes ]################################################*/
-void  xbt_dictelm_free      (s_xbt_dictelm_t **pp_elm);
+  void *content;
+  void_f_pvoid_t free_f;
 
-void  xbt_dictelm_set       (s_xbt_dictelm_t **pp_head,
-			     const char      *_key,
-			     void            *data,
-			     void_f_pvoid_t  *free_ctn);
-void  xbt_dictelm_set_ext   (s_xbt_dictelm_t **pp_head,
-			     const char      *_key,
-			     int              key_len,
-			     void            *data,
-			     void_f_pvoid_t  *free_ctn);
+  xbt_dictelm_t next;
+} s_xbt_dictelm_t;
 
-void* xbt_dictelm_get       (s_xbt_dictelm_t *p_head, 
-	                     const char     *key);
-void* xbt_dictelm_get_ext   (s_xbt_dictelm_t *p_head,
-			     const char     *key,
-			     int             key_len);
-
-void xbt_dictelm_remove    (s_xbt_dictelm_t *p_head,
-			    const char  *key);
-void xbt_dictelm_remove_ext(s_xbt_dictelm_t *p_head,
-			    const char  *key,
-			    int          key_len);
+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;
 
-void         xbt_dictelm_dump      (s_xbt_dictelm_t *p_head,
-				     void_f_pvoid_t *output);
+typedef struct s_xbt_dict_cursor s_xbt_dict_cursor_t;
 
-void         xbt_dictelm_print_fct (void *data);
+extern xbt_mallocator_t dict_elm_mallocator;
+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)
 
-#endif  /* _XBT_DICT_ELM_T_ */
+/*####[ Function prototypes ]################################################*/
+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_ */