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
[mc] Fix #includes
[simgrid.git]
/
src
/
mc
/
mc_smx.cpp
diff --git
a/src/mc/mc_smx.cpp
b/src/mc/mc_smx.cpp
index
78f86fe
..
b904885
100644
(file)
--- a/
src/mc/mc_smx.cpp
+++ b/
src/mc/mc_smx.cpp
@@
-7,8
+7,9
@@
#include <cassert>
#include <cstdlib>
#include <cassert>
#include <cstdlib>
+#include <vector>
+
#include <xbt/log.h>
#include <xbt/log.h>
-#include <xbt/dynar.h>
#include <xbt/str.h>
#include <xbt/swag.h>
#include <xbt/str.h>
#include <xbt/swag.h>
@@
-39,10
+40,10
@@
simgrid::mc::SimixProcessInformation* MC_smx_process_get_info(smx_process_t p)
return process_info;
}
return process_info;
}
-/** Load the remote swag of processes into a
dyna
r
+/** Load the remote swag of processes into a
vecto
r
*
* @param process MCed process
*
* @param process MCed process
- * @param target Local
dyna
r (to be filled with copies of `s_smx_process_t`)
+ * @param target Local
vecto
r (to be filled with copies of `s_smx_process_t`)
* @param remote_swag Address of the process SWAG in the remote list
*/
static void MC_process_refresh_simix_process_list(
* @param remote_swag Address of the process SWAG in the remote list
*/
static void MC_process_refresh_simix_process_list(
@@
-55,7
+56,7
@@
static void MC_process_refresh_simix_process_list(
s_xbt_swag_t swag;
process->read_bytes(&swag, sizeof(swag), remote(remote_swag));
s_xbt_swag_t swag;
process->read_bytes(&swag, sizeof(swag), remote(remote_swag));
- // Load each element of the
dyna
r from the MCed process:
+ // Load each element of the
vecto
r from the MCed process:
int i = 0;
for (smx_process_t p = (smx_process_t) swag.head; p; ++i) {
int i = 0;
for (smx_process_t p = (smx_process_t) swag.head; p; ++i) {
@@
-76,7
+77,6
@@
namespace mc {
void Process::refresh_simix()
{
void Process::refresh_simix()
{
- xbt_assert(mc_mode == MC_MODE_SERVER);
if (this->cache_flags_ & Process::cache_simix_processes)
return;
if (this->cache_flags_ & Process::cache_simix_processes)
return;
@@
-203,11
+203,8
@@
const char* MC_smx_process_get_name(smx_process_t p)
return nullptr;
simgrid::mc::SimixProcessInformation* info = MC_smx_process_get_info(p);
return nullptr;
simgrid::mc::SimixProcessInformation* info = MC_smx_process_get_info(p);
- if (info->name.empty()) {
- char* name = process->read_string(p->name);
- info->name = name;
- free(name);
- }
+ if (info->name.empty())
+ info->name = process->read_string(p->name);
return info->name.c_str();
}
return info->name.c_str();
}