-/* Copyright (c) 2008-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2008-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. */
#include <vector>
-#include <xbt/dynar.h>
-#include <xbt/automaton.h>
-#include <xbt/swag.h>
+#include "xbt/automaton.h"
+#include "xbt/dynar.h"
+#include "xbt/swag.h"
#include "mc_base.h"
#include "src/simix/ActorImpl.hpp"
-#if HAVE_MC
+#if SIMGRID_HAVE_MC
#include <libunwind.h>
#include "src/mc/mc_comm_pattern.h"
#include "src/mc/mc_request.h"
#include "src/mc/mc_private.h"
#include "src/mc/mc_unw.h"
#include "src/mc/mc_smx.h"
-#include "src/mc/Checker.hpp"
+#include "src/mc/checker/Checker.hpp"
#endif
-#include "src/mc/mc_record.h"
-#include "src/mc/mc_protocol.h"
-#include "src/mc/Client.hpp"
#include "src/mc/Transition.hpp"
+#include "src/mc/mc_record.h"
+#include "src/mc/remote/Client.hpp"
+#include "src/mc/remote/mc_protocol.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_global, mc, "Logging specific to MC (global)");
}
}
-#if HAVE_MC
+#if SIMGRID_HAVE_MC
/* Liveness */
void MC_run()
{
- simgrid::mc::processes_time.resize(simix_process_maxpid);
+ 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]));
- smx_process_t process;
- xbt_swag_foreach(process, simix_global->process_list)
- MC_ignore_heap(&(process->process_hookup), sizeof(process->process_hookup));
+ for (auto 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();
}
-void MC_show_deadlock(void)
+void MC_show_deadlock()
{
XBT_INFO("**************************");
XBT_INFO("*** DEAD-LOCK DETECTED ***");
unw_word_t off;
do {
- const char * name = !unw_get_proc_name(&cursor, buffer, 100, &off) ? buffer : "?";
+ const char* name = not unw_get_proc_name(&cursor, buffer, 100, &off) ? buffer : "?";
int status;
}
#endif
-double MC_process_clock_get(smx_process_t process)
+double MC_process_clock_get(smx_actor_t process)
{
if (simgrid::mc::processes_time.empty())
return 0;
return -1;
}
-void MC_process_clock_add(smx_process_t process, double amount)
+void MC_process_clock_add(smx_actor_t process, double amount)
{
simgrid::mc::processes_time[process->pid] += amount;
}