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 #177 from Takishipp/sd_exit
[simgrid.git]
/
src
/
mc
/
mc_private.h
diff --git
a/src/mc/mc_private.h
b/src/mc/mc_private.h
index
ad31323
..
0bdeb53
100644
(file)
--- a/
src/mc/mc_private.h
+++ b/
src/mc/mc_private.h
@@
-1,5
+1,4
@@
-/* Copyright (c) 2007-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2007-2017. 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. */
/* 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. */
@@
-7,46
+6,23
@@
#ifndef SIMGRID_MC_PRIVATE_H
#define SIMGRID_MC_PRIVATE_H
#ifndef SIMGRID_MC_PRIVATE_H
#define SIMGRID_MC_PRIVATE_H
-#include "simgrid_config.h"
-
-#include <sys/types.h>
-
-#include <stdio.h>
-#ifndef WIN32
-#include <sys/mman.h>
-#endif
-
-#include <elfutils/libdw.h>
-
-#include <simgrid/msg.h>
-#include <xbt/config.h>
-#include <xbt/base.h>
-#include <xbt/automaton.h>
-
#include "mc/mc.h"
#include "mc/mc.h"
-#include "mc/datatypes.h"
-#include "src/mc/mc_base.h"
-
-#include "src/simix/smx_private.h"
-#include "src/xbt/mmalloc/mmprivate.h"
+#include "xbt/automaton.h"
#ifdef __cplusplus
#include "src/mc/mc_forward.hpp"
#include "src/xbt/memory_map.hpp"
#endif
#ifdef __cplusplus
#include "src/mc/mc_forward.hpp"
#include "src/xbt/memory_map.hpp"
#endif
-#include "src/mc/mc_protocol.h"
-
#ifdef __cplusplus
namespace simgrid {
namespace mc {
#ifdef __cplusplus
namespace simgrid {
namespace mc {
-struct DerefAndCompareBy
NbProcesses
AndUsedHeap {
+struct DerefAndCompareBy
ActorsCount
AndUsedHeap {
template<class X, class Y>
bool operator()(X const& a, Y const& b)
{
template<class X, class Y>
bool operator()(X const& a, Y const& b)
{
- return std::make_pair(a->nb_processes, a->heap_bytes_used) <
- std::make_pair(b->nb_processes, b->heap_bytes_used);
+ return std::make_pair(a->actors_count, a->heap_bytes_used) < std::make_pair(b->actors_count, b->heap_bytes_used);
}
};
}
};
@@
-71,9
+47,6
@@
XBT_PRIVATE void MC_show_deadlock(void);
/********************************** Miscellaneous **********************************/
/********************************** Miscellaneous **********************************/
-XBT_PRIVATE void MC_report_assertion_error(void);
-XBT_PRIVATE void MC_report_crash(int status);
-
SG_END_DECL()
#ifdef __cplusplus
SG_END_DECL()
#ifdef __cplusplus