/* Declarations for `mmalloc' and friends. */
-/* Copyright (c) 2010-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2010-2020. 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. */
#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/swag.h"
#include <pthread.h>
#include <stdint.h>
#define BLOCKIFY(SIZE) (((SIZE) + BLOCKSIZE - 1) / BLOCKSIZE)
/* We keep fragment-specific meta-data for introspection purposes, and these
- * information are kept in fixed lenght arrays. Here is the computation of
+ * 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.
*/
-//#define SMALLEST_POSSIBLE_MALLOC (sizeof(struct list))
#define SMALLEST_POSSIBLE_MALLOC (16*sizeof(struct list))
#define MAX_FRAGMENT_PER_BLOCK (BLOCKSIZE / SMALLEST_POSSIBLE_MALLOC)
#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 {
struct {
size_t nfree; /* Free fragments in a fragmented block. */
ssize_t frag_size[MAX_FRAGMENT_PER_BLOCK];
- //void *bt[MAX_FRAGMENT_PER_BLOCK][XBT_BACKTRACE_SIZE]; /* Where it was malloced (or realloced lastly) */
int ignore[MAX_FRAGMENT_PER_BLOCK];
} busy_frag;
struct {
size_t size; /* Size (in blocks) of a large cluster. */
size_t busy_size; /* Actually used space, in bytes */
- //void *bt[XBT_BACKTRACE_SIZE]; /* Where it was malloced (or realloced lastly) */
- //int bt_size;
int ignore;
} busy_block;
/* Heap information for a free block (that may be the first of a free cluster). */
* if such a file exists.
* */
struct mdesc {
-
/** @brief Mutex locking the access to the heap */
pthread_mutex_t mutex;
/* @brief List of all blocks containing free fragments of a given size.
*
- * The array indice is the log2 of requested size.
+ * The array index is the log2 of requested size.
* Actually only the sizes 8->11 seem to be used, but who cares? */
s_xbt_swag_t fraghead[BLOCKLOG];
/* @brief Instrumentation */
struct mstats heapstats;
-
};
/* Bits to look at in the malloc descriptor flags word */
/* A default malloc descriptor for the single sbrk() managed region. */
-XBT_PUBLIC_DATA( struct mdesc ) *__mmalloc_default_mdp;
+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* __mmalloc_remap_core(const s_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 mutex is already created)
*
* 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)
-
-static inline void mmalloc_paranoia(struct mdesc *mdp){
-
- /* nothing to fear for no */
-
-}
-
-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;
- }
-}
-
-XBT_PRIVATE void mmcheck(xbt_mheap_t heap);
+#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 int mmalloc_exec_using_mm(int argc, const char** argv);
-XBT_PRIVATE void mmalloc_ensure_using_mm(int argc, const char** argv);
-
XBT_PRIVATE size_t mmalloc_get_bytes_used_remote(size_t heaplimit, const malloc_info* heapinfo);
-SG_END_DECL()
+SG_END_DECL
#endif
