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 #218 from Takishipp/MSG2S4U
[simgrid.git]
/
src
/
xbt
/
mmalloc
/
mm_legacy.c
diff --git
a/src/xbt/mmalloc/mm_legacy.c
b/src/xbt/mmalloc/mm_legacy.c
index
790ead6
..
a8962f7
100644
(file)
--- a/
src/xbt/mmalloc/mm_legacy.c
+++ b/
src/xbt/mmalloc/mm_legacy.c
@@
-11,14
+11,14
@@
#include <dlfcn.h>
#include <dlfcn.h>
-#include "src/mc/mc_base.h"
#include "mmprivate.h"
#include "mmprivate.h"
-#include "src/xbt_modinter.h"
#include "src/internal_config.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 <math.h>
-#include "src/mc/mc_protocol.h"
-/* ***** Whether to use `mmalloc` of the undrlying malloc ***** */
+/* ***** Whether to use `mmalloc` of the und
e
rlying malloc ***** */
static int __malloc_use_mmalloc;
static int __malloc_use_mmalloc;
@@
-51,14
+51,18
@@
xbt_mheap_t mmalloc_set_current_heap(xbt_mheap_t new_heap)
}
/* Override the malloc-like functions if MC is activated at compile time */
}
/* Override the malloc-like functions if MC is activated at compile time */
-#if HAVE_MC
+#if
SIMGRID_
HAVE_MC
/* ***** Temporary allocator
*
* This is used before we have found the real malloc implementation with dlsym.
*/
/* ***** 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];
static size_t fake_alloc_index;
static uint64_t buffer[BUFFER_SIZE];
@@
-72,7
+76,7
@@
static void* mm_fake_malloc(size_t n)
size_t count = n / sizeof(uint64_t);
if (n % sizeof(uint64_t))
count++;
size_t count = n / sizeof(uint64_t);
if (n % sizeof(uint64_t))
count++;
- // Check that we have enough availab
el
memory:
+ // Check that we have enough availab
le
memory:
if (fake_alloc_index + count >= BUFFER_SIZE)
exit(127);
// Allocate it:
if (fake_alloc_index + count >= BUFFER_SIZE)
exit(127);
// Allocate it:
@@
-263,4
+267,4
@@
void free(void *p)
mfree(mdp, p);
UNLOCK(mdp);
}
mfree(mdp, p);
UNLOCK(mdp);
}
-#endif /* HAVE_MC */
+#endif /*
SIMGRID_
HAVE_MC */