X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/092910cd23c789eb83b53efb69e85ae58ed3b1d0..e2c10f61cfd4d58faa73f006aa74def2c73c8860:/src/xbt/dict_private.h

diff --git a/src/xbt/dict_private.h b/src/xbt/dict_private.h
index 619124d683..a6ac66b076 100644
--- a/src/xbt/dict_private.h
+++ b/src/xbt/dict_private.h
@@ -3,61 +3,51 @@
 /* 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__
 
-/*####[ 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*/
+#include "xbt/sysdep.h"
+#include "xbt/log.h"
+#include "xbt/ex.h"
+#include "xbt/dynar.h"
+#include "xbt/dict.h"
+#include "xbt/mallocator.h"
 
-  gras_dynar_t   *sub; /* sub */
-} gras_dictelm_t;
+typedef struct xbt_dictelm_ *xbt_dictelm_t;
 
-struct gras_dict_ {
-  gras_dictelm_t *head;
-};
+typedef struct xbt_dictelm_ {
+  char *key;
+  int key_len;
+  void *content;
+  void_f_pvoid_t *free_f;
+  xbt_dictelm_t next;
+} s_xbt_dictelm_t;
 
-/*####[ Function prototypes ]################################################*/
-void         gras_dictelm_free        (gras_dictelm_t **pp_elm);
-
-gras_error_t gras_dictelm_insert      (gras_dictelm_t **pp_head,
-				       const char      *_key,
-				       void            *data,
-				       void_f_pvoid_t  *free_ctn);
-gras_error_t gras_dictelm_insert_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_retrieve    (gras_dictelm_t *p_head,
-				       const char     *key,
-				       /* OUT */void **data);
-gras_error_t gras_dictelm_retrieve_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);
-
-gras_error_t 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_ */
+typedef struct xbt_dict_ {
+  xbt_dictelm_t *table;
+  int table_size;
+  int count;
+} s_xbt_dict_t;
+
+typedef struct xbt_dict_cursor_ s_xbt_dict_cursor_t;
 
+extern xbt_mallocator_t dict_elm_mallocator;
+XBT_PUBLIC extern void* dict_elm_mallocator_new_f(void);
+XBT_PUBLIC extern void dict_elm_mallocator_free_f(void* elem);
+XBT_PUBLIC extern void dict_elm_mallocator_reset_f(void* elem);
+
+/*####[ Function prototypes ]################################################*/
+XBT_PUBLIC xbt_dictelm_t xbt_dictelm_new(const char *key,
+			      int key_len,
+			      void *content,
+			      void_f_pvoid_t free_f,
+			      xbt_dictelm_t next);
+XBT_PUBLIC void xbt_dictelm_free(xbt_dictelm_t element);
+XBT_PUBLIC void xbt_dict_add_element(xbt_dict_t dict, xbt_dictelm_t element);
+
+#endif  /* _XBT_DICT_PRIVATE_H_ */