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
use assignment to non-trivial class rather than artificial trivialization and memset
[simgrid.git]
/
src
/
mc
/
mc_record.cpp
diff --git
a/src/mc/mc_record.cpp
b/src/mc/mc_record.cpp
index
224eed8
..
4c7f441
100644
(file)
--- a/
src/mc/mc_record.cpp
+++ b/
src/mc/mc_record.cpp
@@
-28,20
+28,20
@@
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);
+ smx_actor_t process = SIMIX_process_from_PID(transition.pid
_
);
if (not process)
if (not process)
- xbt_die("Unexpected process (pid:%d).", transition.pid);
+ xbt_die("Unexpected process (pid:%d).", transition.pid
_
);
smx_simcall_t simcall = &(process->simcall);
smx_simcall_t simcall = &(process->simcall);
- if (
not simcall || simcall->call
== SIMCALL_NONE)
- xbt_die("No simcall for process %d.", transition.pid);
+ 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:
if (not simgrid::mc::request_is_visible(simcall) || not simgrid::mc::actor_is_enabled(process))
xbt_die("Unexpected simcall.");
// Execute the request:
- simcall->issuer
->simcall_handle(transition.argument
);
+ simcall->issuer
_->simcall_handle(transition.argument_
);
simgrid::mc::wait_for_requests();
}
}
simgrid::mc::wait_for_requests();
}
}
@@
-65,7
+65,7
@@
RecordTrace parseRecordTrace(const char* data)
while (*current) {
simgrid::mc::Transition item;
while (*current) {
simgrid::mc::Transition item;
- int count = sscanf(current, "%d/%d", &item.pid
, &item.argument
);
+ int count = sscanf(current, "%d/%d", &item.pid
_, &item.argument_
);
if(count != 2 && count != 1)
throw std::invalid_argument("Could not parse record path");
res.push_back(item);
if(count != 2 && count != 1)
throw std::invalid_argument("Could not parse record path");
res.push_back(item);
@@
-89,9
+89,9
@@
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();
}
}
return stream.str();
}