/* 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-2011. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2004-2019. 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_PRIVATE_H__
-#define _XBT_DICT_PRIVATE_H__
+#ifndef XBT_DICT_PRIVATE_H
+#define XBT_DICT_PRIVATE_H
+#include "xbt/base.h"
#include "xbt/sysdep.h"
#include "xbt/log.h"
#include "xbt/ex.h"
#include "xbt/dict.h"
#include "xbt/mallocator.h"
-typedef struct s_xbt_dictelm *xbt_dictelm_t;
-
-#define MAX_FILL_PERCENT 80
-
-typedef struct s_xbt_dictelm {
- char *key;
- int key_len;
- unsigned int hash_code;
-
- 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;
+SG_BEGIN_DECL()
typedef struct s_xbt_dict {
void_f_pvoid_t free_f;
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);
+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)
-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);
+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);
+
+SG_END_DECL()
-#endif /* _XBT_DICT_PRIVATE_H_ */
+#endif