#include "src/mc/Process.hpp"
#include "src/mc/mc_smx.h"
-extern "C" {
-
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_visited, mc,
"Logging specific to state equaity detection mechanisms");
-}
-
namespace simgrid {
namespace mc {
xbt_dynar_t visited_pairs;
-
-}
-}
-
xbt_dynar_t visited_states;
-static int is_exploration_stack_state(mc_visited_state_t state){
+static int is_exploration_stack_state(simgrid::mc::VisitedState* state){
xbt_fifo_item_t item = xbt_fifo_get_first_item(mc_stack);
while (item) {
if (((mc_state_t)xbt_fifo_get_item_content(item))->num == state->num){
return 0;
}
-void visited_state_free(mc_visited_state_t state)
-{
- if (!state)
- return;
- if(!is_exploration_stack_state(state))
- delete state->system_state;
- xbt_free(state);
-}
-
-void visited_state_free_voidp(void *s)
-{
- visited_state_free((mc_visited_state_t) * (void **) s);
-}
-
/**
* \brief Save the current state
* \return Snapshot of the current state.
*/
-static mc_visited_state_t visited_state_new()
+VisitedState::VisitedState()
{
simgrid::mc::Process* process = &(mc_model_checker->process());
- mc_visited_state_t new_state = xbt_new0(s_mc_visited_state_t, 1);
- new_state->heap_bytes_used = mmalloc_get_bytes_used_remote(
+ this->heap_bytes_used = mmalloc_get_bytes_used_remote(
process->get_heap()->heaplimit,
process->get_malloc_info());
- MC_process_smx_refresh(&mc_model_checker->process());
- new_state->nb_processes =
- mc_model_checker->process().smx_process_infos.size();
+ this->nb_processes =
+ mc_model_checker->process().simix_processes().size();
- new_state->system_state = simgrid::mc::take_snapshot(mc_stats->expanded_states);
- new_state->num = mc_stats->expanded_states;
- new_state->other_num = -1;
- return new_state;
+ this->num = mc_stats->expanded_states;
+ this->other_num = -1;
}
-namespace simgrid {
-namespace mc {
+VisitedState::~VisitedState()
+{
+ if(!is_exploration_stack_state(this))
+ delete this->system_state;
+}
VisitedPair::VisitedPair(int pair_num, xbt_automaton_state_t automaton_state, xbt_dynar_t atomic_propositions, mc_state_t graph_state)
{
process->get_heap()->heaplimit,
process->get_malloc_info());
- MC_process_smx_refresh(&mc_model_checker->process());
this->nb_processes =
- mc_model_checker->process().smx_process_infos.size();
+ mc_model_checker->process().simix_processes().size();
this->automaton_state = automaton_state;
this->num = pair_num;
nb_processes = ((simgrid::mc::VisitedPair*) ref)->nb_processes;
heap_bytes_used = ((simgrid::mc::VisitedPair*) ref)->heap_bytes_used;
} else {
- nb_processes = ((mc_visited_state_t) ref)->nb_processes;
- heap_bytes_used = ((mc_visited_state_t) ref)->heap_bytes_used;
+ nb_processes = ((simgrid::mc::VisitedState*) ref)->nb_processes;
+ heap_bytes_used = ((simgrid::mc::VisitedState*) ref)->heap_bytes_used;
}
int start = 0;
nb_processes_test = ((simgrid::mc::VisitedPair*) ref_test)->nb_processes;
heap_bytes_used_test = ((simgrid::mc::VisitedPair*) ref_test)->heap_bytes_used;
} else {
- ref_test = (mc_visited_state_t) xbt_dynar_get_as(list, cursor, mc_visited_state_t);
- nb_processes_test = ((mc_visited_state_t) ref_test)->nb_processes;
- heap_bytes_used_test = ((mc_visited_state_t) ref_test)->heap_bytes_used;
+ ref_test = (simgrid::mc::VisitedState*) xbt_dynar_get_as(list, cursor, simgrid::mc::VisitedState*);
+ nb_processes_test = ((simgrid::mc::VisitedState*) ref_test)->nb_processes;
+ heap_bytes_used_test = ((simgrid::mc::VisitedState*) ref_test)->heap_bytes_used;
}
if (nb_processes_test < nb_processes)
start = cursor + 1;
nb_processes_test = ((simgrid::mc::VisitedPair*) ref_test)->nb_processes;
heap_bytes_used_test = ((simgrid::mc::VisitedPair*) ref_test)->heap_bytes_used;
} else {
- ref_test = (mc_visited_state_t) xbt_dynar_get_as(list, previous_cursor, mc_visited_state_t);
- nb_processes_test = ((mc_visited_state_t) ref_test)->nb_processes;
- heap_bytes_used_test = ((mc_visited_state_t) ref_test)->heap_bytes_used;
+ ref_test = (simgrid::mc::VisitedState*) xbt_dynar_get_as(list, previous_cursor, simgrid::mc::VisitedState*);
+ nb_processes_test = ((simgrid::mc::VisitedState*) ref_test)->nb_processes;
+ heap_bytes_used_test = ((simgrid::mc::VisitedState*) ref_test)->heap_bytes_used;
}
if (nb_processes_test != nb_processes || heap_bytes_used_test != heap_bytes_used)
break;
nb_processes_test = ((simgrid::mc::VisitedPair*) ref_test)->nb_processes;
heap_bytes_used_test = ((simgrid::mc::VisitedPair*) ref_test)->heap_bytes_used;
} else {
- ref_test = (mc_visited_state_t) xbt_dynar_get_as(list, next_cursor, mc_visited_state_t);
- nb_processes_test = ((mc_visited_state_t) ref_test)->nb_processes;
- heap_bytes_used_test = ((mc_visited_state_t) ref_test)->heap_bytes_used;
+ ref_test = (simgrid::mc::VisitedState*) xbt_dynar_get_as(list, next_cursor, simgrid::mc::VisitedState*);
+ nb_processes_test = ((simgrid::mc::VisitedState*) ref_test)->nb_processes;
+ heap_bytes_used_test = ((simgrid::mc::VisitedState*) ref_test)->heap_bytes_used;
}
if (nb_processes_test != nb_processes || heap_bytes_used_test != heap_bytes_used)
break;
static
void replace_state(
- mc_visited_state_t state_test, mc_visited_state_t new_state, int cursor)
+ simgrid::mc::VisitedState* state_test, simgrid::mc::VisitedState* new_state, int cursor)
{
if (state_test->other_num == -1)
new_state->other_num = state_test->num;
/* Replace the old state with the new one (with a bigger num)
(when the max number of visited states is reached, the oldest
one is removed according to its number (= with the min number) */
- xbt_dynar_remove_at(visited_states, cursor, nullptr);
- xbt_dynar_insert_at(visited_states, cursor, &new_state);
+ xbt_dynar_remove_at(simgrid::mc::visited_states, cursor, nullptr);
+ xbt_dynar_insert_at(simgrid::mc::visited_states, cursor, &new_state);
XBT_DEBUG("Replace visited state %d with the new visited state %d",
state_test->num, new_state->num);
}
static
-bool some_dommunications_are_not_finished()
+bool some_communications_are_not_finished()
{
for (size_t current_process = 1; current_process < MC_smx_get_maxpid(); current_process++) {
xbt_dynar_t pattern = xbt_dynar_get_as(
return false;
}
+namespace simgrid {
+namespace mc {
+
/**
* \brief Checks whether a given state has already been visited by the algorithm.
*/
-
-mc_visited_state_t is_visited_state(mc_state_t graph_state)
+simgrid::mc::VisitedState* is_visited_state(mc_state_t graph_state)
{
if (_sg_mc_visited == 0)
return nullptr;
communications are not finished (at least, data are transfered). These communications
are incomplete and they cannot be analyzed and compared with the initial pattern. */
int partial_comm = (_sg_mc_comms_determinism || _sg_mc_send_determinism) &&
- some_dommunications_are_not_finished();
+ some_communications_are_not_finished();
- mc_visited_state_t new_state = visited_state_new();
+ simgrid::mc::VisitedState* new_state = new VisitedState();
graph_state->system_state = new_state->system_state;
graph_state->in_visited_states = 1;
XBT_DEBUG("Snapshot %p of visited state %d (exploration stack state %d)", new_state->system_state, new_state->num, graph_state->num);
int cursor = min;
while (cursor <= max) {
- mc_visited_state_t state_test = (mc_visited_state_t) xbt_dynar_get_as(visited_states, cursor, mc_visited_state_t);
+ simgrid::mc::VisitedState* state_test = (simgrid::mc::VisitedState*) xbt_dynar_get_as(visited_states, cursor, simgrid::mc::VisitedState*);
if (snapshot_compare(state_test, new_state) == 0) {
// The state has been visited:
} else {
// The state has not been visited: insert the state in the dynamic array.
- mc_visited_state_t state_test = (mc_visited_state_t) xbt_dynar_get_as(visited_states, index, mc_visited_state_t);
+ simgrid::mc::VisitedState* state_test = (simgrid::mc::VisitedState*) xbt_dynar_get_as(visited_states, index, simgrid::mc::VisitedState*);
if (state_test->nb_processes < new_state->nb_processes)
xbt_dynar_insert_at(visited_states, index + 1, &new_state);
else if (state_test->heap_bytes_used < new_state->heap_bytes_used)
unsigned int cursor2 = 0;
unsigned int index2 = 0;
- mc_visited_state_t state_test;
+ simgrid::mc::VisitedState* state_test;
xbt_dynar_foreach(visited_states, cursor2, state_test)
if (!mc_model_checker->is_important_snapshot(*state_test->system_state)
&& state_test->num < min2) {
return nullptr;
}
-namespace simgrid {
-namespace mc {
-
/**
* \brief Checks whether a given pair has already been visited by the algorithm.
*/
