-/* Copyright (c) 2014-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2014-2019. 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. */
-#include <cstring>
-#include <cstdio>
-#include <cstdlib>
-
-#include <xbt/fifo.h>
-#include <xbt/log.h>
-#include <xbt/sysdep.h>
-
-#include "simgrid/simix.h"
-
-#include "src/simix/smx_private.h"
-#include "src/simix/smx_process_private.h"
-
-#include "src/mc/mc_replay.h"
-#include "src/mc/mc_record.h"
+#include "src/mc/mc_record.hpp"
+#include "src/kernel/activity/CommImpl.hpp"
+#include "src/kernel/context/Context.hpp"
+#include "src/mc/Transition.hpp"
#include "src/mc/mc_base.h"
-
-#if HAVE_MC
-#include "src/mc/mc_request.h"
-#include "src/mc/mc_private.h"
-#include "src/mc/mc_state.h"
-#include "src/mc/mc_smx.h"
-#include "src/mc/LivenessChecker.hpp"
+#include "src/mc/mc_replay.hpp"
+
+#if SIMGRID_HAVE_MC
+#include "src/mc/checker/Checker.hpp"
+#include "src/mc/mc_private.hpp"
+#include "src/mc/mc_request.hpp"
+#include "src/mc/mc_smx.hpp"
+#include "src/mc/mc_state.hpp"
#endif
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_record, mc,
- " Logging specific to MC record/replay facility");
-
-extern "C" {
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_record, mc, "Logging specific to MC record/replay facility");
-char* MC_record_path = nullptr;
+namespace simgrid {
+namespace mc {
-void MC_record_replay(mc_record_item_t start, std::size_t len)
+void replay(RecordTrace const& trace)
{
simgrid::mc::wait_for_requests();
- mc_record_item_t end = start + len;
- // Choose the recorded simcall and execute it:
- for (mc_record_item_t item=start;item!=end; ++item) {
-
- XBT_DEBUG("Executing %i$%i", item->pid, item->value);
-/*
- if (xbt_dynar_is_empty(simix_global->process_to_run))
- xbt_die("Unexpected end of application.");
-*/
+ for (simgrid::mc::Transition const& transition : trace) {
+ XBT_DEBUG("Executing %i$%i", transition.pid, transition.argument);
// Choose a request:
- smx_process_t process = SIMIX_process_from_PID(item->pid);
- if (!process)
- xbt_die("Unexpected process.");
+ smx_actor_t process = SIMIX_process_from_PID(transition.pid);
+ if (not process)
+ xbt_die("Unexpected process (pid:%d).", transition.pid);
smx_simcall_t simcall = &(process->simcall);
- if(!simcall || simcall->call == SIMCALL_NONE)
- xbt_die("No simcall for this process.");
- if (!simgrid::mc::request_is_visible(simcall)
- || !simgrid::mc::request_is_enabled(simcall))
+ if (not simcall || simcall->call == SIMCALL_NONE)
+ xbt_die("No simcall for process %d.", transition.pid);
+ if (not simgrid::mc::request_is_visible(simcall) || not simgrid::mc::actor_is_enabled(process))
xbt_die("Unexpected simcall.");
// Execute the request:
- SIMIX_simcall_handle(simcall, item->value);
+ SIMIX_simcall_handle(simcall, transition.argument);
simgrid::mc::wait_for_requests();
}
}
-xbt_dynar_t MC_record_from_string(const char* data)
+void replay(const std::string& path_string)
{
- XBT_INFO("path=%s", data);
- if (!data || !data[0])
- return nullptr;
+ simgrid::mc::processes_time.resize(SIMIX_process_get_maxpid());
+ simgrid::mc::RecordTrace trace = simgrid::mc::parseRecordTrace(path_string.c_str());
+ simgrid::mc::replay(trace);
+ simgrid::mc::processes_time.clear();
+}
- xbt_dynar_t dynar = xbt_dynar_new(sizeof(s_mc_record_item_t), nullptr);
+RecordTrace parseRecordTrace(const char* data)
+{
+ RecordTrace res;
+ XBT_INFO("path=%s", data);
+ if (data == nullptr || data[0] == '\0')
+ throw std::invalid_argument("Could not parse record path");
const char* current = data;
while (*current) {
- s_mc_record_item_t item = { 0, 0 };
- int count = sscanf(current, "%u/%u", &item.pid, &item.value);
+ simgrid::mc::Transition item;
+ int count = sscanf(current, "%d/%d", &item.pid, &item.argument);
if(count != 2 && count != 1)
- goto fail;
- xbt_dynar_push(dynar, &item);
+ throw std::invalid_argument("Could not parse record path");
+ res.push_back(item);
// Find next chunk:
const char* end = std::strchr(current, ';');
current = end + 1;
}
- return dynar;
-
-fail:
- xbt_dynar_free(&dynar);
- return nullptr;
+ return res;
}
-#if HAVE_MC
-static char* MC_record_stack_to_string_liveness(xbt_fifo_t stack)
-{
- char* buffer;
- std::size_t size;
- std::FILE* file = open_memstream(&buffer, &size);
-
- xbt_fifo_item_t item;
- xbt_fifo_item_t start = xbt_fifo_get_last_item(stack);
- for (item = start; item; item = xbt_fifo_get_prev_item(item)) {
- simgrid::mc::Pair* pair = (simgrid::mc::Pair*) xbt_fifo_get_item_content(item);
- int value;
- smx_simcall_t req = MC_state_get_executed_request(pair->graph_state, &value);
- if (req && req->call != SIMCALL_NONE) {
- smx_process_t issuer = MC_smx_simcall_get_issuer(req);
- const int pid = issuer->pid;
-
- // Serialization the (pid, value) pair:
- const char* sep = (item!=start) ? ";" : "";
- if (value)
- std::fprintf(file, "%s%u/%u", sep, pid, value);
- else
- std::fprintf(file, "%s%u", sep, pid);
- }
- }
+#if SIMGRID_HAVE_MC
- std::fclose(file);
- return buffer;
-}
-
-char* MC_record_stack_to_string(xbt_fifo_t stack)
+std::string traceToString(simgrid::mc::RecordTrace const& trace)
{
- if (_sg_mc_liveness)
- return MC_record_stack_to_string_liveness(stack);
-
- xbt_fifo_item_t start = xbt_fifo_get_last_item(stack);
-
- if (!start) {
- char* res = (char*) malloc(1 * sizeof(char));
- res[0] = '\0';
- return res;
+ std::ostringstream stream;
+ for (auto i = trace.begin(); i != trace.end(); ++i) {
+ if (i != trace.begin())
+ stream << ';';
+ stream << i->pid;
+ if (i->argument)
+ stream << '/' << i->argument;
}
-
- char* buffer;
- std::size_t size;
- std::FILE* file = open_memstream(&buffer, &size);
-
- xbt_fifo_item_t item;
- for (item = start; item; item = xbt_fifo_get_prev_item(item)) {
-
- // Find (pid, value):
- mc_state_t state = (mc_state_t) xbt_fifo_get_item_content(item);
- int value = 0;
- smx_simcall_t saved_req = MC_state_get_executed_request(state, &value);
- const smx_process_t issuer = MC_smx_simcall_get_issuer(saved_req);
- const int pid = issuer->pid;
-
- // Serialization the (pid, value) pair:
- const char* sep = (item!=start) ? ";" : "";
- if (value)
- std::fprintf(file, "%s%u/%u", sep, pid, value);
- else
- std::fprintf(file, "%s%u", sep, pid);
- }
-
- std::fclose(file);
- return buffer;
+ return stream.str();
}
-void MC_record_dump_path(xbt_fifo_t stack)
+void dumpRecordPath()
{
- if (MC_record_is_active()) {
- char* path = MC_record_stack_to_string(stack);
- XBT_INFO("Path = %s", path);
- std::free(path);
- }
+ RecordTrace trace = mc_model_checker->getChecker()->getRecordTrace();
+ XBT_INFO("Path = %s", traceToString(trace).c_str());
}
+
#endif
-void MC_record_replay_from_string(const char* path_string)
-{
- simgrid::mc::processes_time.resize(simix_process_maxpid);
- xbt_dynar_t path = MC_record_from_string(path_string);
- mc_record_item_t start = &xbt_dynar_get_as(path, 0, s_mc_record_item_t);
- MC_record_replay(start, xbt_dynar_length(path));
- xbt_dynar_free(&path);
- simgrid::mc::processes_time.clear();
}
-
}
