Python: Add Comm.wait_any

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

diff --git a/src/surf/cpu_interface.hpp b/src/surf/cpu_interface.hpp
index dd775fc..cdecf0e 100644 (file)
--- a/src/surf/cpu_interface.hpp
+++ b/src/surf/cpu_interface.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2004-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. */
@@ -10,7 +10,7 @@
 #include "simgrid/kernel/resource/Resource.hpp"
 #include "simgrid/s4u/Host.hpp"
 #include "src/kernel/lmm/maxmin.hpp"
-#include "src/surf/trace_mgr.hpp"
+#include "src/kernel/resource/profile/trace_mgr.hpp"
 
 #include <list>
 
@@ -76,6 +76,8 @@ public:
   Cpu(simgrid::kernel::resource::Model * model, simgrid::s4u::Host * host, std::vector<double> * speedPerPstate,
       int core);
 
+  Cpu(const Cpu&) = delete;
+  Cpu& operator=(const Cpu&) = delete;
   ~Cpu();
 
   /**
@@ -148,7 +150,7 @@ public:
   /*< @brief Setup the trace file with availability events (peak speed changes due to external load).
    * Trace must contain relative values (ratio between 0 and 1)
    */
-  virtual void set_speed_trace(tmgr_trace_t trace);
+  virtual void set_speed_profile(kernel::profile::Profile* profile);
 
 protected:
   Metric speed_                  = {1.0, 0, nullptr};
@@ -167,10 +169,6 @@ public:
    *  Signature: `void(CpuAction *action, simgrid::kernel::resource::Action::State previous)`
    */
   static simgrid::xbt::signal<void(simgrid::surf::CpuAction*, simgrid::kernel::resource::Action::State)> on_state_change;
-  /** @brief Signal emitted when the action share changes (amount of flops it gets)
-   *  Signature: `void(CpuAction *action)`
-   */
-  static simgrid::xbt::signal<void(simgrid::surf::CpuAction*)> on_share_change;
 
   CpuAction(simgrid::kernel::resource::Model * model, double cost, bool failed) : Action(model, cost, failed) {}
   CpuAction(simgrid::kernel::resource::Model * model, double cost, bool failed, kernel::lmm::Variable* var)