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
Spelling fixes & a few cases of polishing the English (#329)
[simgrid.git]
/
src
/
mc
/
mc_record.cpp
diff --git
a/src/mc/mc_record.cpp
b/src/mc/mc_record.cpp
index
2881f48
..
4c7f441
100644
(file)
--- a/
src/mc/mc_record.cpp
+++ b/
src/mc/mc_record.cpp
@@
-1,45
+1,24
@@
-/* 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. */
/* 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/mc/mc_record.hpp"
+#include "src/kernel/activity/CommImpl.hpp"
#include "src/kernel/context/Context.hpp"
#include "src/kernel/context/Context.hpp"
-#include "src/simix/ActorImpl.hpp"
-#include "src/simix/smx_private.h"
-#include "src/mc/mc_replay.h"
-#include "src/mc/mc_record.h"
-
-#include "src/mc/mc_base.h"
#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
#if SIMGRID_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/checker/Checker.hpp"
#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
#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 {
@@
-49,29
+28,28
@@
void replay(RecordTrace const& trace)
simgrid::mc::wait_for_requests();
for (simgrid::mc::Transition const& transition : trace) {
simgrid::mc::wait_for_requests();
for (simgrid::mc::Transition const& transition : trace) {
- XBT_DEBUG("Executing %i$%i", transition.pid
, transition.argument
);
+ XBT_DEBUG("Executing %i$%i", transition.pid
_, transition.argument_
);
// Choose a request:
// Choose a request:
- smx_actor_t process = SIMIX_process_from_PID(transition.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);
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 (simcall == nullptr || 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:
xbt_die("Unexpected simcall.");
// Execute the request:
-
SIMIX_simcall_handle(simcall, transition.argument
);
+
simcall->issuer_->simcall_handle(transition.argument_
);
simgrid::mc::wait_for_requests();
}
}
simgrid::mc::wait_for_requests();
}
}
-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();
}
@@
-81,15
+59,15
@@
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) {
simgrid::mc::Transition item;
const char* current = data;
while (*current) {
simgrid::mc::Transition item;
- int count = sscanf(current, "%
u/%u", &item.pid, &item.argument
);
+ int count = sscanf(current, "%
d/%d", &item.pid_, &item.argument_
);
if(count != 2 && count != 1)
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:
@@
-111,19
+89,17
@@
std::string traceToString(simgrid::mc::RecordTrace const& trace)
for (auto i = trace.begin(); i != trace.end(); ++i) {
if (i != trace.begin())
stream << ';';
for (auto i = trace.begin(); i != trace.end(); ++i) {
if (i != trace.begin())
stream << ';';
- stream << i->pid;
- if (i->argument)
- stream << '/' << i->argument;
+ stream << i->pid
_
;
+ if (i->argument
_
)
+ stream << '/' << i->argument
_
;
}
return stream.str();
}
void dumpRecordPath()
{
}
return stream.str();
}
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