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 a more specific exception.
[simgrid.git]
/
src
/
mc
/
mc_record.cpp
diff --git
a/src/mc/mc_record.cpp
b/src/mc/mc_record.cpp
index
f5d3f2b
..
4af7633
100644
(file)
--- a/
src/mc/mc_record.cpp
+++ b/
src/mc/mc_record.cpp
@@
-1,5
+1,4
@@
-/* Copyright (c) 2014-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2014-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. */
/* 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. */
@@
-12,33
+11,32
@@
#include <sstream>
#include <string>
#include <sstream>
#include <string>
-#include
<xbt/log.h>
-#include
<xbt/sysdep.h>
+#include
"xbt/log.h"
+#include
"xbt/sysdep.h"
#include "simgrid/simix.h"
#include "simgrid/simix.h"
-#include "src/simix/smx_private.h"
-#include "src/simix/smx_process_private.h"
+#include "src/kernel/context/Context.hpp"
+#include "src/mc/mc_record.hpp"
+#include "src/mc/mc_replay.hpp"
+#include "src/simix/ActorImpl.hpp"
+#include "src/simix/smx_private.hpp"
-#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/mc_base.h"
#include "src/mc/Transition.hpp"
-#if 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
.hpp"
+#if
SIMGRID_
HAVE_MC
+#include "src/mc/
checker/Checker.hpp
"
+#include "src/mc/mc_private.h
pp
"
+#include "src/mc/mc_
request.hpp
"
+#include "src/mc/mc_smx.h
pp
"
+#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;
-}
+std::string MC_record_path;
namespace simgrid {
namespace mc {
namespace simgrid {
namespace mc {
@@
-51,14
+49,13
@@
void replay(RecordTrace const& trace)
XBT_DEBUG("Executing %i$%i", transition.pid, transition.argument);
// Choose a request:
XBT_DEBUG("Executing %i$%i", transition.pid, transition.argument);
// Choose a request:
- smx_
process
_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 (not simcall || 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:
@@
-67,10
+64,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_maxpid
);
- simgrid::mc::RecordTrace trace = simgrid::mc::parseRecordTrace(path_string);
+ simgrid::mc::processes_time.resize(
SIMIX_process_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,15
+77,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:
@@
-102,7
+99,7
@@
RecordTrace parseRecordTrace(const char* data)
return res;
}
return res;
}
-#if HAVE_MC
+#if
SIMGRID_
HAVE_MC
std::string traceToString(simgrid::mc::RecordTrace const& trace)
{
std::string traceToString(simgrid::mc::RecordTrace const& trace)
{