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] Make s_mc_snapshot_stack::stack_frames a std::vector
[simgrid.git]
/
src
/
mc
/
mc_hash.cpp
diff --git
a/src/mc/mc_hash.cpp
b/src/mc/mc_hash.cpp
index
6e11940
..
7709cc7
100644
(file)
--- a/
src/mc/mc_hash.cpp
+++ b/
src/mc/mc_hash.cpp
@@
-4,14
+4,15
@@
/* 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. */
+#include <cinttypes>
+
#include <stdint.h>
#include <stdbool.h>
#include "mc_private.h"
#include "mc/datatypes.h"
#include <mc/mc.h>
#include <stdint.h>
#include <stdbool.h>
#include "mc_private.h"
#include "mc/datatypes.h"
#include <mc/mc.h>
-
-extern "C" {
+#include "mc_hash.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_hash, mc, "Logging specific to mc_hash");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_hash, mc, "Logging specific to mc_hash");
@@
-82,7
+83,7
@@
static void mc_hash_value(mc_hash_t * hash, mc_hashing_state * state,
mc_object_info_t info, const void *address,
dw_type_t type)
{
mc_object_info_t info, const void *address,
dw_type_t type)
{
- mc_process_t process = &mc_model_checker->process;
+ mc_process_t process = &mc_model_checker->process
()
;
top:
switch (type->type) {
top:
switch (type->type) {
@@
-282,22
+283,22
@@
static void mc_hash_stack(mc_hash_t * hash, mc_snapshot_stack_t stack,
unsigned cursor = 0;
mc_stack_frame_t stack_frame;
unsigned cursor = 0;
mc_stack_frame_t stack_frame;
-
xbt_dynar_foreach(stack->stack_frames, cursor, stack_frame
) {
+
for(s_mc_stack_frame_t const& stack_frame : stack->stack_frames
) {
- MC_HASH(*hash, stack_frame
->
ip);
+ MC_HASH(*hash, stack_frame
.
ip);
mc_object_info_t info;
mc_object_info_t info;
- if (stack_frame
->
ip >= (unw_word_t) libsimgrid_info->start_exec
- && stack_frame
->
ip < (unw_word_t) libsimgrid_info->end_exec)
+ if (stack_frame
.
ip >= (unw_word_t) libsimgrid_info->start_exec
+ && stack_frame
.
ip < (unw_word_t) libsimgrid_info->end_exec)
info = libsimgrid_info;
info = libsimgrid_info;
- else if (stack_frame
->
ip >= (unw_word_t) binary_info->start_exec
- && stack_frame
->
ip < (unw_word_t) binary_info->end_exec)
+ else if (stack_frame
.
ip >= (unw_word_t) binary_info->start_exec
+ && stack_frame
.
ip < (unw_word_t) binary_info->end_exec)
info = binary_info;
else
continue;
info = binary_info;
else
continue;
- mc_hash_stack_frame(hash, info, &(stack_frame
->
unw_cursor),
- stack_frame
->frame, (void *) stack_frame->
frame_base,
+ mc_hash_stack_frame(hash, info, &(stack_frame
.
unw_cursor),
+ stack_frame
.frame, (void *) stack_frame.
frame_base,
state);
}
state);
}
@@
-320,7
+321,7
@@
static void mc_hash_stacks(mc_hash_t * hash, mc_hashing_state * state,
}
#endif
}
#endif
-uint64_t mc_hash_processes_state(int num_state,
xbt_dynar_t
stacks)
+uint64_t mc_hash_processes_state(int num_state,
std::vector<s_mc_snapshot_stack_t> const&
stacks)
{
XBT_DEBUG("START hash %i", num_state);
{
XBT_DEBUG("START hash %i", num_state);
@@
-342,5
+343,3
@@
uint64_t mc_hash_processes_state(int num_state, xbt_dynar_t stacks)
XBT_DEBUG("END hash %i", num_state);
return hash;
}
XBT_DEBUG("END hash %i", num_state);
return hash;
}
-
-}