X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c42000db0f347a26ac1645d830ac949194ec4da0..967603b36ff1f230fbb9b5db91bc51119cae1574:/src/xbt/dict_private.h

diff --git a/src/xbt/dict_private.h b/src/xbt/dict_private.h
index b675d2b0e0..490fe38cbb 100644
--- a/src/xbt/dict_private.h
+++ b/src/xbt/dict_private.h
@@ -1,69 +1,68 @@
-/* $Id$ */
-
 /* dict_elm - elements of generic dictionnaries                             */
 /* This file is not to be loaded from anywhere but dict.c                   */
 
-/* Authors: Martin Quinson                                                  */
-/* Copyright (C) 2003,2004 Martin Quinson.                                  */
+/* 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. */
+ * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#ifndef _GRAS_DICT_ELM_T_
-#define _GRAS_DICT_ELM_T_
+#ifndef _XBT_DICT_PRIVATE_H__
+#define _XBT_DICT_PRIVATE_H__
 
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
-#include "xbt/error.h"
+#include "xbt/ex.h"
 #include "xbt/dynar.h"
 #include "xbt/dict.h"
+#include "xbt/mallocator.h"
 
-/*####[ Type definition ]####################################################*/
-typedef struct gras_dictelm_ {
-  char           *key;
-  int             key_len;
-  int             offset; /* offset on the key */
-  void           *content;
-  void_f_pvoid_t *free_ctn; /*pointer to the function to call to free this ctn*/
+typedef struct s_xbt_dictelm *xbt_dictelm_t;
 
-  gras_dynar_t   *sub; /* sub */
-} gras_dictelm_t;
+#define MAX_FILL_PERCENT 80
 
-struct gras_dict_ {
-  gras_dictelm_t *head;
-};
+typedef struct s_xbt_dictelm {
+  char *key;
+  int key_len;
+  unsigned int hash_code;
 
-/*####[ Function prototypes ]################################################*/
-void gras_dictelm_free      (gras_dictelm_t **pp_elm);
-
-void gras_dictelm_set       (gras_dictelm_t **pp_head,
-			     const char      *_key,
-			     void            *data,
-			     void_f_pvoid_t  *free_ctn);
-void gras_dictelm_set_ext   (gras_dictelm_t **pp_head,
-			     const char      *_key,
-			     int              key_len,
-			     void            *data,
-			     void_f_pvoid_t  *free_ctn);
-
-gras_error_t gras_dictelm_get       (gras_dictelm_t *p_head,
-				     const char     *key,
-				     /* OUT */void **data);
-gras_error_t gras_dictelm_get_ext   (gras_dictelm_t *p_head,
-				     const char     *key,
-				     int             key_len,
-				     /* OUT */void **data);
-
-gras_error_t gras_dictelm_remove    (gras_dictelm_t *p_head,
-				     const char  *key);
-gras_error_t gras_dictelm_remove_ext(gras_dictelm_t *p_head,
-				       const char  *key,
-				       int          key_len);
-
-void         gras_dictelm_dump      (gras_dictelm_t *p_head,
-				     void_f_pvoid_t *output);
-
-void         gras_dictelm_print_fct (void *data);
-
-#endif  /* _GRAS_DICT_ELM_T_ */
+  void *content;
+
+  xbt_dictelm_t next;
+} s_xbt_dictelm_t;
+
+typedef struct s_xbt_het_dictelm {
+  s_xbt_dictelm_t element;
+  void_f_pvoid_t free_f;
+} s_xbt_het_dictelm_t, *xbt_het_dictelm_t;
+
+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 s_xbt_dict_cursor s_xbt_dict_cursor_t;
+
+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)
+
+extern xbt_mallocator_t dict_het_elm_mallocator;
+extern void *dict_het_elm_mallocator_new_f(void);
+#define dict_het_elm_mallocator_free_f xbt_free_f
+#define dict_het_elm_mallocator_reset_f ((void_f_pvoid_t)NULL)
+
+/*####[ 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);
+void xbt_dictelm_set_data(xbt_dict_t dict, xbt_dictelm_t element,
+                          void *data, void_f_pvoid_t free_ctn);
+
+#endif                          /* _XBT_DICT_PRIVATE_H_ */