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
Refactorize and speedup a unit test
[simgrid.git]
/
src
/
mc
/
mc_record.cpp
diff --git
a/src/mc/mc_record.cpp
b/src/mc/mc_record.cpp
index
7896df8
..
8183746
100644
(file)
--- a/
src/mc/mc_record.cpp
+++ b/
src/mc/mc_record.cpp
@@
-1,46
+1,27
@@
-/* 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"
+#include "src/simix/ActorImpl.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
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_record, mc,
" Logging specific to MC record/replay facility");
#endif
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_record, mc,
" Logging specific to MC record/replay facility");
-extern "C" {
-char* MC_record_path = nullptr;
-}
-
namespace simgrid {
namespace mc {
namespace simgrid {
namespace mc {
@@
-54,11
+35,11
@@
void replay(RecordTrace const& trace)
// Choose a request:
smx_actor_t process = SIMIX_process_from_PID(transition.pid);
if (not process)
// Choose a request:
smx_actor_t process = SIMIX_process_from_PID(transition.pid);
if (not process)
- xbt_die("Unexpected process
."
);
+ xbt_die("Unexpected process
(pid:%d).", transition.pid
);
smx_simcall_t simcall = &(process->simcall);
if (not simcall || simcall->call == SIMCALL_NONE)
smx_simcall_t simcall = &(process->simcall);
if (not simcall || simcall->call == SIMCALL_NONE)
- xbt_die("No simcall for
this process."
);
- if (not simgrid::mc::request_is_visible(simcall) || not simgrid::mc::
request_is_enabled(simcall
))
+ 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:
@@
-67,10
+48,10
@@
void replay(RecordTrace const& trace)
}
}
}
}
-void replay(
const char*
path_string)
+void replay(
std::string
path_string)
{
simgrid::mc::processes_time.resize(SIMIX_process_get_maxpid());
{
simgrid::mc::processes_time.resize(SIMIX_process_get_maxpid());
- simgrid::mc::RecordTrace trace = simgrid::mc::parseRecordTrace(path_string);
+ 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,15
+61,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: