Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
cosmetics (less SIMIX, more kernel)
[simgrid.git] / src / kernel / activity / ActivityImpl.hpp
index 8f1267f..df0a712 100644 (file)
@@ -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_ACTIVITYIMPL_HPP
-#define SIMGRID_KERNEL_ACTIVITY_ACTIVITYIMPL_HPP
+#ifndef SIMGRID_KERNEL_ACTIVITY_ACTIVITY_HPP
+#define SIMGRID_KERNEL_ACTIVITY_ACTIVITY_HPP
 
 #include <string>
 #include <list>
 #include "simgrid/forward.h"
 
 #include <atomic>
+#include <simgrid/kernel/resource/Action.hpp>
 #include <simgrid/simix.hpp>
 
 namespace simgrid {
 namespace kernel {
 namespace activity {
+enum class State {
+  WAITING = 0,
+  READY,
+  RUNNING,
+  DONE,
+  CANCELED,
+  FAILED,
+  SRC_HOST_FAILURE,
+  DST_HOST_FAILURE,
+  TIMEOUT,
+  SRC_TIMEOUT,
+  DST_TIMEOUT,
+  LINK_FAILURE
+};
 
 class XBT_PUBLIC ActivityImpl {
+  std::atomic_int_fast32_t refcount_{0};
 public:
+  virtual ~ActivityImpl();
   ActivityImpl() = default;
-  explicit ActivityImpl(std::string name) : name_(name) {}
-  explicit ActivityImpl(std::string name, resource::Action* surf_action) : name_(name), surf_action_(surf_action) {}
-  virtual ~ActivityImpl() = default;
-  e_smx_state_t state_ = SIMIX_WAITING; /* State of the activity */
-  std::string name_;                    /* Activity name if any */
+  State state_   = State::WAITING;      /* State of the activity */
   std::list<smx_simcall_t> simcalls_;   /* List of simcalls waiting for this activity */
   resource::Action* surf_action_ = nullptr;
 
-  virtual void suspend() = 0;
-  virtual void resume()  = 0;
-  virtual void post()    = 0; // What to do when a simcall terminates
+  virtual void suspend();
+  virtual void resume();
+  virtual void cancel();
+
+  virtual void post() = 0; // Called by the main loop when the activity is marked as terminated or failed by its model.
+                           // Setups the status, clean things up, and call finish()
+  virtual void finish() = 0; // Unlock all simcalls blocked on that activity, either because it was marked as done by
+                             // the model or because it terminated without waiting for the model
 
+  virtual void register_simcall(smx_simcall_t simcall);
+  void clean_action();
+  virtual double get_remaining() const;
   // boost::intrusive_ptr<ActivityImpl> support:
   friend XBT_PUBLIC void intrusive_ptr_add_ref(ActivityImpl* activity);
   friend XBT_PUBLIC void intrusive_ptr_release(ActivityImpl* activity);
 
+  static xbt::signal<void(ActivityImpl const&)> on_suspended;
+  static xbt::signal<void(ActivityImpl const&)> on_resumed;
+};
+
+template <class AnyActivityImpl> class ActivityImpl_T : public ActivityImpl {
 private:
-  std::atomic_int_fast32_t refcount_{0};
+  std::string name_             = "";
+  std::string tracing_category_ = "";
+
+public:
+  AnyActivityImpl& set_name(const std::string& name)
+  {
+    name_ = name;
+    return static_cast<AnyActivityImpl&>(*this);
+  }
+  const std::string& get_name() { return name_; }
+  const char* get_cname() { return name_.c_str(); }
+
+  AnyActivityImpl& set_tracing_category(const std::string& category)
+  {
+    tracing_category_ = category;
+    return static_cast<AnyActivityImpl&>(*this);
+  }
+  const std::string& get_tracing_category() { return tracing_category_; }
 };
-}}} // namespace simgrid::kernel::activity
+
+} // namespace activity
+} // namespace kernel
+} // namespace simgrid
 
 #endif /* SIMGRID_KERNEL_ACTIVITY_ACTIVITYIMPL_HPP */