-/* 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;
void initialize(int* argc, char** argv);
void load_platform(const std::string& platf);
void load_deployment(const std::string& file) const;
+ void seal_platform() const;
void register_function(const std::string& name, const actor::ActorCodeFactory& code);
void register_default(const actor::ActorCodeFactory& code);
bool is_maestro(const actor::ActorImpl* actor) const { return actor == maestro_; }
void set_maestro(actor::ActorImpl* actor) { maestro_ = actor; }
actor::ActorImpl* get_maestro() const { return maestro_; }
- void destroy_maestro()
- {
- delete maestro_;
- maestro_ = nullptr;
- }
context::ContextFactory* get_context_factory() const { return context_factory_; }
void set_context_factory(context::ContextFactory* factory) { context_factory_ = factory; }
#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_; }
void display_all_actor_status() const;
void run_all_actors();
- /** @brief Run the main simulation loop. */
- void run();
+ /* @brief Finish simulation initialization
+ * This function must be called before the first call to solve()
+ */
+ void presolve() const;
+ /** @brief Performs a part of the simulation
+ * @param max_date Maximum date to update the simulation to, or -1
+ * @return the elapsed time, or -1.0 if no event could be executed
+ *
+ * This function execute all possible events, update the action states and returns the time elapsed.
+ * When you call execute or communicate on a model, the corresponding actions are not executed immediately but only
+ * when you call solve().
+ * Note that the returned elapsed time can be zero.
+ */
+ double solve(double max_date) const;
+
+ /** @brief Run the main simulation loop until the specified date (or infinitly if max_date is negative). */
+ void run(double max_date);
+
+ /** @brief Return the current time in milliseconds. */
+ static double get_clock();
};
} // namespace kernel