X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4ebc53f4ea63c0ec84680e5484ad9c9a81c85ff3..60a27a0410114e3ad562913b49aa362643fb2237:/src/simix/popping.cpp diff --git a/src/simix/popping.cpp b/src/simix/popping.cpp index 34e4a71043..70d34c7f44 100644 --- a/src/simix/popping.cpp +++ b/src/simix/popping.cpp @@ -1,19 +1,9 @@ -/* Copyright (c) 2010-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2010-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. */ #include "smx_private.hpp" -#include "xbt/xbt_os_thread.h" -#if SIMGRID_HAVE_MC -#include "src/mc/mc_private.hpp" -#endif - -#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/SynchroRaw.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_popping, simix, "Popping part of SIMIX (transmuting from user request into kernel handlers)"); @@ -26,11 +16,11 @@ void SIMIX_simcall_answer(smx_simcall_t simcall) 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. */ - if (std::find(begin(simix_global->process_to_run), end(simix_global->process_to_run), simcall->issuer) != - end(simix_global->process_to_run)) + if (std::find(begin(simix_global->actors_to_run), end(simix_global->actors_to_run), simcall->issuer) != + end(simix_global->actors_to_run)) DIE_IMPOSSIBLE; #endif - simix_global->process_to_run.push_back(simcall->issuer); + simix_global->actors_to_run.push_back(simcall->issuer); } }