X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/84402e8e2ee2a2d0bef25fdceb0a263ed8b471f6..6b8dc0899319667769a220397df30b6dac0e2b8f:/src/kernel/activity/ActivityImpl.hpp diff --git a/src/kernel/activity/ActivityImpl.hpp b/src/kernel/activity/ActivityImpl.hpp index a6b84a6760..c2636daf30 100644 --- a/src/kernel/activity/ActivityImpl.hpp +++ b/src/kernel/activity/ActivityImpl.hpp @@ -3,8 +3,8 @@ /* 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 #include @@ -44,6 +44,10 @@ public: std::list 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(); @@ -56,7 +60,7 @@ public: virtual void register_simcall(smx_simcall_t simcall); void clean_action(); virtual double get_remaining() const; - // boost::intrusive_ptr support: + // Support for the boost::intrusive_ptr datatype friend XBT_PUBLIC void intrusive_ptr_add_ref(ActivityImpl* activity); friend XBT_PUBLIC void intrusive_ptr_release(ActivityImpl* activity);