-/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-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. */
void_pfn_smxprocess_t cleanup_func,
smx_actor_t simix_process)
{
- xbt_assert(simix_global, "simix is not initialized, please call MSG_init first");
return simix_global->context_factory->create_context(
std::move(code), cleanup_func, simix_process);
}
}
Context::Context(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t actor)
- : code_(std::move(code)), actor_(actor)
+ : code_(std::move(code)), cleanup_func_(cleanup_func), actor_(actor)
{
- /* If the user provided a function for the process then use it.
- Otherwise, it is the context for maestro and we should set it as the
- current context */
- if (has_code())
- this->cleanup_func_ = cleanup_func;
- else
+ /* If no function was provided, this is the context for maestro
+ * and we should set it as the current context */
+ if (not has_code())
set_current(this);
}
{
if (this->cleanup_func_)
this->cleanup_func_(this->actor_);
- this->actor_->suspended_ = 0;
+ this->actor_->suspended_ = false;
this->iwannadie = false;
simgrid::simix::simcall([this] { SIMIX_process_cleanup(this->actor_); });