X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/166ad11130482e81d2c3e860ab6c61e972a4cdf6..e33beb98eb2dd42717306a77a328c9d5e9a91f05:/src/kernel/activity/ActivityImpl.hpp diff --git a/src/kernel/activity/ActivityImpl.hpp b/src/kernel/activity/ActivityImpl.hpp index 2a50de8059..31b4b4b843 100644 --- a/src/kernel/activity/ActivityImpl.hpp +++ b/src/kernel/activity/ActivityImpl.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2018. 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. */ @@ -19,25 +19,26 @@ namespace simgrid { namespace kernel { namespace activity { - XBT_PUBLIC_CLASS ActivityImpl { - public: - ActivityImpl(); - virtual ~ActivityImpl(); - e_smx_state_t state = SIMIX_WAITING; /* State of the activity */ - std::string name; /* Activity name if any */ - std::list simcalls; /* List of simcalls waiting for this activity */ - - virtual void suspend()=0; - virtual void resume()=0; - virtual void post() =0; // What to do when a simcall terminates - - // boost::intrusive_ptr support: - friend void intrusive_ptr_add_ref(ActivityImpl * activity); - friend void intrusive_ptr_release(ActivityImpl * activity); - - private: - std::atomic_int_fast32_t refcount_{0}; - }; +class XBT_PUBLIC ActivityImpl { +public: + ActivityImpl(); + explicit ActivityImpl(std::string name) : name_(name) {} + virtual ~ActivityImpl(); + e_smx_state_t state_ = SIMIX_WAITING; /* State of the activity */ + std::string name_; /* Activity name if any */ + std::list simcalls_; /* List of simcalls waiting for this activity */ + + virtual void suspend() = 0; + virtual void resume() = 0; + virtual void post() = 0; // What to do when a simcall terminates + + // boost::intrusive_ptr support: + friend XBT_PUBLIC void intrusive_ptr_add_ref(ActivityImpl* activity); + friend XBT_PUBLIC void intrusive_ptr_release(ActivityImpl* activity); + +private: + std::atomic_int_fast32_t refcount_{0}; +}; }}} // namespace simgrid::kernel::activity #endif /* SIMGRID_KERNEL_ACTIVITY_ACTIVITYIMPL_HPP */