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
Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
xbt
/
mmalloc
/
mmprivate.h
diff --git
a/src/xbt/mmalloc/mmprivate.h
b/src/xbt/mmalloc/mmprivate.h
index
67c5bba
..
63e45bc
100644
(file)
--- a/
src/xbt/mmalloc/mmprivate.h
+++ b/
src/xbt/mmalloc/mmprivate.h
@@
-1,6
+1,6
@@
/* Declarations for `mmalloc' and friends. */
/* Declarations for `mmalloc' and friends. */
-/* Copyright (c) 2010-201
4
. The SimGrid Team.
+/* Copyright (c) 2010-201
5
. 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
@@
-14,7
+14,10
@@
#ifndef __MMPRIVATE_H
#define __MMPRIVATE_H 1
#ifndef __MMPRIVATE_H
#define __MMPRIVATE_H 1
-#include "portable.h"
+#include <xbt/base.h>
+#include <xbt/misc.h>
+
+#include "src/portable.h"
#include "xbt/xbt_os_thread.h"
#include "xbt/mmalloc.h"
#include "xbt/ex.h"
#include "xbt/xbt_os_thread.h"
#include "xbt/mmalloc.h"
#include "xbt/ex.h"
@@
-94,6
+97,8
@@
#define ADDRESS(B) ((void*) (((ADDR2UINT(B)) - 1) * BLOCKSIZE + (char*) mdp -> heapbase))
#define ADDRESS(B) ((void*) (((ADDR2UINT(B)) - 1) * BLOCKSIZE + (char*) mdp -> heapbase))
+SG_BEGIN_DECL()
+
/* Doubly linked lists of free fragments. */
struct list {
struct list *next;
/* Doubly linked lists of free fragments. */
struct list {
struct list *next;
@@
-286,7
+291,7
@@
struct mdesc {
/* A default malloc descriptor for the single sbrk() managed region. */
/* A default malloc descriptor for the single sbrk() managed region. */
-XBT_PUBLIC( 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. */
@@
-319,11
+324,15
@@
static inline int mmalloc_get_increment(malloc_info* heapinfo) {
}
}
}
}
-void mmcheck(xbt_mheap_t heap);
+XBT_PRIVATE void mmcheck(xbt_mheap_t heap);
+
+XBT_PRIVATE int malloc_use_mmalloc(void);
+
+XBT_PRIVATE int mmalloc_exec_using_mm(int argc, const char** argv);
+XBT_PRIVATE void mmalloc_ensure_using_mm(int argc, const char** argv);
-int mmalloc_exec_using_mm(int argc, const char** argv);
-void mmalloc_ensure_using_mm(int argc, const char** argv);
+XBT_PRIVATE size_t mmalloc_get_bytes_used_remote(size_t heaplimit, const malloc_info* heapinfo);
-size_t mmalloc_get_bytes_used_remote(size_t heaplimit, const malloc_info* heapinfo);
+SG_END_DECL()
#endif /* __MMPRIVATE_H */
#endif /* __MMPRIVATE_H */