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

diff --git a/include/simgrid/simix.hpp b/include/simgrid/simix.hpp
index 9c62626fef..fb8addfb3c 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,18 +7,17 @@
 #ifndef SIMGRID_SIMIX_HPP
 #define SIMGRID_SIMIX_HPP
 
-#include <simgrid/simix.h>
-#include <xbt/functional.hpp>
+#include <simgrid/s4u/Actor.hpp>
 #include <xbt/promise.hpp>
 #include <xbt/signal.hpp>
-#include <xbt/utility.hpp>
 
-#include <boost/heap/fibonacci_heap.hpp>
 #include <string>
 #include <unordered_map>
 
-XBT_PUBLIC void simcall_run_kernel(std::function<void()> const& code, simgrid::mc::SimcallObserver* observer);
-XBT_PUBLIC void simcall_run_blocking(std::function<void()> const& code, simgrid::mc::SimcallObserver* observer);
+XBT_PUBLIC void simcall_run_answered(std::function<void()> const& code,
+                                     simgrid::kernel::actor::SimcallObserver* observer);
+XBT_PUBLIC void simcall_run_blocking(std::function<void()> const& code,
+                                     simgrid::kernel::actor::SimcallObserver* observer);
 
 namespace simgrid {
 namespace kernel {
@@ -43,11 +42,11 @@ namespace actor {
  * you may need to wait for that mutex to be unlocked by its current owner.
  * Potentially blocking simcall must be issued using simcall_blocking(), right below in this file.
  */
-template <class F> typename std::result_of_t<F()> simcall(F&& code, mc::SimcallObserver* observer = nullptr)
+template <class F> typename std::result_of_t<F()> simcall_answered(F&& code, SimcallObserver* observer = nullptr)
 {
   // 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
@@ -55,7 +54,7 @@ template <class F> typename std::result_of_t<F()> simcall(F&& code, mc::SimcallO
   // conveniently handles the success/failure value for us.
   using R = typename std::result_of_t<F()>;
   simgrid::xbt::Result<R> result;
-  simcall_run_kernel([&result, &code] { simgrid::xbt::fulfill_promise(result, std::forward<F>(code)); }, observer);
+  simcall_run_answered([&result, &code] { simgrid::xbt::fulfill_promise(result, std::forward<F>(code)); }, observer);
   return result.get();
 }
 
@@ -64,9 +63,6 @@ template <class F> typename std::result_of_t<F()> simcall(F&& code, mc::SimcallO
  * This is very similar to simcall() right above, but the calling actor will not get rescheduled until
  * actor->simcall_answer() is called explicitly.
  *
- * Since the return value does not come from the lambda directly, its type cannot be guessed automatically and must
- * be provided as template parameter.
- *
  * This is meant for blocking actions. For example, locking a mutex is a blocking simcall.
  * First it's a simcall because that's obviously a modification of the world. Then, that's a blocking simcall because if
  * the mutex happens not to be free, the actor is added to a queue of actors in the mutex. Every mutex->unlock() takes
@@ -75,56 +71,28 @@ template <class F> typename std::result_of_t<F()> simcall(F&& code, mc::SimcallO
  * right away with actor->simcall_answer() once the mutex is marked as locked.
  *
  * If your code never calls actor->simcall_answer() itself, the actor will never return from its simcall.
+ *
+ * The return value is obtained from observer->get_result() if it exists. Otherwise void is returned.
  */
-template <class R, class F> R simcall_blocking(F&& code, mc::SimcallObserver* observer = nullptr)
+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");
 
-  // If we are in the application, pass the code to the maestro which
-  // executes it for us and reports the result. We use a std::future which
+  // 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.
-  simgrid::xbt::Result<R> result;
+  simgrid::xbt::Result<void> result;
   simcall_run_blocking([&result, &code] { simgrid::xbt::fulfill_promise(result, std::forward<F>(code)); }, observer);
-  return result.get();
+  result.get(); // rethrow stored exception if any
 }
-} // namespace actor
-} // namespace kernel
-} // namespace simgrid
-namespace simgrid {
-namespace simix {
 
-inline auto& simix_timers() // avoid static initialization order fiasco
+template <class F, class Observer>
+auto simcall_blocking(F&& code, Observer* observer) -> decltype(observer->get_result())
 {
-  using TimerQelt = std::pair<double, Timer*>;
-  static boost::heap::fibonacci_heap<TimerQelt, boost::heap::compare<xbt::HeapComparator<TimerQelt>>> value;
-  return value;
+  simcall_blocking(std::forward<F>(code), static_cast<SimcallObserver*>(observer));
+  return observer->get_result();
 }
-
-/** @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
-void* simix_global_get_actors_addr();
-void* simix_global_get_dead_actors_addr();
-
-} // namespace simix
+} // namespace actor
+} // namespace kernel
 } // namespace simgrid
 
 #endif