Move ::wait_for() from ExecImpl and IoImpl to ActivityImpl.

[simgrid.git] / src / kernel / activity / ActivityImpl.hpp

diff --git a/src/kernel/activity/ActivityImpl.hpp b/src/kernel/activity/ActivityImpl.hpp
index df0a712..c2636da 100644 (file)
--- a/src/kernel/activity/ActivityImpl.hpp
+++ b/src/kernel/activity/ActivityImpl.hpp
@@ -1,10 +1,10 @@
-/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2020. 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 SIMGRID_KERNEL_ACTIVITY_ACTIVITY_HPP
-#define SIMGRID_KERNEL_ACTIVITY_ACTIVITY_HPP
+#ifndef SIMGRID_KERNEL_ACTIVITY_ACTIVITYIMPL_HPP
+#define SIMGRID_KERNEL_ACTIVITY_ACTIVITYIMPL_HPP
 
 #include <string>
 #include <list>
@@ -36,6 +36,7 @@ enum class State {
 
 class XBT_PUBLIC ActivityImpl {
   std::atomic_int_fast32_t refcount_{0};
+
 public:
   virtual ~ActivityImpl();
   ActivityImpl() = default;
@@ -43,6 +44,10 @@ public:
   std::list<smx_simcall_t> simcalls_;   /* List of simcalls waiting for this activity */
   resource::Action* surf_action_ = nullptr;
 
+  bool test();
+  void wait_for(actor::ActorImpl* issuer, double timeout);
+  virtual ActivityImpl& set_timeout(double timeout) { THROW_UNIMPLEMENTED; }
+
   virtual void suspend();
   virtual void resume();
   virtual void cancel();
@@ -55,7 +60,7 @@ public:
   virtual void register_simcall(smx_simcall_t simcall);
   void clean_action();
   virtual double get_remaining() const;
-  // boost::intrusive_ptr<ActivityImpl> support:
+  // Support for the boost::intrusive_ptr<ActivityImpl> datatype
   friend XBT_PUBLIC void intrusive_ptr_add_ref(ActivityImpl* activity);
   friend XBT_PUBLIC void intrusive_ptr_release(ActivityImpl* activity);