X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/08e7455d67920bbd7a87f440d00f2c1e071314a0..3c6276aa01e97101adf7ff78cab24c44ad2d48fc:/src/xbt/mmalloc/mmprivate.h diff --git a/src/xbt/mmalloc/mmprivate.h b/src/xbt/mmalloc/mmprivate.h index b93b4d410f..f13069519c 100644 --- a/src/xbt/mmalloc/mmprivate.h +++ b/src/xbt/mmalloc/mmprivate.h @@ -1,6 +1,6 @@ /* Declarations for `mmalloc' and friends. */ -/* Copyright (c) 2010-2021. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2010-2022. 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. */ @@ -13,25 +13,26 @@ #ifndef XBT_MMPRIVATE_H #define XBT_MMPRIVATE_H 1 -#include -#include - #include "swag.h" #include "src/internal_config.h" #include "xbt/mmalloc.h" -#include "xbt/ex.h" -#include "xbt/dynar.h" -#include +#include #include +#include +#include -#ifdef HAVE_LIMITS_H -# include -#else -# ifndef CHAR_BIT -# define CHAR_BIT 8 -# endif -#endif +// This macro is veery similar to xbt_assert, but with no dependency on XBT +#define mmalloc_assert(cond, ...) \ + do { \ + if (!(cond)) { \ + fprintf(stderr, __VA_ARGS__); \ + abort(); \ + } \ + } while (0) + +XBT_PUBLIC_DATA int mmalloc_pagesize; +XBT_PRIVATE xbt_mheap_t mmalloc_preinit(void); #define MMALLOC_MAGIC "mmalloc" /* Mapped file magic number */ #define MMALLOC_MAGIC_SIZE 8 /* Size of magic number buf */ @@ -54,11 +55,13 @@ * information are kept in fixed length arrays. Here is the computation of * that size. * - * Never make SMALLEST_POSSIBLE_MALLOC smaller than sizeof(list) because we - * need to enlist the free fragments. + * Never make SMALLEST_POSSIBLE_MALLOC too small because we need to enlist + * the free fragments. + * + * FIXME: what's the correct size, actually? The used one is a guess. */ -#define SMALLEST_POSSIBLE_MALLOC (16*sizeof(struct list)) +#define SMALLEST_POSSIBLE_MALLOC (32 * sizeof(void*)) #define MAX_FRAGMENT_PER_BLOCK (BLOCKSIZE / SMALLEST_POSSIBLE_MALLOC) /* The difference between two pointers is a signed int. On machines where @@ -68,7 +71,7 @@ sign of the result is machine dependent for negative values, so force it to be treated as an unsigned int. */ -#define ADDR2UINT(addr) ((uintptr_t) ((char*) (addr) - (char*) NULL)) +#define ADDR2UINT(addr) ((uintptr_t) (addr)) #define RESIDUAL(addr,bsize) ((uintptr_t) (ADDR2UINT (addr) % (bsize))) /* Determine the amount of memory spanned by the initial heap table @@ -90,18 +93,12 @@ /* Address to block number and vice versa. */ -#define BLOCK(A) (((char*) (A) - (char*) mdp -> heapbase) / BLOCKSIZE + 1) +#define BLOCK(A) ((size_t)(((char*)(A) - (char*)mdp->heapbase) / BLOCKSIZE + 1)) #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; - struct list *prev; -}; - /* Statistics available to the user. */ struct mstats { @@ -176,12 +173,6 @@ typedef struct { * if such a file exists. * */ struct mdesc { - /** @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; @@ -251,13 +242,6 @@ struct mdesc { */ 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; }; @@ -265,32 +249,26 @@ struct mdesc { /* 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; -/* Remap a mmalloc region that was previously mapped. */ - -XBT_PUBLIC void* __mmalloc_remap_core(const s_xbt_mheap_t* mdp); - XBT_PUBLIC void* mmorecore(struct mdesc* mdp, ssize_t size); -/** 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. - */ -#define LOCK(mdp) pthread_mutex_lock(&(mdp)->mutex) -#define UNLOCK(mdp) pthread_mutex_unlock(&(mdp)->mutex) - -XBT_PRIVATE int malloc_use_mmalloc(void); - XBT_PRIVATE size_t mmalloc_get_bytes_used_remote(size_t heaplimit, const malloc_info* heapinfo); +/* We call dlsym during mmalloc initialization, but dlsym uses malloc. + * So during mmalloc initialization, any call to malloc is diverted to a private static buffer. + */ +extern uint64_t* mmalloc_preinit_buffer; +#ifdef __FreeBSD__ /* FreeBSD require more memory, other might */ +#define mmalloc_preinit_buffer_size 256 +#else /* Valid on: Linux */ +#define mmalloc_preinit_buffer_size 32 +#endif + SG_END_DECL #endif