#include <dlfcn.h>
-#include "src/mc/mc_base.h"
#include "mmprivate.h"
-#include "src/xbt_modinter.h"
#include "src/internal_config.h"
+#include "src/mc/mc_base.h"
+#include "src/mc/remote/mc_protocol.h"
+#include "src/xbt_modinter.h"
#include <math.h>
-#include "src/mc/mc_protocol.h"
-/* ***** Whether to use `mmalloc` of the undrlying malloc ***** */
+/* ***** Whether to use `mmalloc` of the underlying malloc ***** */
static int __malloc_use_mmalloc;
}
/* Override the malloc-like functions if MC is activated at compile time */
-#ifdef HAVE_MC
+#if SIMGRID_HAVE_MC
/* ***** Temporary allocator
*
* This is used before we have found the real malloc implementation with dlsym.
*/
-#define BUFFER_SIZE 32
+#ifdef __FreeBSD__ /* FreeBSD require more memory, other might */
+# define BUFFER_SIZE 256
+#else /* Valid on: Linux */
+# define BUFFER_SIZE 32
+#endif
static size_t fake_alloc_index;
static uint64_t buffer[BUFFER_SIZE];
size_t count = n / sizeof(uint64_t);
if (n % sizeof(uint64_t))
count++;
- // Check that we have enough availabel memory:
+ // Check that we have enough available memory:
if (fake_alloc_index + count >= BUFFER_SIZE)
exit(127);
// Allocate it:
if (__malloc_use_mmalloc) {
__mmalloc_current_heap = mmalloc_preinit();
} else {
+#if HAVE_DLFUNC
+ mm_real_realloc = (void *(*)(void *, size_t))dlfunc(RTLD_NEXT, "realloc");
+ mm_real_malloc = (void *(*)(size_t))dlfunc(RTLD_NEXT, "malloc");
+ mm_real_free = (void (*)(void *))dlfunc(RTLD_NEXT, "free");
+ mm_real_calloc = (void *(*)(size_t, size_t))dlfunc(RTLD_NEXT, "calloc");
+#else
mm_real_realloc = dlsym(RTLD_NEXT, "realloc");
mm_real_malloc = dlsym(RTLD_NEXT, "malloc");
mm_real_free = dlsym(RTLD_NEXT, "free");
mm_real_calloc = dlsym(RTLD_NEXT, "calloc");
+#endif
}
mm_initializing = 0;
mm_initialized = 1;
mfree(mdp, p);
UNLOCK(mdp);
}
-#endif /* HAVE_MC */
+#endif /* SIMGRID_HAVE_MC */