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
fix model-check builds on freebsd
[simgrid.git]
/
src
/
xbt
/
mmalloc
/
mmprivate.h
diff --git
a/src/xbt/mmalloc/mmprivate.h
b/src/xbt/mmalloc/mmprivate.h
index
389b55b
..
d545fcc
100644
(file)
--- a/
src/xbt/mmalloc/mmprivate.h
+++ b/
src/xbt/mmalloc/mmprivate.h
@@
-26,6
+26,15
@@
#include <pthread.h>
#include <stdint.h>
#include <pthread.h>
#include <stdint.h>
+#ifdef MIN
+#undef MIN
+#endif
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
+#ifdef MAX
+#undef MAX
+#endif
+#define MAX(a, b) ((a) > (b) ? (a) : (b))
+
#ifdef HAVE_LIMITS_H
# include <limits.h>
#else
#ifdef HAVE_LIMITS_H
# include <limits.h>
#else
@@
-277,13
+286,13
@@
struct mdesc {
/* A default malloc descriptor for the single sbrk() managed region. */
/* A default malloc descriptor for the single sbrk() managed region. */
-XBT_PUBLIC_DATA
( struct mdesc ) *
__mmalloc_default_mdp;
+XBT_PUBLIC_DATA
struct mdesc*
__mmalloc_default_mdp;
/* Remap a mmalloc region that was previously mapped. */
/* Remap a mmalloc region that was previously mapped. */
-XBT_PUBLIC
( void *)
__mmalloc_remap_core(xbt_mheap_t mdp);
+XBT_PUBLIC
void*
__mmalloc_remap_core(xbt_mheap_t mdp);
-XBT_PUBLIC
( void *)mmorecore(struct mdesc *
mdp, ssize_t size);
+XBT_PUBLIC
void* mmorecore(struct mdesc*
mdp, ssize_t size);
/** Thread-safety (if the mutex is already created)
*
/** Thread-safety (if the mutex is already created)
*
@@
-294,16
+303,6
@@
XBT_PUBLIC( void *)mmorecore(struct mdesc *mdp, ssize_t size);
#define LOCK(mdp) pthread_mutex_lock(&mdp->mutex)
#define UNLOCK(mdp) pthread_mutex_unlock(&mdp->mutex)
#define LOCK(mdp) pthread_mutex_lock(&mdp->mutex)
#define UNLOCK(mdp) pthread_mutex_unlock(&mdp->mutex)
-static inline int mmalloc_get_increment(malloc_info* heapinfo) {
- if (heapinfo->type < 0) {
- return heapinfo->free_block.size;
- } else if (heapinfo->type == 0) {
- return heapinfo->busy_block.size;
- } else {
- return 1;
- }
-}
-
XBT_PRIVATE int malloc_use_mmalloc(void);
XBT_PRIVATE size_t mmalloc_get_bytes_used_remote(size_t heaplimit, const malloc_info* heapinfo);
XBT_PRIVATE int malloc_use_mmalloc(void);
XBT_PRIVATE size_t mmalloc_get_bytes_used_remote(size_t heaplimit, const malloc_info* heapinfo);