Cleanup in log categories

[simgrid.git] / src / simix / popping.cpp

diff --git a/src/simix/popping.cpp b/src/simix/popping.cpp
index 2672a4a..b32b394 100644 (file)
--- a/src/simix/popping.cpp
+++ b/src/simix/popping.cpp
@@ -1,43 +1,12 @@
-/* Copyright (c) 2010-2017. 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 "xbt/xbt_os_thread.h"
-#if SIMGRID_HAVE_MC
-#include "src/mc/mc_private.hpp"
-#endif
+#include "src/simix/popping_private.hpp"
+#include "xbt/log.h"
 
-#include "src/kernel/activity/CommImpl.hpp"
-#include "src/kernel/activity/ExecImpl.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,
-                                "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->name.c_str(), 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. */
-    if (std::find(begin(simix_global->process_to_run), end(simix_global->process_to_run), simcall->issuer) !=
-        end(simix_global->process_to_run))
-      DIE_IMPOSSIBLE;
-#endif
-    simix_global->process_to_run.push_back(simcall->issuer);
-  }
-}
-
-void SIMIX_simcall_exit(smx_activity_t synchro)
-{
-  synchro->post();
-}
+XBT_LOG_NEW_DEFAULT_CATEGORY(simix, "transmuting from user request into kernel handlers");
 
 void SIMIX_run_kernel(std::function<void()> const* code)
 {
@@ -46,10 +15,10 @@ void SIMIX_run_kernel(std::function<void()> const* code)
 
 /** Kernel code for run_blocking
  *
- * The implementtion looks a lot like SIMIX_run_kernel ^^
+ * 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<void()> const* code)