X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/03d36345c4247a907709b86c189a53f5f85bea88..a49a03122b2def71ff741e78d15b38cd1d171184:/src/mc/mc_record.h

diff --git a/src/mc/mc_record.h b/src/mc/mc_record.h
index 32577039d0..56a341008c 100644
--- a/src/mc/mc_record.h
+++ b/src/mc/mc_record.h
@@ -1,10 +1,10 @@
-/* Copyright (c) 2014. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2014-2017. 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. */
 
-/** \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
@@ -14,21 +14,32 @@
  *  passed to the application (without the MC specific arguments).
  */
 
-#ifndef MC_RECORD_H
-#define MC_RECORD_H
+#ifndef SIMGRID_MC_RECORD_H
+#define SIMGRID_MC_RECORD_H
 
-#include <stdbool.h>
+#include "src/mc/Transition.hpp"
+#include "xbt/base.h"
 
-#include "simgrid_config.h"
-#include "mc_record.h"
+#include <vector>
 
-SG_BEGIN_DECL()
+namespace simgrid {
+namespace mc {
 
-/** Replay path (if any) in string representation
- *
- *  This is a path as generated by `MC_record_stack_to_string()`.
+typedef std::vector<Transition> RecordTrace;
+
+/** Convert a string representation of the path into a array of `simgrid::mc::Transition`
  */
-extern char* MC_record_path;
+XBT_PRIVATE RecordTrace parseRecordTrace(const char* data);
+XBT_PRIVATE std::string traceToString(simgrid::mc::RecordTrace const& trace);
+XBT_PRIVATE void dumpRecordPath();
+
+XBT_PRIVATE void replay(RecordTrace const& trace);
+XBT_PRIVATE void replay(const char* trace);
+
+}
+}
+
+SG_BEGIN_DECL()
 
 /** Whether the MC record mode is enabled
  *
@@ -37,57 +48,8 @@ extern char* MC_record_path;
  */
 #define MC_record_is_active() _sg_do_model_check_record
 
-/** Whether the replay mode is enabled */
-static inline bool MC_record_replay_is_active(void) {
-  return MC_record_path;
-}
-
 // **** Data conversion
 
-/** 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;
-
-/** Convert a string representation of the path into a array of `s_mc_record_item_t`
- */
-xbt_dynar_t MC_record_from_string(const char* data);
-
-/** 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.
-*/
-char* MC_record_stack_to_string(xbt_fifo_t stack);
-
-/** Dump the path represented by a given stack in the log
- */
-void MC_record_dump_path(xbt_fifo_t stack);
-
-// ***** Replay
-
-/** Replay a path represented by the record items
- *
- *  \param start Array of record item
- *  \item  count Number of record items
- */
-void MC_record_replay(mc_record_item_t start, size_t count);
-
-/** Replay a path represented by a string
- *
- *  \param data String representation of the path
- */
-void MC_record_replay_from_string(const char* data);
-
 SG_END_DECL()
 
 #endif