move the models to the right directory (empty src/surf a bit)

The remaining parts of src/surf need to be cleaned before being moved

Also, remove almost all #include "surf_interface.hpp"

diff --git a/MANIFEST.in b/MANIFEST.in
index bdba406..54f7759 100644 (file)
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2071,6 +2071,24 @@ include src/kernel/resource/VirtualMachineImpl.cpp
 include src/kernel/resource/VirtualMachineImpl.hpp
 include src/kernel/resource/WifiLinkImpl.cpp
 include src/kernel/resource/WifiLinkImpl.hpp
+include src/kernel/resource/models/cpu_cas01.cpp
+include src/kernel/resource/models/cpu_cas01.hpp
+include src/kernel/resource/models/cpu_ti.cpp
+include src/kernel/resource/models/cpu_ti.hpp
+include src/kernel/resource/models/disk_s19.cpp
+include src/kernel/resource/models/disk_s19.hpp
+include src/kernel/resource/models/host_clm03.cpp
+include src/kernel/resource/models/host_clm03.hpp
+include src/kernel/resource/models/network_cm02.cpp
+include src/kernel/resource/models/network_cm02.hpp
+include src/kernel/resource/models/network_constant.cpp
+include src/kernel/resource/models/network_constant.hpp
+include src/kernel/resource/models/network_ib.cpp
+include src/kernel/resource/models/network_ib.hpp
+include src/kernel/resource/models/network_ns3.cpp
+include src/kernel/resource/models/network_ns3.hpp
+include src/kernel/resource/models/ptask_L07.cpp
+include src/kernel/resource/models/ptask_L07.hpp
 include src/kernel/resource/profile/Event.hpp
 include src/kernel/resource/profile/FutureEvtSet.cpp
 include src/kernel/resource/profile/FutureEvtSet.hpp
@@ -2415,26 +2433,8 @@ include src/sthread/sthread.h
 include src/sthread/sthread_impl.cpp
 include src/surf/HostImpl.cpp
 include src/surf/HostImpl.hpp
-include src/surf/cpu_cas01.cpp
-include src/surf/cpu_cas01.hpp
-include src/surf/cpu_ti.cpp
-include src/surf/cpu_ti.hpp
-include src/surf/disk_s19.cpp
-include src/surf/disk_s19.hpp
-include src/surf/host_clm03.cpp
-include src/surf/host_clm03.hpp
-include src/surf/network_cm02.cpp
-include src/surf/network_cm02.hpp
-include src/surf/network_constant.cpp
-include src/surf/network_constant.hpp
-include src/surf/network_ib.cpp
-include src/surf/network_ib.hpp
-include src/surf/network_ns3.cpp
-include src/surf/network_ns3.hpp
 include src/surf/ns3/ns3_simulator.cpp
 include src/surf/ns3/ns3_simulator.hpp
-include src/surf/ptask_L07.cpp
-include src/surf/ptask_L07.hpp
 include src/surf/sg_platf.cpp
 include src/surf/surf_interface.hpp
 include src/surf/xml/platf.hpp

diff --git a/src/instr/instr_paje_events.cpp b/src/instr/instr_paje_events.cpp
index 2ffdd9f..f908770 100644 (file)
--- a/src/instr/instr_paje_events.cpp
+++ b/src/instr/instr_paje_events.cpp
@@ -6,7 +6,6 @@
 #include "src/instr/instr_private.hpp"
 #include "src/instr/instr_smpi.hpp"
 #include "src/smpi/include/private.hpp"
-#include "src/surf/surf_interface.hpp"
 #include "xbt/ex.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_paje_events, instr, "Paje tracing event system (events)");

diff --git a/src/instr/instr_platform.cpp b/src/instr/instr_platform.cpp
index b2c01c9..5ceb130 100644 (file)
--- a/src/instr/instr_platform.cpp
+++ b/src/instr/instr_platform.cpp
@@ -16,7 +16,6 @@
 #include "src/instr/instr_private.hpp"
 #include "src/kernel/resource/CpuImpl.hpp"
 #include "src/kernel/resource/NetworkModel.hpp"
-#include "src/surf/surf_interface.hpp"
 
 #include <fstream>
 

diff --git a/src/kernel/context/Context.cpp b/src/kernel/context/Context.cpp
index 0229296..76e3530 100644 (file)
--- a/src/kernel/context/Context.cpp
+++ b/src/kernel/context/Context.cpp
@@ -10,7 +10,6 @@
 #include "src/kernel/activity/CommImpl.hpp"
 #include "src/kernel/context/Context.hpp"
 #include "src/sthread/sthread.h"
-#include "src/surf/surf_interface.hpp"
 
 #include <vector>
 

diff --git a/src/kernel/lmm/bmf_test.cpp b/src/kernel/lmm/bmf_test.cpp
index 2306af9..d260056 100644 (file)
--- a/src/kernel/lmm/bmf_test.cpp
+++ b/src/kernel/lmm/bmf_test.cpp
@@ -5,7 +5,6 @@
 
 #include "src/include/catch.hpp"
 #include "src/kernel/lmm/bmf.hpp"
-#include "src/surf/surf_interface.hpp"
 #include "xbt/log.h"
 
 namespace lmm = simgrid::kernel::lmm;

diff --git a/src/kernel/lmm/fair_bottleneck.cpp b/src/kernel/lmm/fair_bottleneck.cpp
index c9cd24c..cb108db 100644 (file)
--- a/src/kernel/lmm/fair_bottleneck.cpp
+++ b/src/kernel/lmm/fair_bottleneck.cpp
@@ -4,7 +4,6 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "src/kernel/lmm/fair_bottleneck.hpp"
-#include "src/surf/surf_interface.hpp"
 #include "xbt/sysdep.h"
 
 #include <algorithm>

diff --git a/src/kernel/lmm/maxmin_test.cpp b/src/kernel/lmm/maxmin_test.cpp
index 1ef58cc..d1c3a89 100644 (file)
--- a/src/kernel/lmm/maxmin_test.cpp
+++ b/src/kernel/lmm/maxmin_test.cpp
@@ -5,7 +5,6 @@
 
 #include "src/include/catch.hpp"
 #include "src/kernel/lmm/maxmin.hpp"
-#include "src/surf/surf_interface.hpp"
 #include "xbt/log.h"
 
 namespace lmm = simgrid::kernel::lmm;

diff --git a/src/kernel/resource/Action.cpp b/src/kernel/resource/Action.cpp
index 8ca52bd..b74ac09 100644 (file)
--- a/src/kernel/resource/Action.cpp
+++ b/src/kernel/resource/Action.cpp
@@ -7,7 +7,6 @@
 #include "simgrid/kernel/resource/Model.hpp"
 #include "src/kernel/EngineImpl.hpp"
 #include "src/kernel/lmm/maxmin.hpp"
-#include "src/surf/surf_interface.hpp"
 
 XBT_LOG_NEW_CATEGORY(kernel, "SimGrid internals");
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ker_resource, kernel, "Resources, modeling the platform performance");

diff --git a/src/kernel/resource/CpuImpl.cpp b/src/kernel/resource/CpuImpl.cpp
index 9ff7651..73ef40b 100644 (file)
--- a/src/kernel/resource/CpuImpl.cpp
+++ b/src/kernel/resource/CpuImpl.cpp
@@ -4,9 +4,8 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "src/kernel/resource/CpuImpl.hpp"
+#include "src/kernel/resource/models/cpu_ti.hpp"
 #include "src/kernel/resource/profile/Profile.hpp"
-#include "src/surf/cpu_ti.hpp"
-#include "src/surf/surf_interface.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(res_cpu, ker_resource, "CPU resource, fueling execution activites");
 

diff --git a/src/kernel/resource/DiskImpl.hpp b/src/kernel/resource/DiskImpl.hpp
index 15a1d6d..352fac5 100644 (file)
--- a/src/kernel/resource/DiskImpl.hpp
+++ b/src/kernel/resource/DiskImpl.hpp
@@ -8,7 +8,6 @@
 #include "simgrid/s4u/Disk.hpp"
 #include "simgrid/s4u/Io.hpp"
 #include "src/kernel/resource/Resource.hpp"
-#include "src/surf/surf_interface.hpp"
 #include "xbt/PropertyHolder.hpp"
 
 #include <map>

diff --git a/src/kernel/resource/NetworkModel.cpp b/src/kernel/resource/NetworkModel.cpp
index 8a04dc4..27d222e 100644 (file)
--- a/src/kernel/resource/NetworkModel.cpp
+++ b/src/kernel/resource/NetworkModel.cpp
@@ -9,7 +9,6 @@
 #include "src/kernel/resource/FactorSet.hpp"
 #include "src/kernel/resource/NetworkModel.hpp"
 #include "src/kernel/resource/profile/Profile.hpp"
-#include "src/surf/surf_interface.hpp"
 
 #include <numeric>
 

diff --git a/src/kernel/resource/VirtualMachineImpl.cpp b/src/kernel/resource/VirtualMachineImpl.cpp
index 5bff857..d2d1156 100644 (file)
--- a/src/kernel/resource/VirtualMachineImpl.cpp
+++ b/src/kernel/resource/VirtualMachineImpl.cpp
@@ -12,8 +12,8 @@
 #include "src/kernel/EngineImpl.hpp"
 #include "src/kernel/activity/ExecImpl.hpp"
 #include "src/kernel/resource/VirtualMachineImpl.hpp"
-#include "src/surf/cpu_cas01.hpp"
-#include "src/surf/cpu_ti.hpp"
+#include "src/kernel/resource/models/cpu_cas01.hpp"
+#include "src/kernel/resource/models/cpu_ti.hpp"
 
 #include <numeric>
 

diff --git a/src/kernel/resource/WifiLinkImpl.cpp b/src/kernel/resource/WifiLinkImpl.cpp
index 52e5222..7b85949 100644 (file)
--- a/src/kernel/resource/WifiLinkImpl.cpp
+++ b/src/kernel/resource/WifiLinkImpl.cpp
@@ -5,9 +5,8 @@
 
 #include <simgrid/s4u/Host.hpp>
 
-#include "src/kernel/resource/WifiLinkImpl.hpp"
-#include "src/surf/surf_interface.hpp"
 #include "src/kernel/activity/CommImpl.hpp"
+#include "src/kernel/resource/WifiLinkImpl.hpp"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(res_network);
 

diff --git a/src/kernel/resource/WifiLinkImpl.hpp b/src/kernel/resource/WifiLinkImpl.hpp
index 6bfc89e..34810ca 100644 (file)
--- a/src/kernel/resource/WifiLinkImpl.hpp
+++ b/src/kernel/resource/WifiLinkImpl.hpp
@@ -6,8 +6,7 @@
 #ifndef SURF_NETWORK_WIFI_HPP_
 #define SURF_NETWORK_WIFI_HPP_
 
-#include "src/surf/network_cm02.hpp"
-#include "xbt/base.h"
+#include "src/kernel/resource/models/network_cm02.hpp"
 
 /***********
  * Classes *

diff --git a/src/surf/cpu_cas01.cpp b/src/kernel/resource/models/cpu_cas01.cpp
similarity index 98%
rename from src/surf/cpu_cas01.cpp
rename to src/kernel/resource/models/cpu_cas01.cpp
index 11faee7..8c9bd96 100644 (file)
--- a/src/surf/cpu_cas01.cpp
+++ b/src/kernel/resource/models/cpu_cas01.cpp
@@ -8,10 +8,9 @@
 
 #include "simgrid/sg_config.hpp"
 #include "src/kernel/EngineImpl.hpp"
+#include "src/kernel/resource/models/cpu_cas01.hpp"
+#include "src/kernel/resource/models/cpu_ti.hpp"
 #include "src/kernel/resource/profile/Event.hpp"
-#include "src/surf/cpu_cas01.hpp"
-#include "src/surf/cpu_ti.hpp"
-#include "src/surf/surf_interface.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(cpu_cas, res_cpu, "CPU resource, CAS01 model (used by default)");
 

diff --git a/src/surf/cpu_cas01.hpp b/src/kernel/resource/models/cpu_cas01.hpp
similarity index 91%
rename from src/surf/cpu_cas01.hpp
rename to src/kernel/resource/models/cpu_cas01.hpp
index e7e9a57..9202372 100644 (file)
--- a/src/surf/cpu_cas01.hpp
+++ b/src/kernel/resource/models/cpu_cas01.hpp
@@ -26,7 +26,7 @@ class XBT_PRIVATE CpuCas01Action;
 class CpuCas01Model : public CpuModel {
 public:
   explicit CpuCas01Model(const std::string& name);
-  CpuCas01Model(const CpuCas01Model&) = delete;
+  CpuCas01Model(const CpuCas01Model&)            = delete;
   CpuCas01Model& operator=(const CpuCas01Model&) = delete;
 
   CpuImpl* create_cpu(s4u::Host* host, const std::vector<double>& speed_per_pstate) override;
@@ -41,7 +41,7 @@ class CpuCas01 : public CpuImpl {
 
 public:
   using CpuImpl::CpuImpl;
-  CpuCas01(const CpuCas01&) = delete;
+  CpuCas01(const CpuCas01&)            = delete;
   CpuCas01& operator=(const CpuCas01&) = delete;
   void apply_event(profile::Event* event, double value) override;
   CpuAction* execution_start(double size, double user_bound) override;
@@ -61,7 +61,7 @@ class CpuCas01Action : public CpuAction {
 
 public:
   CpuCas01Action(Model* model, double cost, bool failed, double speed, lmm::Constraint* constraint, int requested_core);
-  CpuCas01Action(const CpuCas01Action&) = delete;
+  CpuCas01Action(const CpuCas01Action&)            = delete;
   CpuCas01Action& operator=(const CpuCas01Action&) = delete;
   int requested_core() const { return requested_core_; }
 };

diff --git a/src/surf/cpu_ti.cpp b/src/kernel/resource/models/cpu_ti.cpp
similarity index 97%
rename from src/surf/cpu_ti.cpp
rename to src/kernel/resource/models/cpu_ti.cpp
index e65a824..5fdaad6 100644 (file)
--- a/src/surf/cpu_ti.cpp
+++ b/src/kernel/resource/models/cpu_ti.cpp
@@ -6,11 +6,10 @@
 #include "cpu_ti.hpp"
 #include "simgrid/kernel/routing/NetZoneImpl.hpp"
 #include "simgrid/s4u/Engine.hpp"
-#include "xbt/asserts.h"
 #include "src/kernel/EngineImpl.hpp"
 #include "src/kernel/resource/profile/Event.hpp"
 #include "src/kernel/resource/profile/Profile.hpp"
-#include "src/surf/surf_interface.hpp"
+#include "xbt/asserts.h"
 
 #include <algorithm>
 #include <memory>
@@ -27,15 +26,15 @@ namespace simgrid::kernel::resource {
 
 CpuTiProfile::CpuTiProfile(const profile::Profile* profile)
 {
-  double integral    = 0;
-  double time        = 0;
-  double prev_value  = 1;
-  const std::vector<profile::DatedValue>& events=profile->get_event_list();
+  double integral                                = 0;
+  double time                                    = 0;
+  double prev_value                              = 1;
+  const std::vector<profile::DatedValue>& events = profile->get_event_list();
   xbt_assert(not events.empty());
   unsigned long nb_points = events.size() + 1;
   time_points_.reserve(nb_points);
   integral_.reserve(nb_points);
-  for (auto const& val :  events) {
+  for (auto const& val : events) {
     time += val.date_;
     integral += val.date_ * prev_value;
     time_points_.push_back(time);
@@ -43,11 +42,11 @@ CpuTiProfile::CpuTiProfile(const profile::Profile* profile)
     prev_value = val.value_;
   }
 
-  double delay=profile->get_repeat_delay()+ events.at(0).date_;
+  double delay = profile->get_repeat_delay() + events.at(0).date_;
 
-  xbt_assert( events.back().value_==prev_value,"Profiles need to end as they start");
+  xbt_assert(events.back().value_ == prev_value, "Profiles need to end as they start");
   time += delay;
-  integral += delay*prev_value;
+  integral += delay * prev_value;
 
   time_points_.push_back(time);
   integral_.push_back(integral);

diff --git a/src/surf/cpu_ti.hpp b/src/kernel/resource/models/cpu_ti.hpp
similarity index 91%
rename from src/surf/cpu_ti.hpp
rename to src/kernel/resource/models/cpu_ti.hpp
index 5c6aabb..ce132c5 100644 (file)
--- a/src/surf/cpu_ti.hpp
+++ b/src/kernel/resource/models/cpu_ti.hpp
@@ -44,7 +44,7 @@ class CpuTiTmgr {
     FIXED,  /*< Trace fixed, no availability file */
     DYNAMIC /*< Dynamic, have an availability file */
   };
-  Type type_ = Type::FIXED;
+  Type type_    = Type::FIXED;
   double value_ = 0.0; /*< Percentage of cpu speed available. Value fixed between 0 and 1 */
 
   /* Dynamic */
@@ -57,7 +57,7 @@ class CpuTiTmgr {
 public:
   explicit CpuTiTmgr(double value) : value_(value){};
   CpuTiTmgr(profile::Profile* speed_profile, double value);
-  CpuTiTmgr(const CpuTiTmgr&) = delete;
+  CpuTiTmgr(const CpuTiTmgr&)            = delete;
   CpuTiTmgr& operator=(const CpuTiTmgr&) = delete;
 
   double integrate(double a, double b) const;
@@ -71,9 +71,10 @@ public:
 
 class XBT_PRIVATE CpuTiAction : public CpuAction {
   friend class CpuTi;
+
 public:
   CpuTiAction(CpuTi* cpu, double cost);
-  CpuTiAction(const CpuTiAction&) = delete;
+  CpuTiAction(const CpuTiAction&)            = delete;
   CpuTiAction& operator=(const CpuTiAction&) = delete;
   ~CpuTiAction() override;
 
@@ -84,7 +85,7 @@ public:
   void set_sharing_penalty(double sharing_penalty) override;
   double get_remains() override;
 
-  CpuTi *cpu_;
+  CpuTi* cpu_;
 
   boost::intrusive::list_member_hook<> action_ti_hook;
 };
@@ -123,8 +124,8 @@ public:
 
   CpuTiTmgr* speed_integrated_trace_ = nullptr; /*< Structure with data needed to integrate trace file */
   ActionTiList action_set_;                     /*< set with all actions running on cpu */
-  double sum_priority_ = 0;                  /*< the sum of actions' priority that are running on cpu */
-  double last_update_  = 0;                  /*< last update of actions' remaining amount done */
+  double sum_priority_ = 0;                     /*< the sum of actions' priority that are running on cpu */
+  double last_update_  = 0;                     /*< last update of actions' remaining amount done */
 
   boost::intrusive::list_member_hook<> cpu_ti_hook;
 };
@@ -141,7 +142,7 @@ public:
   static void create_pm_models(); // Make CPU PM model
 
   using CpuModel::CpuModel;
-  CpuTiModel(const CpuTiModel&) = delete;
+  CpuTiModel(const CpuTiModel&)            = delete;
   CpuTiModel& operator=(const CpuTiModel&) = delete;
   CpuImpl* create_cpu(s4u::Host* host, const std::vector<double>& speed_per_pstate) override;
   double next_occurring_event(double now) override;

diff --git a/src/surf/disk_s19.cpp b/src/kernel/resource/models/disk_s19.cpp
similarity index 98%
rename from src/surf/disk_s19.cpp
rename to src/kernel/resource/models/disk_s19.cpp
index 35ad4fd..c88d038 100644 (file)
--- a/src/surf/disk_s19.cpp
+++ b/src/kernel/resource/models/disk_s19.cpp
@@ -11,8 +11,8 @@
 
 #include "src/kernel/EngineImpl.hpp"
 #include "src/kernel/lmm/maxmin.hpp"
+#include "src/kernel/resource/models/disk_s19.hpp"
 #include "src/kernel/resource/profile/Event.hpp"
-#include "src/surf/disk_s19.hpp"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(res_disk);
 /***********
@@ -43,7 +43,6 @@ DiskS19Model::DiskS19Model(const std::string& name) : DiskModel(name)
   set_maxmin_system(lmm::System::build(cfg_disk_solver.get(), true /* selective update */));
 }
 
-
 DiskImpl* DiskS19Model::create_disk(const std::string& name, double read_bandwidth, double write_bandwidth)
 {
   return (new DiskS19(name, read_bandwidth, write_bandwidth))->set_model(this);

diff --git a/src/surf/disk_s19.hpp b/src/kernel/resource/models/disk_s19.hpp
similarity index 96%
rename from src/surf/disk_s19.hpp
rename to src/kernel/resource/models/disk_s19.hpp
index c4a6473..8da736c 100644 (file)
--- a/src/surf/disk_s19.hpp
+++ b/src/kernel/resource/models/disk_s19.hpp
@@ -27,7 +27,7 @@ class XBT_PRIVATE DiskS19Action;
 class DiskS19Model : public DiskModel {
 public:
   explicit DiskS19Model(const std::string& name);
-  DiskS19Model(const DiskS19Model&) = delete;
+  DiskS19Model(const DiskS19Model&)            = delete;
   DiskS19Model& operator=(const DiskS19Model&) = delete;
   DiskImpl* create_disk(const std::string& name, double read_bandwidth, double write_bandwidth) override;
 

diff --git a/src/surf/host_clm03.cpp b/src/kernel/resource/models/host_clm03.cpp
similarity index 93%
rename from src/surf/host_clm03.cpp
rename to src/kernel/resource/models/host_clm03.cpp
index 5fc1594..dc3be67 100644 (file)
--- a/src/surf/host_clm03.cpp
+++ b/src/kernel/resource/models/host_clm03.cpp
@@ -10,7 +10,7 @@
 #include "simgrid/sg_config.hpp"
 #include "src/kernel/EngineImpl.hpp"
 #include "src/kernel/resource/NetworkModel.hpp"
-#include "src/surf/host_clm03.hpp"
+#include "src/kernel/resource/models/host_clm03.hpp"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(res_host);
 
@@ -53,17 +53,17 @@ Action* HostCLM03Model::io_stream(s4u::Host* src_host, DiskImpl* src_disk, s4u::
                                   double size)
 {
   auto net_model = src_host->get_englobing_zone()->get_network_model();
-  auto system = net_model->get_maxmin_system();
-  auto* action = net_model->communicate(src_host, dst_host, size, -1, true);
+  auto system    = net_model->get_maxmin_system();
+  auto* action   = net_model->communicate(src_host, dst_host, size, -1, true);
 
   // We don't want to apply the network model bandwidth factor to the I/O constraints
   double bw_factor = net_model->get_bandwidth_factor();
-  if (src_disk != nullptr){
-    //FIXME: if the stream starts from a disk, we might not want to pay the network latency
+  if (src_disk != nullptr) {
+    // FIXME: if the stream starts from a disk, we might not want to pay the network latency
     system->expand(src_disk->get_constraint(), action->get_variable(), bw_factor);
     system->expand(src_disk->get_read_constraint(), action->get_variable(), bw_factor);
   }
-  if (dst_disk != nullptr){
+  if (dst_disk != nullptr) {
     system->expand(dst_disk->get_constraint(), action->get_variable(), bw_factor);
     system->expand(dst_disk->get_write_constraint(), action->get_variable(), bw_factor);
   }

diff --git a/src/surf/host_clm03.hpp b/src/kernel/resource/models/host_clm03.hpp
similarity index 92%
rename from src/surf/host_clm03.hpp
rename to src/kernel/resource/models/host_clm03.hpp
index 8af735e..61603cc 100644 (file)
--- a/src/surf/host_clm03.hpp
+++ b/src/kernel/resource/models/host_clm03.hpp
@@ -22,7 +22,8 @@ public:
   Action* execute_thread(const s4u::Host* host, double flops_amount, int thread_count) override;
   Action* execute_parallel(const std::vector<s4u::Host*>& host_list, const double* flops_amount,
                            const double* bytes_amount, double rate) override;
-  Action* io_stream(s4u::Host* src_host, DiskImpl* src_disk, s4u::Host* dst_host, DiskImpl* dst_disk, double size) override;
+  Action* io_stream(s4u::Host* src_host, DiskImpl* src_disk, s4u::Host* dst_host, DiskImpl* dst_disk,
+                    double size) override;
 };
 } // namespace simgrid::kernel::resource
 

diff --git a/src/surf/network_cm02.cpp b/src/kernel/resource/models/network_cm02.cpp
similarity index 99%
rename from src/surf/network_cm02.cpp
rename to src/kernel/resource/models/network_cm02.cpp
index c5f4aaf..acae09d 100644 (file)
--- a/src/surf/network_cm02.cpp
+++ b/src/kernel/resource/models/network_cm02.cpp
@@ -3,7 +3,7 @@
 /* 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 "src/surf/network_cm02.hpp"
+#include "src/kernel/resource/models/network_cm02.hpp"
 #include "simgrid/kernel/routing/NetZoneImpl.hpp"
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/Host.hpp"
@@ -12,7 +12,6 @@
 #include "src/kernel/resource/StandardLinkImpl.hpp"
 #include "src/kernel/resource/WifiLinkImpl.hpp"
 #include "src/kernel/resource/profile/Event.hpp"
-#include "src/surf/surf_interface.hpp"
 
 #include <algorithm>
 #include <numeric>

diff --git a/src/surf/network_cm02.hpp b/src/kernel/resource/models/network_cm02.hpp
similarity index 97%
rename from src/surf/network_cm02.hpp
rename to src/kernel/resource/models/network_cm02.hpp
index 4c83bc7..610d26c 100644 (file)
--- a/src/surf/network_cm02.hpp
+++ b/src/kernel/resource/models/network_cm02.hpp
@@ -69,8 +69,7 @@ public:
  * Action *
  **********/
 class NetworkCm02Action : public NetworkAction {
-  friend Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate,
-                                               bool streamed);
+  friend Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate, bool streamed);
 
 public:
   using NetworkAction::NetworkAction;

diff --git a/src/surf/network_constant.cpp b/src/kernel/resource/models/network_constant.cpp
similarity index 97%
rename from src/surf/network_constant.cpp
rename to src/kernel/resource/models/network_constant.cpp
index d11996d..33c0367 100644 (file)
--- a/src/surf/network_constant.cpp
+++ b/src/kernel/resource/models/network_constant.cpp
@@ -7,8 +7,7 @@
 #include <simgrid/s4u/Engine.hpp>
 
 #include "src/kernel/EngineImpl.hpp"
-#include "src/surf/network_constant.hpp"
-#include "src/surf/surf_interface.hpp"
+#include "src/kernel/resource/models/network_constant.hpp"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(res_network);
 

diff --git a/src/surf/network_constant.hpp b/src/kernel/resource/models/network_constant.hpp
similarity index 100%
rename from src/surf/network_constant.hpp
rename to src/kernel/resource/models/network_constant.hpp

diff --git a/src/surf/network_ib.cpp b/src/kernel/resource/models/network_ib.cpp
similarity index 99%
rename from src/surf/network_ib.cpp
rename to src/kernel/resource/models/network_ib.cpp
index 10a2d01..f4d044b 100644 (file)
--- a/src/surf/network_ib.cpp
+++ b/src/kernel/resource/models/network_ib.cpp
@@ -8,8 +8,8 @@
 #include "simgrid/sg_config.hpp"
 #include "src/kernel/EngineImpl.hpp"
 #include "src/kernel/activity/CommImpl.hpp"
+#include "src/kernel/resource/models/network_ib.hpp"
 #include "src/surf/HostImpl.hpp"
-#include "src/surf/network_ib.hpp"
 
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/algorithm/string/split.hpp>

diff --git a/src/surf/network_ib.hpp b/src/kernel/resource/models/network_ib.hpp
similarity index 87%
rename from src/surf/network_ib.hpp
rename to src/kernel/resource/models/network_ib.hpp
index a97ed9e..a720c94 100644 (file)
--- a/src/surf/network_ib.hpp
+++ b/src/kernel/resource/models/network_ib.hpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2014-2023. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2014-2023. 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. */
@@ -7,8 +6,7 @@
 #ifndef SURF_NETWORK_IB_HPP_
 #define SURF_NETWORK_IB_HPP_
 
-#include "src/surf/network_cm02.hpp"
-#include "xbt/base.h"
+#include "src/kernel/resource/models/network_cm02.hpp"
 
 #include <map>
 #include <vector>
@@ -47,7 +45,7 @@ class XBT_PRIVATE NetworkIBModel : public NetworkCm02Model {
 
 public:
   explicit NetworkIBModel(const std::string& name);
-  NetworkIBModel(const NetworkIBModel&) = delete;
+  NetworkIBModel(const NetworkIBModel&)            = delete;
   NetworkIBModel& operator=(const NetworkIBModel&) = delete;
   void update_IB_factors(NetworkAction* action, IBNode* from, IBNode* to, int remove) const;
 

diff --git a/src/surf/network_ns3.cpp b/src/kernel/resource/models/network_ns3.cpp
similarity index 99%
rename from src/surf/network_ns3.cpp
rename to src/kernel/resource/models/network_ns3.cpp
index 01dddaf..5187493 100644 (file)
--- a/src/surf/network_ns3.cpp
+++ b/src/kernel/resource/models/network_ns3.cpp
@@ -29,7 +29,7 @@
 #include "ns3/wifi-module.h"
 
 #include "network_ns3.hpp"
-#include "ns3/ns3_simulator.hpp"
+#include "src/surf/ns3/ns3_simulator.hpp"
 
 #include "simgrid/kernel/routing/NetPoint.hpp"
 #include "simgrid/kernel/routing/NetZoneImpl.hpp"
@@ -39,7 +39,6 @@
 #include "simgrid/s4u/NetZone.hpp"
 #include "src/instr/instr_private.hpp" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals
 #include "src/kernel/EngineImpl.hpp"
-#include "src/surf/surf_interface.hpp"
 #include "src/surf/xml/platf_private.hpp" // ClusterCreationArgs
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(res_ns3, res_network, "Network model based on ns-3");
@@ -101,7 +100,7 @@ static void zoneCreation_cb(simgrid::s4u::NetZone const& zone)
   wifi.SetStandard(ns3::WIFI_STANDARD_80211n_5GHZ);
 #else
   wifi.SetStandard(ns3::WIFI_STANDARD_80211n);
-  wifiPhy.Set ("ChannelSettings", ns3::StringValue ("{0, 0, BAND_5GHZ, 0}"));
+  wifiPhy.Set("ChannelSettings", ns3::StringValue("{0, 0, BAND_5GHZ, 0}"));
 #endif
 
   std::string ssid = wifizone->get_name();
@@ -141,9 +140,9 @@ static void zoneCreation_cb(simgrid::s4u::NetZone const& zone)
   NetPointNs3* station_netpoint_ns3    = nullptr;
   ns3::Ptr<ns3::Node> station_ns3_node = nullptr;
   double distance;
-  double angle    = 0;
+  double angle     = 0;
   auto nb_stations = static_cast<double>(wifizone->get_all_hosts().size() - 1);
-  double step     = 2 * M_PI / nb_stations;
+  double step      = 2 * M_PI / nb_stations;
   for (const auto* station_host : wifizone->get_all_hosts()) {
     station_netpoint_ns3 = station_host->get_netpoint()->extension<NetPointNs3>();
     if (station_netpoint_ns3 == access_point_netpoint_ns3)

diff --git a/src/surf/network_ns3.hpp b/src/kernel/resource/models/network_ns3.hpp
similarity index 100%
rename from src/surf/network_ns3.hpp
rename to src/kernel/resource/models/network_ns3.hpp

diff --git a/src/surf/ptask_L07.cpp b/src/kernel/resource/models/ptask_L07.cpp
similarity index 98%
rename from src/surf/ptask_L07.cpp
rename to src/kernel/resource/models/ptask_L07.cpp
index 725e62e..54dc3e6 100644 (file)
--- a/src/surf/ptask_L07.cpp
+++ b/src/kernel/resource/models/ptask_L07.cpp
@@ -13,8 +13,8 @@
 #if SIMGRID_HAVE_EIGEN3
 #include "src/kernel/lmm/bmf.hpp"
 #endif
+#include "src/kernel/resource/models/ptask_L07.hpp"
 #include "src/kernel/resource/profile/Event.hpp"
-#include "src/surf/ptask_L07.hpp"
 
 #include <unordered_set>
 
@@ -142,8 +142,8 @@ void HostL07Model::update_actions_state(double /*now*/, double delta)
     }
 
     /* Need to check that none of the model has failed */
-    int i                               = 0;
-    const lmm::Constraint* cnst         = action.get_variable()->get_constraint(i);
+    int i                       = 0;
+    const lmm::Constraint* cnst = action.get_variable()->get_constraint(i);
     while (cnst != nullptr) {
       i++;
       if (not cnst->get_id()->is_on()) {
@@ -298,7 +298,8 @@ void CpuL07::on_speed_change()
 {
   const lmm::Element* elem = nullptr;
 
-  get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(), get_core_count() * speed_.peak * speed_.scale);
+  get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(),
+                                                            get_core_count() * speed_.peak * speed_.scale);
 
   while (const auto* var = get_constraint()->get_variable(&elem)) {
     const auto* action = static_cast<L07Action*>(var->get_id());

diff --git a/src/surf/ptask_L07.hpp b/src/kernel/resource/models/ptask_L07.hpp
similarity index 93%
rename from src/surf/ptask_L07.hpp
rename to src/kernel/resource/models/ptask_L07.hpp
index 85cbc0d..072c879 100644 (file)
--- a/src/surf/ptask_L07.hpp
+++ b/src/kernel/resource/models/ptask_L07.hpp
@@ -33,7 +33,7 @@ class XBT_PRIVATE L07Action;
 class HostL07Model : public HostModel {
 public:
   HostL07Model(const std::string& name, lmm::System* sys);
-  HostL07Model(const HostL07Model&) = delete;
+  HostL07Model(const HostL07Model&)            = delete;
   HostL07Model& operator=(const HostL07Model&) = delete;
 
   double next_occurring_event(double now) override;
@@ -41,13 +41,17 @@ public:
   Action* execute_thread(const s4u::Host* host, double flops_amount, int thread_count) override { return nullptr; }
   CpuAction* execute_parallel(const std::vector<s4u::Host*>& host_list, const double* flops_amount,
                               const double* bytes_amount, double rate) override;
-  Action* io_stream(s4u::Host* src_host, DiskImpl* src_disk, s4u::Host* dst_host, DiskImpl* dst_disk, double size) override { return nullptr; }
+  Action* io_stream(s4u::Host* src_host, DiskImpl* src_disk, s4u::Host* dst_host, DiskImpl* dst_disk,
+                    double size) override
+  {
+    return nullptr;
+  }
 };
 
 class CpuL07Model : public CpuModel {
 public:
   CpuL07Model(const std::string& name, HostL07Model* hmodel, lmm::System* sys);
-  CpuL07Model(const CpuL07Model&) = delete;
+  CpuL07Model(const CpuL07Model&)            = delete;
   CpuL07Model& operator=(const CpuL07Model&) = delete;
   ~CpuL07Model() override;
   void update_actions_state(double /*now*/, double /*delta*/) override{
@@ -63,7 +67,7 @@ public:
 class NetworkL07Model : public NetworkModel {
 public:
   NetworkL07Model(const std::string& name, HostL07Model* hmodel, lmm::System* sys);
-  NetworkL07Model(const NetworkL07Model&) = delete;
+  NetworkL07Model(const NetworkL07Model&)            = delete;
   NetworkL07Model& operator=(const NetworkL07Model&) = delete;
   ~NetworkL07Model() override;
   StandardLinkImpl* create_link(const std::string& name, const std::vector<double>& bandwidths) final;
@@ -86,7 +90,7 @@ public:
 class CpuL07 : public CpuImpl {
 public:
   using CpuImpl::CpuImpl;
-  CpuL07(const CpuL07&) = delete;
+  CpuL07(const CpuL07&)            = delete;
   CpuL07& operator=(const CpuL07&) = delete;
 
   void apply_event(profile::Event* event, double value) override;
@@ -105,7 +109,7 @@ protected:
 class LinkL07 : public StandardLinkImpl {
 public:
   LinkL07(const std::string& name, double bandwidth, lmm::System* system);
-  LinkL07(const LinkL07&) = delete;
+  LinkL07(const LinkL07&)            = delete;
   LinkL07& operator=(const LinkL07&) = delete;
   ~LinkL07() override;
   void apply_event(profile::Event* event, double value) override;
@@ -152,7 +156,7 @@ public:
   L07Action() = delete;
   L07Action(Model* model, const std::vector<s4u::Host*>& host_list, const double* flops_amount,
             const double* bytes_amount, double rate);
-  L07Action(const L07Action&) = delete;
+  L07Action(const L07Action&)            = delete;
   L07Action& operator=(const L07Action&) = delete;
   ~L07Action() override;
 

diff --git a/src/kernel/resource/profile/Profile.cpp b/src/kernel/resource/profile/Profile.cpp
index d8903c4..e0f4722 100644 (file)
--- a/src/kernel/resource/profile/Profile.cpp
+++ b/src/kernel/resource/profile/Profile.cpp
@@ -4,11 +4,10 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "src/kernel/resource/profile/Profile.hpp"
-#include "xbt/asserts.h"
 #include "src/kernel/resource/profile/Event.hpp"
 #include "src/kernel/resource/profile/FutureEvtSet.hpp"
 #include "src/kernel/resource/profile/StochasticDatedValue.hpp"
-#include "src/surf/surf_interface.hpp"
+#include "xbt/asserts.h"
 
 #include <boost/algorithm/string.hpp>
 #include <fstream>

diff --git a/src/kernel/resource/profile/ProfileBuilder.cpp b/src/kernel/resource/profile/ProfileBuilder.cpp
index 742b854..83c587d 100644 (file)
--- a/src/kernel/resource/profile/ProfileBuilder.cpp
+++ b/src/kernel/resource/profile/ProfileBuilder.cpp
@@ -7,13 +7,14 @@
 #include "simgrid/forward.h"
 #include "src/kernel/resource/profile/Profile.hpp"
 #include "src/kernel/resource/profile/StochasticDatedValue.hpp"
-#include "src/surf/surf_interface.hpp"
+#include "xbt/asserts.h"
 #include "xbt/file.hpp"
 
 #include <boost/algorithm/string.hpp>
 #include <boost/intrusive/options.hpp>
 #include <cstddef>
 #include <fstream>
+#include <math.h>
 #include <sstream>
 #include <string_view>
 

diff --git a/src/kernel/resource/profile/Profile_test.cpp b/src/kernel/resource/profile/Profile_test.cpp
index bb5960d..c8a73b9 100644 (file)
--- a/src/kernel/resource/profile/Profile_test.cpp
+++ b/src/kernel/resource/profile/Profile_test.cpp
@@ -5,11 +5,10 @@
 
 #include "catch.hpp"
 
+#include "simgrid/kernel/ProfileBuilder.hpp"
 #include "src/kernel/resource/Resource.hpp"
 #include "src/kernel/resource/profile/Event.hpp"
-#include "simgrid/kernel/ProfileBuilder.hpp"
 #include "src/kernel/resource/profile/StochasticDatedValue.hpp"
-#include "src/surf/surf_interface.hpp"
 
 #include "xbt/log.h"
 #include "xbt/misc.h"

diff --git a/src/plugins/file_system/s4u_FileSystem.cpp b/src/plugins/file_system/s4u_FileSystem.cpp
index 929cf17..15f1871 100644 (file)
--- a/src/plugins/file_system/s4u_FileSystem.cpp
+++ b/src/plugins/file_system/s4u_FileSystem.cpp
@@ -15,8 +15,6 @@
 #include <xbt/log.h>
 #include <xbt/parse_units.hpp>
 
-#include "src/surf/surf_interface.hpp"
-
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/split.hpp>
 #include <fstream>

diff --git a/src/plugins/link_energy.cpp b/src/plugins/link_energy.cpp
index 116d5ae..29b3700 100644 (file)
--- a/src/plugins/link_energy.cpp
+++ b/src/plugins/link_energy.cpp
@@ -9,7 +9,7 @@
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/Link.hpp"
 #include "src/kernel/activity/CommImpl.hpp"
-#include "src/surf/surf_interface.hpp"
+#include "src/simgrid/module.hpp"
 
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/algorithm/string/split.hpp>

diff --git a/src/s4u/s4u_VirtualMachine.cpp b/src/s4u/s4u_VirtualMachine.cpp
index 2f15e4e..1c305be 100644 (file)
--- a/src/s4u/s4u_VirtualMachine.cpp
+++ b/src/s4u/s4u_VirtualMachine.cpp
@@ -9,7 +9,7 @@
 #include <simgrid/vm.h>
 
 #include "src/kernel/resource/VirtualMachineImpl.hpp"
-#include "src/surf/cpu_cas01.hpp"
+#include "src/kernel/resource/models/cpu_cas01.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_vm, s4u, "S4U virtual machines");
 

diff --git a/src/simgrid/module.cpp b/src/simgrid/module.cpp
index 2ed2f70..dbfdf01 100644 (file)
--- a/src/simgrid/module.cpp
+++ b/src/simgrid/module.cpp
@@ -8,7 +8,6 @@
 
 #include "simgrid/sg_config.hpp"
 #include "src/simgrid/module.hpp"
-#include "src/surf/surf_interface.hpp"
 
 #include <sstream>
 

diff --git a/src/simgrid/sg_config.cpp b/src/simgrid/sg_config.cpp
index 44e982d..e10fa92 100644 (file)
--- a/src/simgrid/sg_config.cpp
+++ b/src/simgrid/sg_config.cpp
@@ -21,7 +21,6 @@
 #include "src/mc/mc_replay.hpp"
 #include "src/simgrid/module.hpp"
 #include "src/smpi/include/smpi_config.hpp"
-#include "src/surf/surf_interface.hpp"
 
 #include <string_view>
 

diff --git a/src/surf/ns3/ns3_simulator.hpp b/src/surf/ns3/ns3_simulator.hpp
index d1bc01b..5f6ae2a 100644 (file)
--- a/src/surf/ns3/ns3_simulator.hpp
+++ b/src/surf/ns3/ns3_simulator.hpp
@@ -7,7 +7,7 @@
 #define NS3_SIMULATOR_HPP
 
 #include "simgrid/s4u/Host.hpp"
-#include "src/surf/network_ns3.hpp"
+#include "src/kernel/resource/models/network_ns3.hpp"
 
 #include "ns3/wifi-module.h"
 #include <ns3/node.h>

diff --git a/src/surf/xml/surfxml_parseplatf.cpp b/src/surf/xml/surfxml_parseplatf.cpp
index 951b12a..86d89c0 100644 (file)
--- a/src/surf/xml/surfxml_parseplatf.cpp
+++ b/src/surf/xml/surfxml_parseplatf.cpp
@@ -7,7 +7,6 @@
 
 #include "src/kernel/resource/CpuImpl.hpp"
 #include "src/kernel/resource/LinkImpl.hpp"
-#include "src/surf/surf_interface.hpp"
 #include "src/surf/xml/platf.hpp"
 #include "src/surf/xml/platf_private.hpp"
 

diff --git a/src/surf/xml/surfxml_sax_cb.cpp b/src/surf/xml/surfxml_sax_cb.cpp
index ad0431a..36a0728 100644 (file)
--- a/src/surf/xml/surfxml_sax_cb.cpp
+++ b/src/surf/xml/surfxml_sax_cb.cpp
@@ -13,7 +13,6 @@
 #include "src/kernel/resource/LinkImpl.hpp"
 #include "src/kernel/resource/profile/FutureEvtSet.hpp"
 #include "src/kernel/resource/profile/Profile.hpp"
-#include "src/surf/surf_interface.hpp"
 #include "src/surf/xml/platf.hpp"
 #include "src/surf/xml/platf_private.hpp"
 

diff --git a/teshsuite/surf/lmm_usage/lmm_usage.cpp b/teshsuite/surf/lmm_usage/lmm_usage.cpp
index 6e841ac..3e40583 100644 (file)
--- a/teshsuite/surf/lmm_usage/lmm_usage.cpp
+++ b/teshsuite/surf/lmm_usage/lmm_usage.cpp
@@ -7,7 +7,6 @@
 
 #include "simgrid/s4u/Engine.hpp"
 #include "src/kernel/lmm/maxmin.hpp"
-#include "src/surf/surf_interface.hpp"
 #include "xbt/log.h"
 #include "xbt/module.h"
 #include "xbt/sysdep.h"

diff --git a/teshsuite/surf/surf_usage2/surf_usage2.cpp b/teshsuite/surf/surf_usage2/surf_usage2.cpp
index c8a2859..2bec300 100644 (file)
--- a/teshsuite/surf/surf_usage2/surf_usage2.cpp
+++ b/teshsuite/surf/surf_usage2/surf_usage2.cpp
@@ -12,7 +12,6 @@
 #include "src/kernel/EngineImpl.hpp"
 #include "src/kernel/resource/CpuImpl.hpp"
 #include "src/kernel/resource/NetworkModel.hpp"
-#include "src/surf/surf_interface.hpp"
 #include "xbt/config.hpp"
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(surf_test, "Messages specific for surf example");

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 73d2cb1..4c43174 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -21,6 +21,17 @@ set(EXTRA_DIST
   src/kernel/resource/SplitDuplexLinkImpl.hpp
   src/kernel/resource/StandardLinkImpl.hpp
   src/kernel/resource/WifiLinkImpl.hpp
+  src/kernel/resource/models/cpu_cas01.hpp
+  src/kernel/resource/models/cpu_ti.hpp
+  src/kernel/resource/models/disk_s19.hpp
+  src/kernel/resource/models/host_clm03.hpp
+  src/kernel/resource/models/network_cm02.hpp
+  src/kernel/resource/models/network_constant.hpp
+  src/kernel/resource/models/network_ib.hpp
+  src/kernel/resource/models/network_ns3.hpp
+  src/surf/ns3/ns3_simulator.hpp
+  src/kernel/resource/models/ptask_L07.hpp
+  
   src/mc/mc_mmu.hpp
   src/mc/mc_record.hpp
   src/smpi/colls/coll_tuned_topo.hpp
@@ -31,16 +42,6 @@ set(EXTRA_DIST
   src/smpi/smpi_main.c
   src/smpi/smpi_replay_main.cpp
   src/surf/HostImpl.hpp
-  src/surf/cpu_cas01.hpp
-  src/surf/cpu_ti.hpp
-  src/surf/disk_s19.hpp
-  src/surf/host_clm03.hpp
-  src/surf/network_cm02.hpp
-  src/surf/network_constant.hpp
-  src/surf/network_ib.hpp
-  src/surf/network_ns3.hpp
-  src/surf/ns3/ns3_simulator.hpp
-  src/surf/ptask_L07.hpp
   src/surf/surf_interface.hpp
   src/surf/xml/simgrid.dtd
   src/surf/xml/simgrid_dtd.c
@@ -243,7 +244,7 @@ set(SMPI_SRC
   src/smpi/plugins/ampi/ampi.hpp
   src/smpi/plugins/ampi/instr_ampi.cpp
   src/smpi/plugins/ampi/instr_ampi.hpp
-  src/surf/network_ib.cpp
+  src/kernel/resource/models/network_ib.cpp
   )
 set(STHREAD_SRC
   src/sthread/sthread_impl.cpp
@@ -292,7 +293,7 @@ else()
 endif()
 
 set(NS3_SRC
-  src/surf/network_ns3.cpp
+  src/kernel/resource/models/network_ns3.cpp
   src/surf/ns3/ns3_simulator.cpp
   )
 
@@ -324,6 +325,14 @@ set(SURF_SRC
   src/kernel/resource/VirtualMachineImpl.hpp
   src/kernel/resource/WifiLinkImpl.cpp
 
+  src/kernel/resource/models/cpu_cas01.cpp
+  src/kernel/resource/models/cpu_ti.cpp
+  src/kernel/resource/models/disk_s19.cpp
+  src/kernel/resource/models/host_clm03.cpp
+  src/kernel/resource/models/network_cm02.cpp
+  src/kernel/resource/models/network_constant.cpp
+  src/kernel/resource/models/ptask_L07.cpp
+
   src/kernel/resource/profile/Event.hpp
   src/kernel/resource/profile/FutureEvtSet.cpp
   src/kernel/resource/profile/FutureEvtSet.hpp
@@ -351,13 +360,6 @@ set(SURF_SRC
   src/kernel/timer/Timer.cpp
 
   src/surf/HostImpl.cpp
-  src/surf/cpu_cas01.cpp
-  src/surf/cpu_ti.cpp
-  src/surf/disk_s19.cpp
-  src/surf/host_clm03.cpp
-  src/surf/network_cm02.cpp
-  src/surf/network_constant.cpp
-  src/surf/ptask_L07.cpp
   src/surf/sg_platf.cpp
   src/surf/xml/platf.hpp
   src/surf/xml/platf_private.hpp