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
simcall_mutex_unlock is back but keep the simplification of another
[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 dfba80e0663119f35b6c5cff40c2a29ea7da108a..3f3d1bdaa1f6e001e749ad2ac7aa88d798ef120d 100644
(file)
--- a/
src/mc/mc_comm_pattern.cpp
+++ b/
src/mc/mc_comm_pattern.cpp
@@
-1,5
+1,4
@@
-/* Copyright (c) 2007-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2007-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. */
@@
-10,10
+9,10
@@
#include "xbt/sysdep.h"
#include <xbt/dynar.hpp>
#include "xbt/sysdep.h"
#include <xbt/dynar.hpp>
-#include "src/mc/mc_comm_pattern.h"
+#include "src/mc/checker/CommunicationDeterminismChecker.hpp"
+#include "src/mc/mc_comm_pattern.hpp"
#include "src/mc/mc_smx.h"
#include "src/mc/mc_xbt.hpp"
#include "src/mc/mc_smx.h"
#include "src/mc/mc_xbt.hpp"
-#include "src/mc/checker/CommunicationDeterminismChecker.hpp"
using simgrid::mc::remote;
using simgrid::mc::remote;
@@
-88,8
+87,7
@@
void MC_handle_comm_pattern(
{
simgrid::mc::RemotePtr<simgrid::kernel::activity::CommImpl> comm_addr = nullptr;
if (call_type == MC_CALL_TYPE_WAIT)
{
simgrid::mc::RemotePtr<simgrid::kernel::activity::CommImpl> comm_addr = nullptr;
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;