X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/421e2f7dd584b6aa936de631a730fb3b21ca7565..0a03cd809dd45e3645a54feffe364d8f2b33d71e:/src/xbt/dict_private.h

diff --git a/src/xbt/dict_private.h b/src/xbt/dict_private.h
index 04484bce51..9ec22a9c34 100644
--- a/src/xbt/dict_private.h
+++ b/src/xbt/dict_private.h
@@ -3,69 +3,55 @@
 /* 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) 2003, 2004 Martin Quinson. 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_f; /*pointer to the function to call to free this ctn*/
+typedef struct xbt_dictelm_ *xbt_dictelm_t;
 
-  gras_dynar_t    sub; /* sub */
-} s_gras_dictelm_t, *gras_dictelm_t;
+#define MAX_FILL_PERCENT 80
 
-typedef struct gras_dict_ {
-  s_gras_dictelm_t *head;
-} s_gras_dict_t;
+typedef struct xbt_dictelm_ {
+  char *key;
+  int key_len;
+  unsigned int hash_code;
 
-typedef struct gras_dict_cursor_ s_gras_dict_cursor_t;
+  void *content;
+  void_f_pvoid_t free_f;
 
-/*####[ Function prototypes ]################################################*/
-void gras_dictelm_free      (s_gras_dictelm_t **pp_elm);
-
-void gras_dictelm_set       (s_gras_dictelm_t **pp_head,
-			     const char      *_key,
-			     void            *data,
-			     void_f_pvoid_t  *free_ctn);
-void gras_dictelm_set_ext   (s_gras_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;
 
-gras_error_t gras_dictelm_get       (s_gras_dictelm_t *p_head,
-				     const char     *key,
-				     /* OUT */void **data);
-gras_error_t gras_dictelm_get_ext   (s_gras_dictelm_t *p_head,
-				     const char     *key,
-				     int             key_len,
-				     /* OUT */void **data);
+typedef struct xbt_dict_ {
+  xbt_dictelm_t *table;
+  int table_size;
+  int count;
+  int fill;
+} s_xbt_dict_t;
 
-gras_error_t gras_dictelm_remove    (s_gras_dictelm_t *p_head,
-				     const char  *key);
-gras_error_t gras_dictelm_remove_ext(s_gras_dictelm_t *p_head,
-				       const char  *key,
-				       int          key_len);
+typedef struct xbt_dict_cursor_ s_xbt_dict_cursor_t;
 
-void         gras_dictelm_dump      (s_gras_dictelm_t *p_head,
-				     void_f_pvoid_t *output);
+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);
 
-void         gras_dictelm_print_fct (void *data);
-
-#endif  /* _GRAS_DICT_ELM_T_ */
+/*####[ 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);
 
+#endif /* _XBT_DICT_PRIVATE_H_ */