Use std::function instead of function pointer.

[simgrid.git] / src / include / xbt / parmap.hpp

diff --git a/src/include/xbt/parmap.hpp b/src/include/xbt/parmap.hpp
index 36da54f..de0177c 100644 (file)
--- a/src/include/xbt/parmap.hpp
+++ b/src/include/xbt/parmap.hpp
@@ -14,6 +14,7 @@
 
 #include <boost/optional.hpp>
 #include <condition_variable>
+#include <functional>
 #include <mutex>
 #include <thread>
 
@@ -42,7 +43,7 @@ public:
   Parmap(const Parmap&) = delete;
   Parmap& operator=(const Parmap&) = delete;
   ~Parmap();
-  void apply(void (*fun)(T), const std::vector<T>& data);
+  void apply(std::function<void(T)>&& fun, const std::vector<T>& data);
   boost::optional<T> next();
 
 private:
@@ -99,10 +100,10 @@ private:
   public:
     explicit PosixSynchro(Parmap<T>& parmap);
     ~PosixSynchro();
-    void master_signal();
-    void master_wait();
-    void worker_signal();
-    void worker_wait(unsigned round);
+    void master_signal() override;
+    void master_wait() override;
+    void worker_signal() override;
+    void worker_wait(unsigned round) override;
 
   private:
     std::condition_variable ready_cond;
@@ -115,10 +116,10 @@ private:
   class FutexSynchro : public Synchro {
   public:
     explicit FutexSynchro(Parmap<T>& parmap) : Synchro(parmap) {}
-    void master_signal();
-    void master_wait();
-    void worker_signal();
-    void worker_wait(unsigned);
+    void master_signal() override;
+    void master_wait() override;
+    void worker_signal() override;
+    void worker_wait(unsigned) override;
 
   private:
     static void futex_wait(std::atomic_uint* uaddr, unsigned val);
@@ -129,13 +130,13 @@ private:
   class BusyWaitSynchro : public Synchro {
   public:
     explicit BusyWaitSynchro(Parmap<T>& parmap) : Synchro(parmap) {}
-    void master_signal();
-    void master_wait();
-    void worker_signal();
-    void worker_wait(unsigned);
+    void master_signal() override;
+    void master_wait() override;
+    void worker_signal() override;
+    void worker_wait(unsigned) override;
   };
 
-  static void* worker_main(void* arg);
+  static void worker_main(ThreadData* data);
   Synchro* new_synchro(e_xbt_parmap_mode_t mode);
   void work();
 
@@ -146,7 +147,7 @@ private:
   Synchro* synchro;         /**< synchronization object */
 
   std::atomic_uint thread_counter{0};   /**< number of workers that have done the work */
-  void (*fun)(const T)       = nullptr; /**< function to run in parallel on each element of data */
+  std::function<void(T)> fun;           /**< function to run in parallel on each element of data */
   const std::vector<T>* data = nullptr; /**< parameters to pass to fun in parallel */
   std::atomic_uint index;               /**< index of the next element of data to pick */
 };
@@ -215,10 +216,10 @@ template <typename T> Parmap<T>::~Parmap()
  * @param fun the function to call in parallel
  * @param data each element of this vector will be passed as an argument to fun
  */
-template <typename T> void Parmap<T>::apply(void (*fun)(T), const std::vector<T>& data)
+template <typename T> void Parmap<T>::apply(std::function<void(T)>&& fun, const std::vector<T>& data)
 {
   /* Assign resources to worker threads (we are maestro here)*/
-  this->fun   = fun;
+  this->fun   = std::move(fun);
   this->data  = &data;
   this->index = 0;
   this->synchro->master_signal(); // maestro runs futex_wake to wake all the minions (the working threads)
@@ -291,9 +292,8 @@ template <typename T> typename Parmap<T>::Synchro* Parmap<T>::new_synchro(e_xbt_
 }
 
 /** @brief Main function of a worker thread */
-template <typename T> void* Parmap<T>::worker_main(void* arg)
+template <typename T> void Parmap<T>::worker_main(ThreadData* data)
 {
-  ThreadData* data      = static_cast<ThreadData*>(arg);
   Parmap<T>& parmap     = data->parmap;
   unsigned round        = 0;
   smx_context_t context = simix_global->context_factory->create_context(std::function<void()>(), nullptr);
@@ -316,7 +316,6 @@ template <typename T> void* Parmap<T>::worker_main(void* arg)
   /* We are destroying the parmap */
   delete context;
   delete data;
-  return nullptr;
 }
 
 template <typename T> Parmap<T>::PosixSynchro::PosixSynchro(Parmap<T>& parmap) : Synchro(parmap)