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
mc: that FIXME was easy to fix :)
[simgrid.git]
/
src
/
mc
/
mc_private.hpp
diff --git
a/src/mc/mc_private.hpp
b/src/mc/mc_private.hpp
index
09d17dc
..
d12942f
100644
(file)
--- a/
src/mc/mc_private.hpp
+++ b/
src/mc/mc_private.hpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2007-201
7
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-201
9
. 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. */
@@
-16,23
+16,19
@@
namespace simgrid {
namespace mc {
struct DerefAndCompareByActorsCountAndUsedHeap {
namespace mc {
struct DerefAndCompareByActorsCountAndUsedHeap {
- 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->actors_count, a->heap_bytes_used) < std::make_pair(b->actors_count, 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);
}
};
-
}
}
}
}
-SG_BEGIN_DECL()
-
/********************************* MC Global **********************************/
XBT_PRIVATE void MC_init_dot_output();
/********************************* MC Global **********************************/
XBT_PRIVATE void MC_init_dot_output();
-XBT_PRIVATE extern FILE
*
dot_output;
+XBT_PRIVATE extern FILE
*
dot_output;
XBT_PRIVATE void MC_show_deadlock(void);
XBT_PRIVATE void MC_show_deadlock(void);
@@
-42,21
+38,17
@@
XBT_PRIVATE void MC_show_deadlock(void);
#define MC_VERBOSE 1
/********************************** Miscellaneous **********************************/
#define MC_VERBOSE 1
/********************************** Miscellaneous **********************************/
-
-SG_END_DECL()
-
namespace simgrid {
namespace mc {
namespace simgrid {
namespace mc {
-XBT_PRIVATE void find_object_address(
-
std::vector<simgrid::xbt::VmMap> const& maps,
simgrid::mc::ObjectInformation* result);
+XBT_PRIVATE void find_object_address(
std::vector<simgrid::xbt::VmMap> const& maps,
+
simgrid::mc::ObjectInformation* result);
XBT_PRIVATE
XBT_PRIVATE
-int snapshot_compare(
int num1, simgrid::mc::Snapshot* s1, int num2, simgrid::mc::
Snapshot* s2);
+int snapshot_compare(
Snapshot* s1,
Snapshot* s2);
// Move is somewhere else (in the LivenessChecker class, in the Session class?):
extern XBT_PRIVATE xbt_automaton_t property_automaton;
// Move is somewhere else (in the LivenessChecker class, in the Session class?):
extern XBT_PRIVATE xbt_automaton_t property_automaton;
-
}
}
}
}