-/* Copyright (c) 2016-2021. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2016-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 "src/kernel/activity/IoImpl.hpp"
#include "src/kernel/activity/MailboxImpl.hpp"
#include "src/kernel/activity/SleepImpl.hpp"
-#include "src/kernel/activity/SynchroRaw.hpp"
+#include "src/kernel/activity/Synchro.hpp"
#include "src/kernel/actor/ActorImpl.hpp"
-#include "src/surf/SplitDuplexLinkImpl.hpp"
+#include "src/kernel/resource/SplitDuplexLinkImpl.hpp"
#include <boost/intrusive/list.hpp>
#include <map>
namespace kernel {
// In MC mode, the application sends these pointers to the MC
xbt_dynar_t get_actors_addr();
-xbt_dynar_t get_dead_actors_addr();
class EngineImpl {
std::map<std::string, s4u::Host*, std::less<>> hosts_;
- std::map<std::string, resource::LinkImpl*, std::less<>> links_;
+ std::map<std::string, resource::StandardLinkImpl*, std::less<>> links_;
/* save split-duplex links separately, keep links_ with only LinkImpl* seen by the user
* members of a split-duplex are saved in the links_ */
std::map<std::string, std::unique_ptr<resource::SplitDuplexLinkImpl>, std::less<>> split_duplex_links_;
&actor::ActorImpl::kernel_destroy_list_hook>>
actors_to_destroy_;
#if SIMGRID_HAVE_MC
- /* MCer cannot read members actor_list_ and actors_to_destroy_ above in the remote process, so we copy the info it
- * needs in a dynar.
+ /* MCer cannot read members actor_list_ above in the remote process, so we copy the info it needs in a dynar.
* FIXME: This is supposed to be a temporary hack.
* A better solution would be to change the split between MCer and MCed, where the responsibility
* to compute the list of the enabled transitions goes to the MCed.
* These info could be published by the MCed to the MCer in a way inspired of vd.so
*/
xbt_dynar_t actors_vector_ = xbt_dynar_new(sizeof(actor::ActorImpl*), nullptr);
- xbt_dynar_t dead_actors_vector_ = xbt_dynar_new(sizeof(actor::ActorImpl*), nullptr);
#endif
std::vector<xbt::Task<void()>> tasks;
#if SIMGRID_HAVE_MC
xbt_dynar_t get_actors_vector() const { return actors_vector_; }
- xbt_dynar_t get_dead_actors_vector() const { return dead_actors_vector_; }
void reset_actor_dynar() { xbt_dynar_reset(actors_vector_); }
void add_actor_to_dynar(actor::ActorImpl* actor) { xbt_dynar_push_as(actors_vector_, actor::ActorImpl*, actor); }
- void add_dead_actor_to_dynar(actor::ActorImpl* actor)
- {
- xbt_dynar_push_as(dead_actors_vector_, actor::ActorImpl*, actor);
- }
#endif
const std::map<aid_t, actor::ActorImpl*>& get_actor_list() const { return actor_list_; }