/* 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 "network_cm02.hpp"
+#include "src/surf/network_cm02.hpp"
#include "simgrid/s4u/Host.hpp"
#include "simgrid/sg_config.hpp"
#include "src/kernel/resource/profile/Event.hpp"
+#include "src/surf/network_wifi.hpp"
#include "src/surf/surf_interface.hpp"
#include "surf/surf.hpp"
LinkImpl* NetworkCm02Model::create_link(const std::string& name, const std::vector<double>& bandwidths, double latency,
s4u::Link::SharingPolicy policy)
{
- if (policy == s4u::Link::SharingPolicy::WIFI) {
- return (new NetworkWifiLink(this, name, bandwidths, policy, get_maxmin_system()));
- }
- xbt_assert(bandwidths.size() == 1, "Non WIFI links must use only 1 bandwidth.");
+ if (policy == s4u::Link::SharingPolicy::WIFI)
+ return new NetworkWifiLink(this, name, bandwidths, policy, get_maxmin_system());
+
+ xbt_assert(bandwidths.size() == 1, "Non-WIFI links must use only 1 bandwidth.");
return new NetworkCm02Link(this, name, bandwidths[0], latency, policy, get_maxmin_system());
}
} else if (triggered == state_event_) {
if (value > 0)
turn_on();
- else {
+ else
turn_off();
- }
tmgr_trace_event_unref(&state_event_);
} else {
xbt_die("Unknown event!\n");
}
}
-NetworkWifiLink::NetworkWifiLink(NetworkCm02Model* model, const std::string& name, std::vector<double> bandwidths,
- s4u::Link::SharingPolicy policy, lmm::System* system)
- : NetworkCm02Link(
- model, name, 1 / sg_bandwidth_factor, 0, policy,
- system) // Since link uses bw*sg_bandwidth_factor we should divide by sg_bw_factor to ensure that we have 1 as
- // a bound in the lmm system
-{
- for (auto bandwidth : bandwidths) {
- bandwidths_.push_back({bandwidth, 1.0, nullptr});
- }
-}
-
-void NetworkWifiLink::set_host_rate(s4u::Host* host, int rate_level)
-{
- auto insert_done = host_rates_.insert(std::make_pair(host->get_name(), rate_level));
- if (insert_done.second == false)
- insert_done.first->second = rate_level;
-}
-
-double NetworkWifiLink::get_host_rate(sg_host_t host)
-{
- std::map<xbt::string, int>::iterator host_rates_it;
- host_rates_it = host_rates_.find(host->get_name());
-
- if (host_rates_it == host_rates_.end())
- return -1;
-
- int rate_id = host_rates_it->second;
- xbt_assert(rate_id >= 0 && rate_id < (int)bandwidths_.size(), "Host \"%s\" has an invalid rate \"%d\"",
- host->get_name().c_str(), rate_id);
-
- Metric rate = bandwidths_[rate_id];
- return rate.peak * rate.scale;
-}
-
-s4u::Link::SharingPolicy NetworkWifiLink::get_sharing_policy()
-{
- return s4u::Link::SharingPolicy::WIFI;
-}
-
/**********
* Action *
**********/
void set_latency(double value) override;
};
-class NetworkWifiLink : public NetworkCm02Link {
- /** @brief Hold every rates association between host and links (host name, rates id) */
- std::map<xbt::string, int> host_rates_;
-
- /** @brief A link can have several bandwidth attach to it (mostly use by wifi model) */
- std::vector<Metric> bandwidths_;
-
-public:
- NetworkWifiLink(NetworkCm02Model* model, const std::string& name, std::vector<double> bandwidths,
- s4u::Link::SharingPolicy policy, lmm::System* system);
-
- void set_host_rate(s4u::Host* host, int rate_level);
- /** @brief Get the AP rate associated to the host (or -1 if not associated to the AP) */
- double get_host_rate(s4u::Host* host);
- s4u::Link::SharingPolicy get_sharing_policy() override;
-};
-
/**********
* Action *
**********/
--- /dev/null
+/* Copyright (c) 2013-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 "network_wifi.hpp"
+#include "simgrid/s4u/Host.hpp"
+#include "src/surf/surf_interface.hpp"
+/*
+#include "simgrid/sg_config.hpp"
+#include "src/kernel/resource/profile/Event.hpp"
+#include "surf/surf.hpp"
+
+#include <algorithm>
+#include <numeric>
+*/
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
+
+namespace simgrid {
+namespace kernel {
+namespace resource {
+
+/************
+ * Resource *
+ ************/
+
+NetworkWifiLink::NetworkWifiLink(NetworkCm02Model* model, const std::string& name, std::vector<double> bandwidths,
+ s4u::Link::SharingPolicy policy, lmm::System* system)
+ : NetworkCm02Link(
+ model, name, 1 / sg_bandwidth_factor, 0, policy,
+ system) // Since link use bw*sg_bandwidth_factor we should divise in order to as 1 as bound in the lmm system
+{
+ for (auto bandwidth : bandwidths) {
+ bandwidths_.push_back({bandwidth, 1.0, nullptr});
+ }
+}
+
+void NetworkWifiLink::set_host_rate(s4u::Host* host, int rate_level)
+{
+ auto insert_done = host_rates_.insert(std::make_pair(host->get_name(), rate_level));
+ if (insert_done.second == false)
+ insert_done.first->second = rate_level;
+}
+
+double NetworkWifiLink::get_host_rate(sg_host_t host)
+{
+ std::map<xbt::string, int>::iterator host_rates_it;
+ host_rates_it = host_rates_.find(host->get_name());
+
+ if (host_rates_it == host_rates_.end())
+ return -1;
+
+ int rate_id = host_rates_it->second;
+ xbt_assert(rate_id >= 0 && rate_id < (int)bandwidths_.size(), "Host \"%s\" has an invalid rate \"%d\"",
+ host->get_name().c_str(), rate_id);
+
+ Metric rate = bandwidths_[rate_id];
+ return rate.peak * rate.scale;
+}
+
+s4u::Link::SharingPolicy NetworkWifiLink::get_sharing_policy()
+{
+ return s4u::Link::SharingPolicy::WIFI;
+}
+
+} // namespace resource
+} // namespace kernel
+} // namespace simgrid
--- /dev/null
+/* Copyright (c) 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. */
+
+#ifndef SURF_NETWORK_WIFI_HPP_
+#define SURF_NETWORK_WIFI_HPP_
+
+#include <xbt/base.h>
+
+#include "network_cm02.hpp"
+#include "xbt/string.hpp"
+
+/***********
+ * Classes *
+ ***********/
+
+namespace simgrid {
+namespace kernel {
+namespace resource {
+
+class NetworkWifiLink : public NetworkCm02Link {
+ /** @brief Hold every rates association between host and links (host name, rates id) */
+ std::map<xbt::string, int> host_rates_;
+
+ /** @brief A link can have several bandwith attach to it (mostly use by wifi model) */
+ std::vector<Metric> bandwidths_;
+
+public:
+ NetworkWifiLink(NetworkCm02Model* model, const std::string& name, std::vector<double> bandwidths,
+ s4u::Link::SharingPolicy policy, lmm::System* system);
+
+ void set_host_rate(s4u::Host* host, int rate_level);
+ /** @brief Get the AP rate associated to the host (or -1 if not associated to the AP) */
+ double get_host_rate(s4u::Host* host);
+ s4u::Link::SharingPolicy get_sharing_policy() override;
+};
+
+} // namespace resource
+} // namespace kernel
+} // namespace simgrid
+#endif /* SURF_NETWORK_WIFI_HPP_ */
#include "xbt/log.h"
#include "simgrid/msg.h"
-#include "src/surf/network_cm02.hpp"
+#include "src/surf/network_wifi.hpp"
#include <exception>
#include <iostream>
#include <random>
src/surf/network_ns3.hpp
src/surf/network_smpi.hpp
src/surf/network_ib.hpp
+ src/surf/network_wifi.hpp
src/surf/ns3/ns3_simulator.hpp
src/surf/xml/simgrid.dtd
src/surf/xml/simgrid_dtd.h
src/surf/network_cm02.cpp
src/surf/network_constant.cpp
src/surf/network_interface.cpp
+ src/surf/network_wifi.cpp
src/surf/PropertyHolder.cpp
src/surf/sg_platf.cpp
src/surf/StorageImpl.cpp
