X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2a7d4ad7f01f69f55791fe640630ef269a2f9770..040d8fa855d2b6ac9884f68108a09b935570be21:/src/simix/popping.cpp diff --git a/src/simix/popping.cpp b/src/simix/popping.cpp index 21a1331021..b32b3948f4 100644 --- a/src/simix/popping.cpp +++ b/src/simix/popping.cpp @@ -1,26 +1,12 @@ -/* Copyright (c) 2010-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2010-2022. 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 "src/simix/popping_private.hpp" +#include "xbt/log.h" -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_popping, simix, - "Popping part of SIMIX (transmuting from user request into kernel handlers)"); - -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, - simcall->issuer->get_cname(), simcall->issuer); - simcall->issuer->simcall.call = SIMCALL_NONE; - xbt_assert(not XBT_LOG_ISENABLED(simix_popping, xbt_log_priority_debug) || - std::find(begin(simix_global->actors_to_run), end(simix_global->actors_to_run), simcall->issuer) == - end(simix_global->actors_to_run), - "Actor %p should not exist in actors_to_run!", simcall->issuer); - simix_global->actors_to_run.push_back(simcall->issuer); - } -} +XBT_LOG_NEW_DEFAULT_CATEGORY(simix, "transmuting from user request into kernel handlers"); void SIMIX_run_kernel(std::function const* code) { @@ -32,7 +18,7 @@ void SIMIX_run_kernel(std::function const* code) * The implementation looks a lot like SIMIX_run_kernel ^^ * * However, this `run_blocking` is blocking so the process will not be woken - * up until `SIMIX_simcall_answer(simcall)`` is called by the kernel. + * up until `ActorImpl::simcall_answer()`` is called by the kernel. * This means that `code` is responsible for doing this. */ void SIMIX_run_blocking(std::function const* code)