Save valgrind_stack_id in a private field.

[simgrid.git] / src / kernel / context / ContextSwapped.hpp

diff --git a/src/kernel/context/ContextSwapped.hpp b/src/kernel/context/ContextSwapped.hpp
index 507fbb0..c132b63 100644 (file)
--- a/src/kernel/context/ContextSwapped.hpp
+++ b/src/kernel/context/ContextSwapped.hpp
@@ -8,6 +8,7 @@
 
 #include "src/kernel/context/Context.hpp"
 
+#include <memory>
 #include <vector>
 
 namespace simgrid {
@@ -19,7 +20,8 @@ class SwappedContextFactory : public ContextFactory {
   friend SwappedContext; // Reads whether we are in parallel mode
 public:
   SwappedContextFactory();
-  ~SwappedContextFactory() override;
+  SwappedContextFactory(const SwappedContextFactory&) = delete;
+  SwappedContextFactory& operator=(const SwappedContextFactory&) = delete;
   void run_all() override;
 
 private:
@@ -28,14 +30,16 @@ private:
   unsigned long process_index_ = 0; // Next actor to execute during sequential run_all()
 
   /* For the parallel execution */
-  simgrid::xbt::Parmap<smx_actor_t>* parmap_;
+  std::unique_ptr<simgrid::xbt::Parmap<smx_actor_t>> parmap_;
   std::vector<SwappedContext*> workers_context_; /* space to save the worker's context in each thread */
   std::atomic<uintptr_t> threads_working_{0};    /* number of threads that have started their work */
 };
 
 class SwappedContext : public Context {
 public:
-  SwappedContext(std::function<void()> code, smx_actor_t get_actor, SwappedContextFactory* factory);
+  SwappedContext(std::function<void()>&& code, smx_actor_t get_actor, SwappedContextFactory* factory);
+  SwappedContext(const SwappedContext&) = delete;
+  SwappedContext& operator=(const SwappedContext&) = delete;
   virtual ~SwappedContext();
 
   void suspend() override;
@@ -44,7 +48,7 @@ public:
 
   virtual void swap_into(SwappedContext* to) = 0; // Defined in Raw, Boost and UContext subclasses
 
-  void* get_stack();
+  unsigned char* get_stack();
 
   static thread_local uintptr_t worker_id_;
 
@@ -56,8 +60,12 @@ public:
 #endif
 
 private:
-  void* stack_ = nullptr;                /* the thread stack */
+  unsigned char* stack_ = nullptr;       /* the thread stack */
   SwappedContextFactory* const factory_; // for sequential and parallel run_all()
+
+#if HAVE_VALGRIND_H
+  unsigned int valgrind_stack_id_;
+#endif
 };
 
 } // namespace context