{
auto promise = std::make_shared<simgrid::kernel::Promise<void>>();
auto future = promise->get_future();
- SIMIX_timer_set(date, [promise] {
- promise->set_value();
- });
+ simgrid::simix::Timer::set(date, [promise] { promise->set_value(); });
return future;
}
~~~
} // namespace kernel
namespace simix {
class Host;
+ class Timer;
}
namespace surf {
class Cpu;
typedef simgrid::s4u::VirtualMachine s4u_VM;
typedef boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl> smx_activity_t;
+typedef simgrid::simix::Timer* smx_timer_t;
typedef simgrid::kernel::context::Context* smx_context_t;
typedef simgrid::kernel::actor::ActorImpl* smx_actor_t;
typedef simgrid::kernel::activity::ConditionVariableImpl* smx_cond_t;
typedef struct s4u_VM s4u_VM;
typedef struct kernel_Activity* smx_activity_t;
+typedef struct s_smx_timer* smx_timer_t;
typedef struct s_smx_actor* smx_actor_t;
typedef struct s_smx_cond_t* smx_cond_t;
typedef struct s_smx_context* smx_context_t;
* auto promise = std::make_shared<simgrid::kernel::Promise<T>>();
* auto future = promise->get_future();
*
- * SIMIX_timer_set(date, [promise] {
+ * simgrid::simix::Timer::set(date, [promise] {
* try {
* int value = compute_the_value();
* if (value < 0)
XBT_PUBLIC void SIMIX_run();
XBT_PUBLIC double SIMIX_get_clock();
-/* Timer functions FIXME: should these be public? */
-typedef struct s_smx_timer_t* smx_timer_t;
-
XBT_PUBLIC smx_timer_t SIMIX_timer_set(double date, void (*function)(void*), void* arg);
XBT_PUBLIC void SIMIX_timer_remove(smx_timer_t timer);
XBT_PUBLIC double SIMIX_timer_next();
#include <xbt/future.hpp>
#include <xbt/signal.hpp>
+#include <boost/heap/fibonacci_heap.hpp>
#include <string>
#include <unordered_map>
}
namespace simgrid {
-
namespace simix {
/** Execute some code in the kernel/maestro
typedef std::function<ActorCode(std::vector<std::string> args)> ActorCodeFactory;
XBT_PUBLIC void register_function(const std::string& name, ActorCodeFactory factory);
-}
-}
+
+typedef std::pair<double, Timer*> TimerQelt;
+static boost::heap::fibonacci_heap<TimerQelt, boost::heap::compare<xbt::HeapComparator<TimerQelt>>> simix_timers;
+
+/** @brief Timer datatype */
+class Timer {
+ double date = 0.0;
+
+public:
+ decltype(simix_timers)::handle_type handle_;
+
+ Timer(double date, simgrid::xbt::Task<void()> callback) : date(date), callback(std::move(callback)) {}
+
+ simgrid::xbt::Task<void()> callback;
+ double get_date() { return date; }
+ void remove();
+
+ template <class F> static inline Timer* set(double date, F callback)
+ {
+ return set(date, simgrid::xbt::Task<void()>(std::move(callback)));
+ }
+
+ template <class R, class T> static inline Timer* set(double date, R (*callback)(T*), T* arg)
+ {
+ return set(date, [callback, arg]() { callback(arg); });
+ }
+
+ static Timer* set(double date, void (*callback)(void*), void* arg);
+ static Timer* set(double date, simgrid::xbt::Task<void()> callback);
+ static double next() { return simix_timers.empty() ? -1.0 : simix_timers.top().first; }
+};
+
+} // namespace simix
+} // namespace simgrid
XBT_PUBLIC smx_actor_t simcall_process_create(std::string name, simgrid::simix::ActorCode code, void* data,
sg_host_t host, std::unordered_map<std::string, std::string>* properties);
XBT_PUBLIC smx_timer_t SIMIX_timer_set(double date, simgrid::xbt::Task<void()> callback);
-template<class F> inline
-smx_timer_t SIMIX_timer_set(double date, F callback)
-{
- return SIMIX_timer_set(date, simgrid::xbt::Task<void()>(std::move(callback)));
-}
-
-template<class R, class T> inline
-smx_timer_t SIMIX_timer_set(double date, R(*callback)(T*), T* arg)
-{
- return SIMIX_timer_set(date, [callback, arg]() { callback(arg); });
-}
#endif
/* Unregister from the kill timer if any */
if (actor_->kill_timer != nullptr) {
- SIMIX_timer_remove(actor_->kill_timer);
+ actor_->kill_timer->remove();
actor_->kill_timer = nullptr;
}
if (kill_time <= SIMIX_get_clock())
return;
XBT_DEBUG("Set kill time %f for actor %s@%s", kill_time, get_cname(), host_->get_cname());
- kill_timer = SIMIX_timer_set(kill_time, [this] {
+ kill_timer = simix::Timer::set(kill_time, [this] {
this->exit();
kill_timer = nullptr;
});
double ActorImpl::get_kill_time()
{
- return SIMIX_timer_get_date(kill_timer);
+ return kill_timer ? kill_timer->get_date() : 0;
}
static void dying_daemon(int /*exit_status*/, void* data)
#include "src/mc/remote/Client.hpp"
#endif
-#include <boost/heap/fibonacci_heap.hpp>
XBT_LOG_NEW_CATEGORY(simix, "All SIMIX categories");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_kernel, simix, "Logging specific to SIMIX (kernel)");
std::unique_ptr<simgrid::simix::Global> simix_global;
-namespace {
-typedef std::pair<double, smx_timer_t> TimerQelt;
-boost::heap::fibonacci_heap<TimerQelt, boost::heap::compare<simgrid::xbt::HeapComparator<TimerQelt>>> simix_timers;
-}
-
-/** @brief Timer datatype */
-class s_smx_timer_t {
- double date = 0.0;
-
-public:
- decltype(simix_timers)::handle_type handle_;
- simgrid::xbt::Task<void()> callback;
- double getDate() { return date; }
- s_smx_timer_t(double date, simgrid::xbt::Task<void()> callback) : date(date), callback(std::move(callback)) {}
-};
-
void (*SMPI_switch_data_segment)(simgrid::s4u::ActorPtr) = nullptr;
bool _sg_do_verbose_exit = true;
#endif /* _WIN32 */
/********************************* SIMIX **************************************/
-double SIMIX_timer_next()
+namespace simgrid {
+namespace simix {
+
+Timer* Timer::set(double date, void (*callback)(void*), void* arg)
{
- return simix_timers.empty() ? -1.0 : simix_timers.top().first;
+ Timer* timer = new Timer(date, simgrid::xbt::make_task([callback, arg]() { callback(arg); }));
+ timer->handle_ = simix_timers.emplace(std::make_pair(date, timer));
+ return timer;
}
-namespace simgrid {
-namespace simix {
+Timer* Timer::set(double date, simgrid::xbt::Task<void()> callback)
+{
+ Timer* timer = new Timer(date, std::move(callback));
+ timer->handle_ = simix_timers.emplace(std::make_pair(date, timer));
+ return timer;
+}
+
+/** @brief cancels a timer that was added earlier */
+void Timer::remove()
+{
+ simgrid::simix::simix_timers.erase(handle_);
+ delete this;
+}
void Global::empty_trash()
{
/* Exit the SIMIX network module */
SIMIX_mailbox_exit();
- while (not simix_timers.empty()) {
- delete simix_timers.top().second;
- simix_timers.pop();
+ while (not simgrid::simix::simix_timers.empty()) {
+ delete simgrid::simix::simix_timers.top().second;
+ simgrid::simix::simix_timers.pop();
}
/* Free the remaining data structures */
simix_global->actors_to_run.clear();
static bool SIMIX_execute_timers()
{
bool result = false;
- while (not simix_timers.empty() && SIMIX_get_clock() >= simix_timers.top().first) {
+ while (not simgrid::simix::simix_timers.empty() && SIMIX_get_clock() >= simgrid::simix::simix_timers.top().first) {
result = true;
// FIXME: make the timers being real callbacks (i.e. provide dispatchers that read and expand the args)
- smx_timer_t timer = simix_timers.top().second;
- simix_timers.pop();
+ smx_timer_t timer = simgrid::simix::simix_timers.top().second;
+ simgrid::simix::simix_timers.pop();
try {
timer->callback();
} catch (...) {
}
}
- time = SIMIX_timer_next();
+ time = simgrid::simix::Timer::next();
if (time > -1.0 || not simix_global->process_list.empty()) {
XBT_DEBUG("Calling surf_solve");
time = surf_solve(time);
simgrid::s4u::on_simulation_end();
}
-/**
- * @brief Set the date to execute a function
- *
- * Set the date to execute the function on the surf.
- * @param date Date to execute function
- * @param callback Function to be executed
- * @param arg Parameters of the function
- *
- */
+double SIMIX_timer_next()
+{
+ return simgrid::simix::Timer::next();
+}
+
smx_timer_t SIMIX_timer_set(double date, void (*callback)(void*), void *arg)
{
- smx_timer_t timer = new s_smx_timer_t(date, simgrid::xbt::make_task([callback, arg]() { callback(arg); }));
- timer->handle_ = simix_timers.emplace(std::make_pair(date, timer));
- return timer;
+ return simgrid::simix::Timer::set(date, callback, arg);
}
smx_timer_t SIMIX_timer_set(double date, simgrid::xbt::Task<void()> callback)
{
- smx_timer_t timer = new s_smx_timer_t(date, std::move(callback));
- timer->handle_ = simix_timers.emplace(std::make_pair(date, timer));
+ smx_timer_t timer = new simgrid::simix::Timer(date, std::move(callback));
+ timer->handle_ = simgrid::simix::simix_timers.emplace(std::make_pair(date, timer));
return timer;
}
/** @brief cancels a timer that was added earlier */
void SIMIX_timer_remove(smx_timer_t timer) {
- simix_timers.erase(timer->handle_);
- delete timer;
+ timer->remove();
}
/** @brief Returns the date at which the timer will trigger (or 0 if nullptr timer) */
double SIMIX_timer_get_date(smx_timer_t timer) {
- return timer ? timer->getDate() : 0;
+ return timer ? timer->get_date() : 0;
}
void SIMIX_display_process_status()
if (timeout < 0.0){
simcall->timer = NULL;
} else {
- simcall->timer = SIMIX_timer_set(SIMIX_get_clock() + timeout, [simcall]() {
+ simcall->timer = simgrid::simix::Timer::set(SIMIX_get_clock() + timeout, [simcall]() {
SIMIX_waitany_remove_simcall_from_actions(simcall);
simcall_comm_waitany__set__result(simcall, -1);
SIMIX_simcall_answer(simcall);
if (simcall->call == SIMCALL_COMM_WAITANY) {
SIMIX_waitany_remove_simcall_from_actions(simcall);
if (simcall->timer) {
- SIMIX_timer_remove(simcall->timer);
+ simcall->timer->remove();
simcall->timer = nullptr;
}
if (not MC_is_active() && not MC_record_replay_is_active())
arg = new simgrid::kernel::actor::ProcessArg(actor_name, code, nullptr, host, kill_time, properties, auto_restart);
XBT_DEBUG("Process %s@%s will be started at time %f", arg->name.c_str(), arg->host->get_cname(), start_time);
- SIMIX_timer_set(start_time, [arg, auto_restart]() {
+ simgrid::simix::Timer::set(start_time, [arg, auto_restart]() {
simgrid::kernel::actor::ActorImplPtr actor = simgrid::kernel::actor::ActorImpl::create(
arg->name.c_str(), std::move(arg->code), arg->data, arg->host, arg->properties.get(), nullptr);
if (arg->kill_time >= 0)
{
auto promise = std::make_shared<simgrid::kernel::Promise<void>>();
auto future = promise->get_future();
- SIMIX_timer_set(date, [promise] { promise->set_value(); });
+ simgrid::simix::Timer::set(date, [promise] { promise->set_value(); });
return future;
}