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 pull request #259 from simgrid/configfix
[simgrid.git]
/
src
/
xbt
/
mmalloc
/
mmprivate.h
diff --git
a/src/xbt/mmalloc/mmprivate.h
b/src/xbt/mmalloc/mmprivate.h
index
09cb4be
..
4854410
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-2018. 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,16
+10,20
@@
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 "portable.h"
+#include <xbt/base.h>
+#include <xbt/misc.h>
+
+#include "swag.h"
+#include "src/internal_config.h"
#include "xbt/xbt_os_thread.h"
#include "xbt/mmalloc.h"
#include "xbt/ex.h"
#include "xbt/dynar.h"
#include "xbt/xbt_os_thread.h"
#include "xbt/mmalloc.h"
#include "xbt/ex.h"
#include "xbt/dynar.h"
-#include "xbt/swag.h"
-#include <
semaphore
.h>
+
+#include <
pthread
.h>
#include <stdint.h>
#ifdef HAVE_LIMITS_H
#include <stdint.h>
#ifdef HAVE_LIMITS_H
@@
-93,6
+96,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;
@@
-109,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
@@
-156,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 {
@@
-190,8
+182,8
@@
typedef struct {
* */
struct mdesc {
* */
struct mdesc {
- /** @brief
Semaphore
locking the access to the heap */
-
sem_t sem
;
+ /** @brief
Mutex
locking the access to the heap */
+
pthread_mutex_t mutex
;
/** @brief Number of processes that attached the heap */
unsigned int refcount;
/** @brief Number of processes that attached the heap */
unsigned int refcount;
@@
-285,39
+277,27
@@
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. */
-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 sem
is already created)
+/*
* Thread-safety (if the mutex
is already created)
*
* This is mandatory in the case where the user runs a parallel simulation
* in a model-checking enabled tree. Without this protection, our malloc
* implementation will not like multi-threading AT ALL.
*/
*
* This is mandatory in the case where the user runs a parallel simulation
* in a model-checking enabled tree. Without this protection, our malloc
* implementation will not like multi-threading AT ALL.
*/
-#define LOCK(mdp) sem_wait(&mdp->sem)
-#define UNLOCK(mdp) sem_post(&mdp->sem)
-
-static XBT_INLINE void mmalloc_paranoia(struct mdesc *mdp){
+#define LOCK(mdp) pthread_mutex_lock(&mdp->mutex)
+#define UNLOCK(mdp) pthread_mutex_unlock(&mdp->mutex)
- /* nothing to fear for no */
+XBT_PRIVATE int malloc_use_mmalloc(void);
-}
+XBT_PRIVATE size_t mmalloc_get_bytes_used_remote(size_t heaplimit, const malloc_info* heapinfo);
-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;
- }
-}
+SG_END_DECL()
-void mmcheck(xbt_mheap_t heap);
-
-#endif /* __MMPRIVATE_H */
+#endif