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
simplify SIMIX_host_add_auto_restart_process
[simgrid.git]
/
src
/
simix
/
popping.cpp
diff --git
a/src/simix/popping.cpp
b/src/simix/popping.cpp
index
2672a4a
..
34e4a71
100644
(file)
--- a/
src/simix/popping.cpp
+++ b/
src/simix/popping.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2010-201
7
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2010-201
8
. 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. */
@@
-11,8
+11,8
@@
#include "src/kernel/activity/CommImpl.hpp"
#include "src/kernel/activity/ExecImpl.hpp"
#include "src/kernel/activity/CommImpl.hpp"
#include "src/kernel/activity/ExecImpl.hpp"
+#include "src/kernel/activity/IoImpl.hpp"
#include "src/kernel/activity/SleepImpl.hpp"
#include "src/kernel/activity/SleepImpl.hpp"
-#include "src/kernel/activity/SynchroIo.hpp"
#include "src/kernel/activity/SynchroRaw.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_popping, simix,
#include "src/kernel/activity/SynchroRaw.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_popping, simix,
@@
-22,7
+22,7
@@
void SIMIX_simcall_answer(smx_simcall_t simcall)
{
if (simcall->issuer != simix_global->maestro_process){
XBT_DEBUG("Answer simcall %s (%d) issued by %s (%p)", SIMIX_simcall_name(simcall->call), (int)simcall->call,
{
if (simcall->issuer != simix_global->maestro_process){
XBT_DEBUG("Answer simcall %s (%d) issued by %s (%p)", SIMIX_simcall_name(simcall->call), (int)simcall->call,
-
simcall->issuer->name.c_str
(), simcall->issuer);
+
simcall->issuer->get_cname
(), simcall->issuer);
simcall->issuer->simcall.call = SIMCALL_NONE;
#if 0
/* This check should be useless and slows everyone. Reactivate if you see something weird in process scheduling. */
simcall->issuer->simcall.call = SIMCALL_NONE;
#if 0
/* This check should be useless and slows everyone. Reactivate if you see something weird in process scheduling. */
@@
-34,9
+34,10
@@
void SIMIX_simcall_answer(smx_simcall_t simcall)
}
}
}
}
-void SIMIX_simcall_exit(smx_activity_t
synchro
)
+void SIMIX_simcall_exit(smx_activity_t
activity
)
{
{
- synchro->post();
+ if (activity != nullptr) // When migrating, the surf activity is disconnected from its simix activity before cancel
+ activity->post();
}
void SIMIX_run_kernel(std::function<void()> const* code)
}
void SIMIX_run_kernel(std::function<void()> const* code)