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 branch 'master' of https://framagit.org/simgrid/simgrid
[simgrid.git]
/
src
/
mc
/
mc_memory.cpp
diff --git
a/src/mc/mc_memory.cpp
b/src/mc/mc_memory.cpp
index
fde3cd6
..
15015f0
100644
(file)
--- a/
src/mc/mc_memory.cpp
+++ b/
src/mc/mc_memory.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2008-201
4
. The SimGrid Team.
+/* Copyright (c) 2008-201
9
. 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
@@
-8,14
+8,10
@@
#include <fcntl.h>
#include "xbt/log.h"
#include <fcntl.h>
#include "xbt/log.h"
-#include "xbt/dynar.h"
-#include "xbt/virtu.h"
#include "mc/mc.h"
#include "mc/mc.h"
-#include "mc_object_info.h"
-#include "mc_private.h"
-
-extern "C" {
+#include "src/mc/mc_private.hpp"
+#include "src/xbt/mmalloc/mmprivate.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_memory, mc,
"Logging specific to MC (memory)");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_memory, mc,
"Logging specific to MC (memory)");
@@
-24,15
+20,6
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_memory, mc,
/* It creates the two heap regions: std_heap and mc_heap */
void MC_memory_init()
{
/* It creates the two heap regions: std_heap and mc_heap */
void MC_memory_init()
{
- if (
!malloc_use_mmalloc()) {
+ if (
not malloc_use_mmalloc())
xbt_die("Model-checking support is not enabled: run with simgrid-mc.");
xbt_die("Model-checking support is not enabled: run with simgrid-mc.");
- }
-}
-
-/* Finalize the memory subsystem */
-#include "xbt_modinter.h"
-void MC_memory_exit(void)
-{
-}
-
}
}