-/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-2019. 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. */
#include "simgrid/forward.h"
#include <atomic>
+#include <simgrid/kernel/resource/Action.hpp>
#include <simgrid/simix.hpp>
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<smx_simcall_t> 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
-
- /** @brief Increases the refcount */
- void ref();
- /** @brief Reduces the refcount */
- void unref();
-
- // boost::intrusive_ptr<Activity> support:
- friend void intrusive_ptr_add_ref(ActivityImpl * activity);
- friend void intrusive_ptr_release(ActivityImpl * activity);
-
- private:
- std::atomic_int_fast32_t refcount_{1};
- };
+class XBT_PUBLIC ActivityImpl {
+public:
+ ActivityImpl() = default;
+ explicit ActivityImpl(std::string name) : name_(std::move(name)) {}
+ virtual ~ActivityImpl() = default;
+ e_smx_state_t state_ = SIMIX_WAITING; /* State of the activity */
+ std::list<smx_simcall_t> simcalls_; /* List of simcalls waiting for this activity */
+ resource::Action* surf_action_ = nullptr;
+
+ const std::string& get_name() const { return name_; }
+ const char* get_cname() const { return name_.c_str(); }
+
+ virtual void suspend();
+ virtual void resume();
+ virtual void post() = 0; // What to do when a simcall terminates
+ virtual void finish() = 0;
+ void set_category(std::string category);
+
+ // boost::intrusive_ptr<ActivityImpl> 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};
+ std::string name_; /* Activity name if any */
+
+public:
+ static simgrid::xbt::signal<void(ActivityImplPtr)> on_suspended;
+ static simgrid::xbt::signal<void(ActivityImplPtr)> on_resumed;
+};
}}} // namespace simgrid::kernel::activity
#endif /* SIMGRID_KERNEL_ACTIVITY_ACTIVITYIMPL_HPP */