X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/808bc801011b8291383a7fb87669eb67f46f3a07..42ec07cc0c4fb24df86b22c97bfbeab2f0a21c8e:/src/kernel/activity/SynchroRaw.hpp

diff --git a/src/kernel/activity/SynchroRaw.hpp b/src/kernel/activity/SynchroRaw.hpp
index cac619c01a..b4ed3931c6 100644
--- a/src/kernel/activity/SynchroRaw.hpp
+++ b/src/kernel/activity/SynchroRaw.hpp
@@ -1,29 +1,39 @@
-/* Copyright (c) 2007-2016. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2021. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#ifndef _SIMIX_SYNCHRO_RAW_HPP
-#define _SIMIX_SYNCHRO_RAW_HPP
+#ifndef SIMGRID_KERNEL_ACTIVITY_SYNCHRO_RAW_HPP
+#define SIMGRID_KERNEL_ACTIVITY_SYNCHRO_RAW_HPP
 
-#include "surf/surf.h"
-#include "src/kernel/activity/Synchro.h"
+#include "src/kernel/activity/ActivityImpl.hpp"
+#include "surf/surf.hpp"
+#include <functional>
 
 namespace simgrid {
 namespace kernel {
 namespace activity {
 
   /** Used to implement mutexes, semaphores and conditions */
-  XBT_PUBLIC_CLASS Raw : public Synchro {
-  public:
-    ~Raw() override;
-    void suspend() override;
-    void resume() override;
-    void post() override;
-
-    surf_action_t sleep = nullptr;
-  };
-
-}}} // namespace simgrid::kernel::activity
+class XBT_PUBLIC RawImpl : public ActivityImpl_T<RawImpl> {
+  sg_host_t host_ = nullptr;
+  double timeout_ = -1;
+  std::function<void()> finish_callback_;
+
+public:
+  explicit RawImpl(const std::function<void()>& finish_callback) : finish_callback_(finish_callback) {}
+  RawImpl& set_host(s4u::Host* host);
+  RawImpl& set_timeout(double timeout) override;
+
+  RawImpl* start();
+  void suspend() override;
+  void resume() override;
+  void cancel() override;
+  void post() override;
+  void finish() override;
+};
+} // namespace activity
+} // namespace kernel
+} // namespace simgrid
 
 #endif