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
Cleanups
[simgrid.git]
/
src
/
xbt
/
mmalloc
/
mmprivate.h
diff --git
a/src/xbt/mmalloc/mmprivate.h
b/src/xbt/mmalloc/mmprivate.h
index 07ef47d24261dd51a8b22c6a50f6c170e674b7d4..6171035483e0973c984c11177bcaf7de1c452013 100644
(file)
--- a/
src/xbt/mmalloc/mmprivate.h
+++ b/
src/xbt/mmalloc/mmprivate.h
@@
-1,7
+1,6
@@
/* Declarations for `mmalloc' and friends. */
/* Declarations for `mmalloc' and friends. */
-/* Copyright (c) 2010-2014. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2010-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. */
@@
-11,12
+10,13
@@
Written May 1989 by Mike Haertel.
Heavily modified Mar 1992 by Fred Fish. (fnf@cygnus.com) */
Written May 1989 by Mike Haertel.
Heavily modified Mar 1992 by Fred Fish. (fnf@cygnus.com) */
-#ifndef
_
_MMPRIVATE_H
-#define
_
_MMPRIVATE_H 1
+#ifndef
XBR
_MMPRIVATE_H
+#define
XBT
_MMPRIVATE_H 1
+#include <xbt/base.h>
#include <xbt/misc.h>
#include <xbt/misc.h>
-#include "
portable
.h"
+#include "
src/internal_config
.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"
@@
-114,19
+114,6
@@
struct mstats
size_t bytes_free; /* Byte total of chunks in the free list. */
};
size_t bytes_free; /* Byte total of chunks in the free list. */
};
-typedef struct s_heap_area{
- int valid;
- int block;
- int fragment;
-}s_heap_area_t, *heap_area_t;
-
-typedef struct s_heap_area_pair{
- int block1;
- int fragment1;
- int block2;
- int fragment2;
-}s_heap_area_pair_t, *heap_area_pair_t;
-
#define MMALLOC_TYPE_HEAPINFO (-2)
#define MMALLOC_TYPE_FREE (-1)
#define MMALLOC_TYPE_UNFRAGMENTED 0
#define MMALLOC_TYPE_HEAPINFO (-2)
#define MMALLOC_TYPE_FREE (-1)
#define MMALLOC_TYPE_UNFRAGMENTED 0
@@
-290,7
+277,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. */
@@
-307,7
+294,7
@@
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
XBT_INLINE
void mmalloc_paranoia(struct mdesc *mdp){
+static
inline
void mmalloc_paranoia(struct mdesc *mdp){
/* nothing to fear for no */
/* nothing to fear for no */
@@
-323,15
+310,15
@@
static inline int mmalloc_get_increment(malloc_info* heapinfo) {
}
}
}
}
-void mmcheck(xbt_mheap_t heap);
+
XBT_PRIVATE
void mmcheck(xbt_mheap_t heap);
-int malloc_use_mmalloc(void);
+
XBT_PRIVATE
int malloc_use_mmalloc(void);
-int mmalloc_exec_using_mm(int argc, const char** argv);
-void mmalloc_ensure_using_mm(int argc, const char** argv);
+
XBT_PRIVATE
int mmalloc_exec_using_mm(int argc, const char** argv);
+
XBT_PRIVATE
void mmalloc_ensure_using_mm(int argc, const char** argv);
-size_t mmalloc_get_bytes_used_remote(size_t heaplimit, const malloc_info* heapinfo);
+
XBT_PRIVATE
size_t mmalloc_get_bytes_used_remote(size_t heaplimit, const malloc_info* heapinfo);
SG_END_DECL()
SG_END_DECL()
-#endif
/* _
_MMPRIVATE_H */
+#endif
/* XBT
_MMPRIVATE_H */