-/* Copyright (c) 2007-2014. The SimGrid Team.
+/* Copyright (c) 2007-2015. 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. */
-#ifndef MC_STATE_H
-#define MC_STATE_H
+#ifndef SIMGRID_MC_STATE_H
+#define SIMGRID_MC_STATE_H
+
+#include <xbt/base.h>
+#include <xbt/dynar.h>
#include <simgrid_config.h>
-#include "../simix/smx_private.h"
+#include "src/simix/smx_private.h"
+#include "src/mc/mc_snapshot.h"
SG_BEGIN_DECL()
-extern mc_global_t initial_global_state;
+extern XBT_PRIVATE mc_global_t initial_global_state;
/* Possible exploration status of a process in a state */
typedef enum {
* For example WAITANY is transformes into a WAIT and TESTANY into TEST.
* See `MC_state_set_executed_request()`.
*/
-typedef struct mc_state {
+typedef struct XBT_PRIVATE mc_state {
unsigned long max_pid; /* Maximum pid at state's creation time */
mc_procstate_t proc_status; /* State's exploration status by process */
s_smx_synchro_t internal_comm; /* To be referenced by the internal_req */
s_smx_simcall_t executed_req; /* The executed request of the state */
int req_num; /* The request number (in the case of a
multi-request like waitany ) */
- mc_snapshot_t system_state; /* Snapshot of system state */
+ simgrid::mc::Snapshot* system_state; /* Snapshot of system state */
int num;
+ int in_visited_states;
+ // comm determinism verification (xbt_dynar_t<xbt_dynar_t<mc_comm_pattern_t>):
+ xbt_dynar_t incomplete_comm_pattern;
+ xbt_dynar_t index_comm; // comm determinism verification
} s_mc_state_t, *mc_state_t;
-mc_state_t MC_state_new(void);
-void MC_state_delete(mc_state_t state);
-void MC_state_interleave_process(mc_state_t state, smx_process_t process);
-unsigned int MC_state_interleave_size(mc_state_t state);
-int MC_state_process_is_done(mc_state_t state, smx_process_t process);
-void MC_state_set_executed_request(mc_state_t state, smx_simcall_t req, int value);
-smx_simcall_t MC_state_get_executed_request(mc_state_t state, int *value);
-smx_simcall_t MC_state_get_internal_request(mc_state_t state);
-smx_simcall_t MC_state_get_request(mc_state_t state, int *value);
-void MC_state_remove_interleave_process(mc_state_t state, smx_process_t process);
+XBT_PRIVATE mc_state_t MC_state_new(void);
+XBT_PRIVATE void MC_state_delete(mc_state_t state, int free_snapshot);
+XBT_PRIVATE void MC_state_interleave_process(mc_state_t state, smx_process_t process);
+XBT_PRIVATE unsigned int MC_state_interleave_size(mc_state_t state);
+XBT_PRIVATE int MC_state_process_is_done(mc_state_t state, smx_process_t process);
+XBT_PRIVATE void MC_state_set_executed_request(mc_state_t state, smx_simcall_t req, int value);
+XBT_PRIVATE smx_simcall_t MC_state_get_executed_request(mc_state_t state, int *value);
+XBT_PRIVATE smx_simcall_t MC_state_get_internal_request(mc_state_t state);
+XBT_PRIVATE smx_simcall_t MC_state_get_request(mc_state_t state, int *value);
+XBT_PRIVATE void MC_state_remove_interleave_process(mc_state_t state, smx_process_t process);
SG_END_DECL()
+namespace simgrid {
+namespace mc {
+
+XBT_PRIVATE int snapshot_compare(mc_state_t state1, mc_state_t state2);
+
+}
+}
+
#endif