A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LUA: Added new (converted) platform file and started teshsuite
[simgrid.git]
/
src
/
xbt
/
dict_private.h
diff --git
a/src/xbt/dict_private.h
b/src/xbt/dict_private.h
index
4c5dcc7
..
7db9869
100644
(file)
--- a/
src/xbt/dict_private.h
+++ b/
src/xbt/dict_private.h
@@
-1,7
+1,7
@@
/* dict_elm - elements of generic dictionnaries */
/* This file is not to be loaded from anywhere but dict.c */
/* dict_elm - elements of generic dictionnaries */
/* This file is not to be loaded from anywhere but dict.c */
-/* Copyright (c) 2004-2011. The SimGrid Team.
+/* Copyright (c) 2004-2011
, 2013-2014
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-10,6
+10,7
@@
#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/sysdep.h"
#include "xbt/log.h"
#include "xbt/ex.h"
@@
-17,20
+18,13
@@
#include "xbt/dict.h"
#include "xbt/mallocator.h"
#include "xbt/dict.h"
#include "xbt/mallocator.h"
-typedef struct s_xbt_dictelm *xbt_dictelm_t;
-
#define MAX_FILL_PERCENT 80
#define MAX_FILL_PERCENT 80
-typedef struct s_xbt_dictelm {
- char *key;
- int key_len;
- unsigned int hash_code;
- void *content;
+typedef struct s_xbt_het_dictelm {
+ s_xbt_dictelm_t element;
void_f_pvoid_t free_f;
void_f_pvoid_t free_f;
-
- xbt_dictelm_t next;
-} s_xbt_dictelm_t;
+} s_xbt_het_dictelm_t, *xbt_het_dictelm_t;
typedef struct s_xbt_dict {
void_f_pvoid_t free_f;
typedef struct s_xbt_dict {
void_f_pvoid_t free_f;
@@
-43,17
+37,22
@@
typedef struct s_xbt_dict {
typedef struct s_xbt_dict_cursor s_xbt_dict_cursor_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)
#define dict_elm_mallocator_free_f xbt_free_f
#define dict_elm_mallocator_reset_f ((void_f_pvoid_t)NULL)
+extern XBT_PRIVATE xbt_mallocator_t dict_het_elm_mallocator;
+extern XBT_PRIVATE 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 ]################################################*/
/*####[ Function prototypes ]################################################*/
-xbt_dictelm_t xbt_dictelm_new(xbt_dict_t dict, const char *key, int key_len,
+
XBT_PRIVATE
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);
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,
+
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, void_f_pvoid_t free_ctn);
#endif /* _XBT_DICT_PRIVATE_H_ */
void *data, void_f_pvoid_t free_ctn);
#endif /* _XBT_DICT_PRIVATE_H_ */