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
tiny doc improvement
[simgrid.git]
/
src
/
mc
/
mc_comm_pattern.cpp
diff --git
a/src/mc/mc_comm_pattern.cpp
b/src/mc/mc_comm_pattern.cpp
index
dfba80e
..
2be0e8e
100644
(file)
--- a/
src/mc/mc_comm_pattern.cpp
+++ b/
src/mc/mc_comm_pattern.cpp
@@
-1,19
+1,17
@@
-/* Copyright (c) 2007-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2007-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 <
string.h
>
+#include <
cstring
>
#include "xbt/dynar.h"
#include "xbt/sysdep.h"
#include "xbt/dynar.h"
#include "xbt/sysdep.h"
-#include <xbt/dynar.hpp>
-#include "src/mc/mc_comm_pattern.h"
-#include "src/mc/mc_smx.h"
-#include "src/mc/mc_xbt.hpp"
#include "src/mc/checker/CommunicationDeterminismChecker.hpp"
#include "src/mc/checker/CommunicationDeterminismChecker.hpp"
+#include "src/mc/mc_comm_pattern.hpp"
+#include "src/mc/mc_smx.hpp"
+#include "src/mc/mc_xbt.hpp"
using simgrid::mc::remote;
using simgrid::mc::remote;
@@
-86,10
+84,9
@@
void MC_handle_comm_pattern(
case MC_CALL_TYPE_WAIT:
case MC_CALL_TYPE_WAITANY:
{
case MC_CALL_TYPE_WAIT:
case MC_CALL_TYPE_WAITANY:
{
- simgrid::mc::RemotePtr<simgrid::kernel::activity::CommImpl> comm_addr
= nullptr
;
+ simgrid::mc::RemotePtr<simgrid::kernel::activity::CommImpl> comm_addr
{nullptr}
;
if (call_type == MC_CALL_TYPE_WAIT)
if (call_type == MC_CALL_TYPE_WAIT)
- comm_addr = remote(static_cast<simgrid::kernel::activity::CommImpl*>(
- simgrid::simix::unmarshal<simgrid::kernel::activity::ActivityImpl*>(req->result)));
+ comm_addr = remote(static_cast<simgrid::kernel::activity::CommImpl*>(simcall_comm_wait__getraw__comm(req)));
else {
simgrid::kernel::activity::CommImpl* addr;
else {
simgrid::kernel::activity::CommImpl* addr;
@@
-98,8
+95,7
@@
void MC_handle_comm_pattern(
value, sizeof(comm_addr));
comm_addr = remote(addr);
}
value, sizeof(comm_addr));
comm_addr = remote(addr);
}
- checker->complete_comm_pattern(pattern, comm_addr,
- MC_smx_simcall_get_issuer(req)->pid, backtracking);
+ checker->complete_comm_pattern(pattern, comm_addr, MC_smx_simcall_get_issuer(req)->pid_, backtracking);
}
break;
default:
}
break;
default: