cleanup Action refcounting

[simgrid.git] / src / surf / ptask_L07.hpp

diff --git a/src/surf/ptask_L07.hpp b/src/surf/ptask_L07.hpp
index 4ae5bb8..03d43d2 100644 (file)
--- a/src/surf/ptask_L07.hpp
+++ b/src/surf/ptask_L07.hpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2013-2017. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2013-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. */
@@ -41,13 +40,13 @@ public:
 
   double nextOccuringEvent(double now) override;
   void updateActionsState(double now, double delta) override;
-  Action *executeParallelTask(int host_nb, sg_host_t *host_list,
-                              double *flops_amount, double *bytes_amount, double rate) override;
+  kernel::resource::Action* executeParallelTask(int host_nb, sg_host_t* host_list, double* flops_amount,
+                                                double* bytes_amount, double rate) override;
 };
 
 class CpuL07Model : public CpuModel {
 public:
-  CpuL07Model(HostL07Model* hmodel, lmm_system_t sys);
+  CpuL07Model(HostL07Model* hmodel, kernel::lmm::System* sys);
   ~CpuL07Model();
 
   Cpu *createCpu(simgrid::s4u::Host *host, std::vector<double> *speedPerPstate, int core) override;
@@ -56,12 +55,12 @@ public:
 
 class NetworkL07Model : public NetworkModel {
 public:
-  NetworkL07Model(HostL07Model* hmodel, lmm_system_t sys);
+  NetworkL07Model(HostL07Model* hmodel, kernel::lmm::System* sys);
   ~NetworkL07Model();
   LinkImpl* createLink(const std::string& name, double bandwidth, double latency,
                        e_surf_link_sharing_policy_t policy) override;
 
-  Action* communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) override;
+  kernel::resource::Action* communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) override;
 
   HostL07Model *hostModel_;
 };
@@ -76,8 +75,13 @@ public:
   ~CpuL07() override;
   bool isUsed() override;
   void apply_event(tmgr_trace_event_t event, double value) override;
-  Action* execution_start(double size) override;
-  Action* sleep(double duration) override;
+  kernel::resource::Action* execution_start(double size) override;
+  simgrid::kernel::resource::Action* execution_start(double size, int requestedCores) override
+  {
+    THROW_UNIMPLEMENTED;
+    return nullptr;
+  }
+  kernel::resource::Action* sleep(double duration) override;
 
 protected:
   void onSpeedChange() override;
@@ -103,13 +107,12 @@ class L07Action : public CpuAction {
   friend Action *HostL07Model::executeParallelTask(int host_nb, sg_host_t*host_list,
                                                    double *flops_amount, double *bytes_amount, double rate);
 public:
-  L07Action(Model *model, int host_nb, sg_host_t *host_list, double *flops_amount, double *bytes_amount, double rate);
- ~L07Action();
+  L07Action(kernel::resource::Model* model, int host_nb, sg_host_t* host_list, double* flops_amount,
+            double* bytes_amount, double rate);
+  ~L07Action();
 
   void updateBound();
 
-  int unref() override;
-
   std::vector<s4u::Host*>* hostList_ = new std::vector<s4u::Host*>();
   double *computationAmount_;
   double *communicationAmount_;