X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8124a6e953514591598498420b205dec1af7b7d1..bbe4982c906909c5740a69715b80174c2b800078:/src/mc/mc_record.h

diff --git a/src/mc/mc_record.h b/src/mc/mc_record.h
index 88911c00c7..ec24b70d49 100644
--- a/src/mc/mc_record.h
+++ b/src/mc/mc_record.h
@@ -4,7 +4,8 @@
 /* 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. */
 
-/** \file
+/** \file mc_record.h
+ *
  *  This file contains the MC replay/record functionnality.
  *  A MC path may be recorded by using ``-cfg=model-check/record:1`'`.
  *  The path is written in the log output and an be replayed with MC disabled
@@ -17,64 +18,40 @@
 #ifndef SIMGRID_MC_RECORD_H
 #define SIMGRID_MC_RECORD_H
 
+#include <string>
+#include <vector>
+
 #include <xbt/base.h>
-#include <xbt/dynar.h>
-#include <xbt/fifo.h>
 
-SG_BEGIN_DECL()
+#include "src/mc/Transition.hpp"
 
-/** Whether the MC record mode is enabled
- *
- *  The behaviour is not changed. The only real difference is that
- *  the path is writtent in the log when an interesting path is found.
- */
-#define MC_record_is_active() _sg_do_model_check_record
-
-// **** Data conversion
+namespace simgrid {
+namespace mc {
 
-/** An element in the recorded path
- *
- *  At each decision point, we need to record which process transition
- *  is trigerred and potentially which value is associated with this
- *  transition. The value is used to find which communication is triggerred
- *  in things like waitany and for associating a given value of MC_random()
- *  calls.
- */
-typedef struct s_mc_record_item {
-  int pid;
-  int value;
-} s_mc_record_item_t, *mc_record_item_t;
+typedef std::vector<Transition> RecordTrace;
 
-/** Convert a string representation of the path into a array of `s_mc_record_item_t`
+/** Convert a string representation of the path into a array of `simgrid::mc::Transition`
  */
-XBT_PRIVATE xbt_dynar_t MC_record_from_string(const char* data);
+XBT_PRIVATE RecordTrace parseRecordTrace(const char* data);
+XBT_PRIVATE std::string traceToString(simgrid::mc::RecordTrace const& trace);
+XBT_PRIVATE void dumpRecordPath();
 
-/** Generate a string representation
-*
-* The current format is a ";"-delimited list of pairs:
-* "pid0,value0;pid2,value2;pid3,value3". The value can be
-* omitted is it is null.
-*/
-XBT_PRIVATE char* MC_record_stack_to_string(xbt_fifo_t stack);
+XBT_PRIVATE void replay(RecordTrace const& trace);
+XBT_PRIVATE void replay(const char* trace);
 
-/** Dump the path represented by a given stack in the log
- */
-XBT_PRIVATE void MC_record_dump_path(xbt_fifo_t stack);
+}
+}
 
-// ***** Replay
+SG_BEGIN_DECL()
 
-/** Replay a path represented by the record items
+/** Whether the MC record mode is enabled
  *
- *  \param start Array of record item
- *  \item  count Number of record items
+ *  The behaviour is not changed. The only real difference is that
+ *  the path is writtent in the log when an interesting path is found.
  */
-XBT_PRIVATE void MC_record_replay(mc_record_item_t start, size_t count);
+#define MC_record_is_active() _sg_do_model_check_record
 
-/** Replay a path represented by a string
- *
- *  \param data String representation of the path
- */
-XBT_PRIVATE void MC_record_replay_from_string(const char* data);
+// **** Data conversion
 
 SG_END_DECL()