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
Parameter 'fd' is always -1 for xbt_mheap_new. 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
7ed76dd
..
bca9acd
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-20
19
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2010-20
21
. 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. */
@@
-25,13
+25,7
@@
#include <pthread.h>
#include <stdint.h>
#include <pthread.h>
#include <stdint.h>
-#ifdef HAVE_LIMITS_H
-# include <limits.h>
-#else
-# ifndef CHAR_BIT
-# define CHAR_BIT 8
-# endif
-#endif
+#include <limits.h>
#define MMALLOC_MAGIC "mmalloc" /* Mapped file magic number */
#define MMALLOC_MAGIC_SIZE 8 /* Size of magic number buf */
#define MMALLOC_MAGIC "mmalloc" /* Mapped file magic number */
#define MMALLOC_MAGIC_SIZE 8 /* Size of magic number buf */
@@
-94,7
+88,7
@@
#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
()
+SG_BEGIN_DECL
/* Doubly linked lists of free fragments. */
struct list {
/* Doubly linked lists of free fragments. */
struct list {
@@
-176,13
+170,9
@@
typedef struct {
* if such a file exists.
* */
struct mdesc {
* if such a file exists.
* */
struct mdesc {
-
/** @brief Mutex locking the access to the heap */
pthread_mutex_t mutex;
/** @brief Mutex locking the access to the heap */
pthread_mutex_t mutex;
- /** @brief Number of processes that attached the heap */
- unsigned int refcount;
-
/** @brief Chained lists of mdescs */
struct mdesc *next_mdesc;
/** @brief Chained lists of mdescs */
struct mdesc *next_mdesc;
@@
-252,32
+242,19
@@
struct mdesc {
*/
void *top;
*/
void *top;
- /** @brief Open file descriptor for the file to which this malloc heap is mapped
- *
- * If this value is negative, MAP_ANONYMOUS memory is used.
- *
- * Also note that it may change each time the region is mapped and unmapped. */
- int fd;
-
/* @brief Instrumentation */
struct mstats heapstats;
/* @brief Instrumentation */
struct mstats heapstats;
-
};
/* Bits to look at in the malloc descriptor flags word */
#define MMALLOC_DEVZERO (1 << 0) /* Have mapped to /dev/zero */
};
/* Bits to look at in the malloc descriptor flags word */
#define MMALLOC_DEVZERO (1 << 0) /* Have mapped to /dev/zero */
-#define MMALLOC_ANONYMOUS (1 << 1) /* Use anonymous mapping */
-#define MMALLOC_INITIALIZED (1 << 2) /* Initialized mmalloc */
+#define MMALLOC_INITIALIZED (1 << 1) /* Initialized mmalloc */
/* A default malloc descriptor for the single sbrk() managed region. */
XBT_PUBLIC_DATA struct mdesc* __mmalloc_default_mdp;
/* A default malloc descriptor for the single sbrk() managed region. */
XBT_PUBLIC_DATA struct mdesc* __mmalloc_default_mdp;
-/* Remap a mmalloc region that was previously mapped. */
-
-XBT_PUBLIC void* __mmalloc_remap_core(xbt_mheap_t mdp);
-
XBT_PUBLIC void* mmorecore(struct mdesc* mdp, ssize_t size);
/** Thread-safety (if the mutex is already created)
XBT_PUBLIC void* mmorecore(struct mdesc* mdp, ssize_t size);
/** Thread-safety (if the mutex is already created)
@@
-293,6
+270,6
@@
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 size_t mmalloc_get_bytes_used_remote(size_t heaplimit, const malloc_info* heapinfo);
-SG_END_DECL
()
+SG_END_DECL
#endif
#endif