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
Remove last occurences of "swag" in src/kernel/.
[simgrid.git]
/
src
/
xbt
/
mallocator_private.h
diff --git
a/src/xbt/mallocator_private.h
b/src/xbt/mallocator_private.h
index
8748245
..
ccd5b52
100644
(file)
--- a/
src/xbt/mallocator_private.h
+++ b/
src/xbt/mallocator_private.h
@@
-1,13
+1,14
@@
/* mallocator - recycle objects to avoid malloc() / free() */
/* mallocator - recycle objects to avoid malloc() / free() */
-/* Copyright (c) 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2006-2017. 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. */
/* 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_MALLOCATOR_PRIVATE_H__
-#define _XBT_MALLOCATOR_PRIVATE_H__
+#ifndef XBT_MALLOCATOR_PRIVATE_H
+#define XBT_MALLOCATOR_PRIVATE_H
+
+#include <xbt/function_types.h>
typedef struct s_xbt_mallocator {
void **objects; /* objects stored by the mallocator and available for the user */
typedef struct s_xbt_mallocator {
void **objects; /* objects stored by the mallocator and available for the user */
@@
-16,6
+17,7
@@
typedef struct s_xbt_mallocator {
pvoid_f_void_t new_f; /* function to call when we are running out of objects */
void_f_pvoid_t free_f; /* function to call when we have got too many objects */
void_f_pvoid_t reset_f; /* function to call when an object is released by the user */
pvoid_f_void_t new_f; /* function to call when we are running out of objects */
void_f_pvoid_t free_f; /* function to call when we have got too many objects */
void_f_pvoid_t reset_f; /* function to call when an object is released by the user */
+ char lock; /* lock to ensure the mallocator is thread-safe */
} s_xbt_mallocator_t;
} s_xbt_mallocator_t;
-#endif
/* _XBT_MALLOCATOR_PRIVATE_H__ */
+#endif