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
Remove feature: reset PID on killall()
[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 e8a5c1d8f91753f8081f6e59e64bf36d95010c06..8120382522c1b27d09b4358e06c43f1c27597ce5 100644
(file)
--- a/
src/xbt/mmalloc/mm_legacy.c
+++ b/
src/xbt/mmalloc/mm_legacy.c
@@
-1,4
+1,4
@@
-/* Copyright (c) 2010-201
5
. The SimGrid Team.
+/* Copyright (c) 2010-201
8
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-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,7
+51,7
@@
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
*
/* ***** Temporary allocator
*
@@
-76,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:
@@
-92,13
+92,14
@@
static void* mm_fake_calloc(size_t nmemb, size_t size)
return mm_fake_malloc(n);
}
return mm_fake_malloc(n);
}
-static void* mm_fake_realloc(
void *
p, size_t s)
+static void* mm_fake_realloc(
XBT_ATTRIB_UNUSED void*
p, size_t s)
{
return mm_fake_malloc(s);
}
{
return mm_fake_malloc(s);
}
-static void mm_fake_free(
void *
p)
+static void mm_fake_free(
XBT_ATTRIB_UNUSED void*
p)
{
{
+ // Nothing to do
}
/* Function signatures for the main malloc functions: */
}
/* Function signatures for the main malloc functions: */
@@
-118,7
+119,7
@@
static int mm_initialized;
/** Constructor functions used to initialize the malloc implementation
*/
/** Constructor functions used to initialize the malloc implementation
*/
-
static void __attribute__((constructor(101)))
mm_legacy_constructor()
+
XBT_ATTRIB_CONSTRUCTOR(101) static void
mm_legacy_constructor()
{
if (mm_initialized)
return;
{
if (mm_initialized)
return;
@@
-267,4
+268,4
@@
void free(void *p)
mfree(mdp, p);
UNLOCK(mdp);
}
mfree(mdp, p);
UNLOCK(mdp);
}
-#endif /* HAVE_MC */
+#endif /*
SIMGRID_
HAVE_MC */