X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8c354c48ec90c997cc7213ce96ca97d882934166..51c23076e2b42ff07dc167dea1cb0e3a4ab3cf68:/src/xbt/dict_private.h

diff --git a/src/xbt/dict_private.h b/src/xbt/dict_private.h
index ce8b67676c..50ee25e5d7 100644
--- a/src/xbt/dict_private.h
+++ b/src/xbt/dict_private.h
@@ -1,70 +1,44 @@
-/* $Id$ */
-
 /* dict_elm - elements of generic dictionnaries                             */
-/* This file is not to be loaded from anywhere but dict.c                   */
+/* This file is not to be loaded from anywhere but dict.cpp                 */
 
-/* Copyright (c) 2004 Martin Quinson. All rights reserved.                  */
+/* Copyright (c) 2004-2018. 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/base.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 xbt_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*/
+SG_BEGIN_DECL()
 
-  xbt_dynar_t    sub; /* sub */
-} s_xbt_dictelm_t, *xbt_dictelm_t;
+#define MAX_FILL_PERCENT 80
 
-typedef struct xbt_dict_ {
-  s_xbt_dictelm_t *head;
+typedef struct s_xbt_dict {
+  void_f_pvoid_t free_f;
+  xbt_dictelm_t *table;
+  int table_size;
+  int count;
+  int fill;
 } s_xbt_dict_t;
 
-typedef struct xbt_dict_cursor_ s_xbt_dict_cursor_t;
+extern XBT_PRIVATE xbt_mallocator_t dict_elm_mallocator;
+XBT_PRIVATE 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 ]################################################*/
-void xbt_dictelm_free      (s_xbt_dictelm_t **pp_elm);
-
-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_error_t xbt_dictelm_get       (s_xbt_dictelm_t *p_head,
-				     const char     *key,
-				     /* OUT */void **data);
-xbt_error_t xbt_dictelm_get_ext   (s_xbt_dictelm_t *p_head,
-				     const char     *key,
-				     int             key_len,
-				     /* OUT */void **data);
-
-xbt_error_t xbt_dictelm_remove    (s_xbt_dictelm_t *p_head,
-				     const char  *key);
-xbt_error_t xbt_dictelm_remove_ext(s_xbt_dictelm_t *p_head,
-				       const char  *key,
-				       int          key_len);
-
-void         xbt_dictelm_dump      (s_xbt_dictelm_t *p_head,
-				     void_f_pvoid_t *output);
-
-void         xbt_dictelm_print_fct (void *data);
+XBT_PRIVATE xbt_dictelm_t xbt_dictelm_new(const char* key, int key_len, unsigned int hash_code, void* content);
+XBT_PRIVATE void xbt_dictelm_free(xbt_dict_t dict, xbt_dictelm_t element);
+XBT_PRIVATE void xbt_dictelm_set_data(xbt_dict_t dict, xbt_dictelm_t element, void* data);
 
-#endif  /* _XBT_DICT_ELM_T_ */
+SG_END_DECL()
 
+#endif