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
please sonar: kill dead code
[simgrid.git]
/
src
/
xbt
/
mmalloc
/
mmprivate.h
diff --git
a/src/xbt/mmalloc/mmprivate.h
b/src/xbt/mmalloc/mmprivate.h
index
ec15500
..
5e6609d
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-2015. 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,8
+10,8
@@
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
XBT
_MMPRIVATE_H
+#define
XBT
_MMPRIVATE_H 1
#include <xbt/base.h>
#include <xbt/misc.h>
#include <xbt/base.h>
#include <xbt/misc.h>
@@
-115,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
@@
-162,7
+148,7
@@
typedef struct {
int type; /* 0: busy large block
>0: busy fragmented (fragments of size 2^type bytes)
<0: free block */
int type; /* 0: busy large block
>0: busy fragmented (fragments of size 2^type bytes)
<0: free block */
-
+
union {
/* Heap information for a busy block. */
struct {
union {
/* Heap information for a busy block. */
struct {
@@
-324,8
+310,6
@@
static inline int mmalloc_get_increment(malloc_info* heapinfo) {
}
}
}
}
-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 int malloc_use_mmalloc(void);
XBT_PRIVATE int mmalloc_exec_using_mm(int argc, const char** argv);
@@
-335,4
+319,4
@@
XBT_PRIVATE size_t mmalloc_get_bytes_used_remote(size_t heaplimit, const malloc_
SG_END_DECL()
SG_END_DECL()
-#endif
/* __MMPRIVATE_H */
+#endif