X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c01192e46cde5284797237ea9018333f4f97a742..ea74f5d95928a521a588737e81f1de94eef25d19:/include/simgrid/simix.hpp

diff --git a/include/simgrid/simix.hpp b/include/simgrid/simix.hpp
index e931b8300d..c9902637d6 100644
--- a/include/simgrid/simix.hpp
+++ b/include/simgrid/simix.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2021. The SimGrid Team.
+/* Copyright (c) 2007-2022. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -7,13 +7,11 @@
 #ifndef SIMGRID_SIMIX_HPP
 #define SIMGRID_SIMIX_HPP
 
+#include <simgrid/s4u/Actor.hpp>
 #include <simgrid/simix.h>
-#include <xbt/functional.hpp>
 #include <xbt/promise.hpp>
 #include <xbt/signal.hpp>
-#include <xbt/utility.hpp>
 
-#include <boost/heap/fibonacci_heap.hpp>
 #include <string>
 #include <unordered_map>
 
@@ -49,7 +47,7 @@ template <class F> typename std::result_of_t<F()> simcall(F&& code, SimcallObser
 {
   // If we are in the maestro, we take the fast path and execute the
   // code directly without simcall marshalling/unmarshalling/dispatch:
-  if (SIMIX_is_maestro())
+  if (s4u::Actor::is_maestro())
     return std::forward<F>(code)();
 
   // If we are in the application, pass the code to the maestro which
@@ -79,7 +77,7 @@ template <class F> typename std::result_of_t<F()> simcall(F&& code, SimcallObser
  */
 template <class F> void simcall_blocking(F&& code, SimcallObserver* observer = nullptr)
 {
-  xbt_assert(not SIMIX_is_maestro(), "Cannot execute blocking call in kernel mode");
+  xbt_assert(not s4u::Actor::is_maestro(), "Cannot execute blocking call in kernel mode");
 
   // Pass the code to the maestro which executes it for us and reports the result. We use a std::future which
   // conveniently handles the success/failure value for us.
@@ -96,43 +94,11 @@ auto simcall_blocking(F&& code, Observer* observer) -> decltype(observer->get_re
 }
 } // namespace actor
 } // namespace kernel
-} // namespace simgrid
-namespace simgrid {
+
 namespace simix {
 
 XBT_PUBLIC void unblock(smx_actor_t process);
 
-inline auto& simix_timers() // avoid static initialization order fiasco
-{
-  using TimerQelt = std::pair<double, Timer*>;
-  static boost::heap::fibonacci_heap<TimerQelt, boost::heap::compare<xbt::HeapComparator<TimerQelt>>> value;
-  return value;
-}
-
-/** @brief Timer datatype */
-class Timer {
-public:
-  const double date;
-  std::remove_reference_t<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;
-  void remove();
-
-  template <class F> static inline Timer* set(double date, F callback)
-  {
-    return set(date, simgrid::xbt::Task<void()>(std::move(callback)));
-  }
-
-  static Timer* set(double date, simgrid::xbt::Task<void()>&& callback);
-  static double next() { return simix_timers().empty() ? -1.0 : simix_timers().top().first; }
-};
-
-// In MC mode, the application sends these pointers to the MC
-xbt_dynar_t simix_global_get_actors_addr();
-xbt_dynar_t simix_global_get_dead_actors_addr();
-
 } // namespace simix
 } // namespace simgrid