A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
namespacify a global function of SIMIX
[simgrid.git]
/
src
/
mc
/
mc_record.cpp
diff --git
a/src/mc/mc_record.cpp
b/src/mc/mc_record.cpp
index
5939b84
..
685c491
100644
(file)
--- a/
src/mc/mc_record.cpp
+++ b/
src/mc/mc_record.cpp
@@
-1,30
+1,14
@@
-/* Copyright (c) 2014-2017. 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. */
/* 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 <stdexcept>
-#include <sstream>
-#include <string>
-
-#include "xbt/log.h"
-#include "xbt/sysdep.h"
-
-#include "simgrid/simix.h"
-
-#include "src/kernel/context/Context.hpp"
#include "src/mc/mc_record.hpp"
#include "src/mc/mc_record.hpp"
-#include "src/mc/mc_replay.h"
-#include "src/simix/ActorImpl.hpp"
-#include "src/simix/smx_private.hpp"
-
-#include "src/mc/mc_base.h"
+#include "src/kernel/activity/CommImpl.hpp"
+#include "src/kernel/context/Context.hpp"
#include "src/mc/Transition.hpp"
#include "src/mc/Transition.hpp"
+#include "src/mc/mc_base.h"
+#include "src/mc/mc_replay.hpp"
#if SIMGRID_HAVE_MC
#include "src/mc/checker/Checker.hpp"
#if SIMGRID_HAVE_MC
#include "src/mc/checker/Checker.hpp"
@@
-34,12
+18,7
@@
#include "src/mc/mc_state.hpp"
#endif
#include "src/mc/mc_state.hpp"
#endif
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_record, mc,
- " Logging specific to MC record/replay facility");
-
-extern "C" {
-char* MC_record_path = nullptr;
-}
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_record, mc, "Logging specific to MC record/replay facility");
namespace simgrid {
namespace mc {
namespace simgrid {
namespace mc {
@@
-67,10
+46,10
@@
void replay(RecordTrace const& trace)
}
}
}
}
-void replay(const
char*
path_string)
+void replay(const
std::string&
path_string)
{
{
- simgrid::mc::processes_time.resize(
SIMIX_process_
get_maxpid());
- simgrid::mc::RecordTrace trace = simgrid::mc::parseRecordTrace(path_string);
+ simgrid::mc::processes_time.resize(
simgrid::kernel::actor::
get_maxpid());
+ simgrid::mc::RecordTrace trace = simgrid::mc::parseRecordTrace(path_string
.c_str()
);
simgrid::mc::replay(trace);
simgrid::mc::processes_time.clear();
}
simgrid::mc::replay(trace);
simgrid::mc::processes_time.clear();
}
@@
-80,7
+59,7
@@
RecordTrace parseRecordTrace(const char* data)
RecordTrace res;
XBT_INFO("path=%s", data);
if (data == nullptr || data[0] == '\0')
RecordTrace res;
XBT_INFO("path=%s", data);
if (data == nullptr || data[0] == '\0')
- throw std::
runtime_error
("Could not parse record path");
+ throw std::
invalid_argument
("Could not parse record path");
const char* current = data;
while (*current) {
const char* current = data;
while (*current) {
@@
-88,7
+67,7
@@
RecordTrace parseRecordTrace(const char* data)
simgrid::mc::Transition item;
int count = sscanf(current, "%d/%d", &item.pid, &item.argument);
if(count != 2 && count != 1)
simgrid::mc::Transition item;
int count = sscanf(current, "%d/%d", &item.pid, &item.argument);
if(count != 2 && count != 1)
- throw std::
runtime_error
("Could not parse record path");
+ throw std::
invalid_argument
("Could not parse record path");
res.push_back(item);
// Find next chunk:
res.push_back(item);
// Find next chunk:
@@
-119,10
+98,8
@@
std::string traceToString(simgrid::mc::RecordTrace const& trace)
void dumpRecordPath()
{
void dumpRecordPath()
{
- if (MC_record_is_active()) {
- RecordTrace trace = mc_model_checker->getChecker()->getRecordTrace();
- XBT_INFO("Path = %s", traceToString(trace).c_str());
- }
+ RecordTrace trace = mc_model_checker->getChecker()->get_record_trace();
+ XBT_INFO("Path = %s", traceToString(trace).c_str());
}
#endif
}
#endif