-/* Copyright (c) 2008-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2008-2018. 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 "xbt/automaton.h"
#include "xbt/backtrace.hpp"
#include "xbt/dynar.h"
-#include "xbt/swag.h"
#include "mc_base.h"
#include "src/mc/mc_request.hpp"
#include "src/mc/mc_safety.hpp"
#include "src/mc/mc_smx.hpp"
-#include "src/mc/mc_snapshot.hpp"
#include "src/mc/mc_unw.hpp"
+#include "src/mc/sosp/mc_snapshot.hpp"
#include <libunwind.h>
#endif
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_global, mc, "Logging specific to MC (global)");
-extern std::string _sg_mc_dot_output_file;
-
namespace simgrid {
namespace mc {
void MC_init_dot_output()
{
- dot_output = fopen(_sg_mc_dot_output_file.c_str(), "w");
+ dot_output = fopen(_sg_mc_dot_output_file.get().c_str(), "w");
if (dot_output == nullptr) {
perror("Error open dot output file");
simgrid::mc::processes_time.resize(SIMIX_process_get_maxpid());
MC_ignore_heap(simgrid::mc::processes_time.data(),
simgrid::mc::processes_time.size() * sizeof(simgrid::mc::processes_time[0]));
- for (auto const& kv : simix_global->process_list) {
- smx_actor_t actor = kv.second;
- MC_ignore_heap(&(actor->process_hookup), sizeof(actor->process_hookup));
- }
simgrid::mc::Client::get()->mainLoop();
simgrid::mc::processes_time.clear();
}
fprintf(file, " %i: %s (RIP=0x%" PRIx64 " RSP=0x%" PRIx64 ")\n", nframe, realname.get(), (std::uint64_t)rip,
(std::uint64_t)rsp);
#else
- fprintf(file, " %i: %s\n", nframe, realname ? realname : name);
+ fprintf(file, " %i: %s\n", nframe, realname.get());
#endif
++nframe;
if (simgrid::mc::processes_time.empty())
return 0;
if (process != nullptr)
- return simgrid::mc::processes_time[process->pid];
+ return simgrid::mc::processes_time[process->pid_];
return -1;
}
void MC_process_clock_add(smx_actor_t process, double amount)
{
- simgrid::mc::processes_time[process->pid] += amount;
+ simgrid::mc::processes_time[process->pid_] += amount;
}