-/* Copyright (c) 2010-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2010-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. */
-#include "smx_private.h"
-#include "xbt/fifo.h"
+#include "smx_private.hpp"
#include "xbt/xbt_os_thread.h"
-#if HAVE_MC
-#include "src/mc/mc_private.h"
+#if SIMGRID_HAVE_MC
+#include "src/mc/mc_private.hpp"
#endif
-#include "src/simix/SynchroExec.hpp"
-#include "src/simix/SynchroComm.hpp"
-#include "src/simix/SynchroSleep.hpp"
-#include "src/simix/SynchroRaw.hpp"
-#include "src/simix/SynchroIo.hpp"
+#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)");
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;
-/* This check should be useless and slows everyone. Reactivate if you see something
- * weird in process scheduling.
- */
-/* if(!xbt_dynar_member(simix_global->process_to_run, &(simcall->issuer))) */
- xbt_dynar_push_as(simix_global->process_to_run, smx_process_t, simcall->issuer);
-/* else DIE_IMPOSSIBLE; */
+#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_synchro_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)
/** Kernel code for run_blocking
*
- * This looks a lot like SIMIX_run_kernel ^^
+ * The implementtion 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.