A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Another attempt at fixing the Flag2 job of jenkins
[simgrid.git]
/
src
/
kernel
/
resource
/
WifiLinkImpl.hpp
diff --git
a/src/kernel/resource/WifiLinkImpl.hpp
b/src/kernel/resource/WifiLinkImpl.hpp
index 223f63eab16adf963c22fac2ebbd893c79428b79..969eeeb260eccef35c30cdcc19c822b6dda0d24a 100644
(file)
--- a/
src/kernel/resource/WifiLinkImpl.hpp
+++ b/
src/kernel/resource/WifiLinkImpl.hpp
@@
-1,15
+1,13
@@
-/* Copyright (c) 2019-202
2
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2019-202
3
. 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. */
/* 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 S
URF
_NETWORK_WIFI_HPP_
-#define S
URF
_NETWORK_WIFI_HPP_
+#ifndef S
IMGRID_KERNEL
_NETWORK_WIFI_HPP_
+#define S
IMGRID_KERNEL
_NETWORK_WIFI_HPP_
-#include <xbt/base.h>
-
-#include "src/surf/network_cm02.hpp"
-#include "xbt/string.hpp"
+#include "src/kernel/resource/models/network_cm02.hpp"
+#include "xbt/ex.h"
/***********
* Classes *
/***********
* Classes *
@@
-21,7
+19,7
@@
class XBT_PRIVATE WifiLinkAction;
class WifiLinkImpl : public StandardLinkImpl {
/** @brief Hold every rates association between host and links (host name, rates id) */
class WifiLinkImpl : public StandardLinkImpl {
/** @brief Hold every rates association between host and links (host name, rates id) */
- std::map<
xbt::string, int
> host_rates_;
+ std::map<
std::string, int, std::less<>
> host_rates_;
/** @brief A link can have several bandwidths attached to it (mostly use by wifi model) */
std::vector<Metric> bandwidths_;
/** @brief A link can have several bandwidths attached to it (mostly use by wifi model) */
std::vector<Metric> bandwidths_;
@@
-55,12
+53,11
@@
public:
void set_latency(double) override;
bool toggle_callback();
void set_latency(double) override;
bool toggle_callback();
- static void update_bw_comm_start(const kernel::activity::CommImpl&);
- static void update_bw_comm_end(simgrid::kernel::resource::NetworkAction& action, simgrid::kernel::resource::Action::State state);
+ static void update_bw_comm_end(const NetworkAction& action, Action::State state);
void inc_active_flux();
void dec_active_flux();
void inc_active_flux();
void dec_active_flux();
- static double wifi_link_dynamic_sharing(
WifiLinkImpl*
link, double capacity, int n);
- double get_max_ratio(
int
) const;
+ static double wifi_link_dynamic_sharing(
const WifiLinkImpl&
link, double capacity, int n);
+ double get_max_ratio() const;
size_t get_host_count() const;
};
size_t get_host_count() const;
};