/* 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. */
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 "portable.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>
+#ifndef MIN
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
+#endif
+#ifndef MAX
+#define MAX(a, b) ((a) > (b) ? (a) : (b))
+#endif
+
#ifdef HAVE_LIMITS_H
# include <limits.h>
#else
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
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 {
/* 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(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)
*
#define LOCK(mdp) pthread_mutex_lock(&mdp->mutex)
#define UNLOCK(mdp) pthread_mutex_unlock(&mdp->mutex)
-static XBT_INLINE void mmalloc_paranoia(struct mdesc *mdp){
-
- /* nothing to fear for no */
+XBT_PRIVATE int malloc_use_mmalloc(void);
-}
-
-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;
- }
-}
-
-void mmcheck(xbt_mheap_t heap);
-
-int malloc_use_mmalloc(void);
-
-int mmalloc_exec_using_mm(int argc, const char** argv);
-void mmalloc_ensure_using_mm(int argc, const char** argv);
-
-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()
-#endif /* __MMPRIVATE_H */
+#endif