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
snake_case s4u::Activity
[simgrid.git]
/
include
/
simgrid
/
s4u
/
Host.hpp
diff --git
a/include/simgrid/s4u/Host.hpp
b/include/simgrid/s4u/Host.hpp
index
6495cf5
..
3696d91
100644
(file)
--- a/
include/simgrid/s4u/Host.hpp
+++ b/
include/simgrid/s4u/Host.hpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2006-201
7
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2006-201
8
. 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. */
@@
-6,22
+6,20
@@
#ifndef SIMGRID_S4U_HOST_HPP
#define SIMGRID_S4U_HOST_HPP
#ifndef SIMGRID_S4U_HOST_HPP
#define SIMGRID_S4U_HOST_HPP
+#include <simgrid/forward.h>
+#include <simgrid/s4u/forward.hpp>
+#include <xbt/Extendable.hpp>
+#include <xbt/signal.hpp>
+#include <xbt/string.hpp>
+
#include <map>
#include <string>
#include <unordered_map>
#include <map>
#include <string>
#include <unordered_map>
-#include "xbt/Extendable.hpp"
-#include "xbt/signal.hpp"
-#include "xbt/string.hpp"
-#include "xbt/swag.h"
-
-#include "simgrid/forward.h"
-#include "simgrid/s4u/forward.hpp"
-
namespace simgrid {
namespace xbt {
namespace simgrid {
namespace xbt {
-extern template class XBT_PUBLIC
()
Extendable<simgrid::s4u::Host>;
+extern template class XBT_PUBLIC Extendable<simgrid::s4u::Host>;
}
namespace s4u {
}
namespace s4u {
@@
-38,8
+36,7
@@
namespace s4u {
* You can retrieve a particular host using simgrid::s4u::Host::byName()
* and actors can retrieve the host on which they run using simgrid::s4u::Host::current().
*/
* You can retrieve a particular host using simgrid::s4u::Host::byName()
* and actors can retrieve the host on which they run using simgrid::s4u::Host::current().
*/
-XBT_PUBLIC_CLASS Host : public simgrid::xbt::Extendable<Host>
-{
+class XBT_PUBLIC Host : public simgrid::xbt::Extendable<Host> {
public:
explicit Host(const char* name);
public:
explicit Host(const char* name);
@@
-52,7
+49,7
@@
private:
bool currentlyDestroying_ = false;
public:
bool currentlyDestroying_ = false;
public:
- void destroy();
+ v
irtual v
oid destroy();
// No copy/move
Host(Host const&) = delete;
Host& operator=(Host const&) = delete;
// No copy/move
Host(Host const&) = delete;
Host& operator=(Host const&) = delete;
@@
-62,14
+59,22
@@
public:
/** Retrieves an host from its name, or return nullptr */
static Host* by_name_or_null(std::string name);
/** Retrieves an host from its name, or die */
/** Retrieves an host from its name, or return nullptr */
static Host* by_name_or_null(std::string name);
/** Retrieves an host from its name, or die */
+ static s4u::Host* by_name(const char* name);
+ /** Retrieves an host from its name, or die */
static s4u::Host* by_name(std::string name);
/** Retrieves the host on which the current actor is running */
static s4u::Host* current();
static s4u::Host* by_name(std::string name);
/** Retrieves the host on which the current actor is running */
static s4u::Host* current();
+ XBT_ATTRIB_DEPRECATED_v323("Please use Host::get_name()") simgrid::xbt::string const& getName() const
+ {
+ return name_;
+ }
+ XBT_ATTRIB_DEPRECATED_v323("Please use Host::get_cname()") const char* getCname() const { return name_.c_str(); }
+
/** Retrieves the name of that host as a C++ string */
/** Retrieves the name of that host as a C++ string */
- simgrid::xbt::string const& get
N
ame() const { return name_; }
+ simgrid::xbt::string const& get
_n
ame() const { return name_; }
/** Retrieves the name of that host as a C string */
/** Retrieves the name of that host as a C string */
- const char* get
C
name() const { return name_.c_str(); }
+ const char* get
_c
name() const { return name_.c_str(); }
void actorList(std::vector<ActorPtr> * whereto);
void actorList(std::vector<ActorPtr> * whereto);
@@
-96,7
+101,9
@@
public:
int getPstatesCount() const;
void setPstate(int pstate_index);
int getPstate();
int getPstatesCount() const;
void setPstate(int pstate_index);
int getPstate();
- void getAttachedStorages(std::vector<const char*> * storages);
+ std::vector<const char*> get_attached_storages();
+ XBT_ATTRIB_DEPRECATED_v323("Please use Host::get_attached_storages() instead.") void getAttachedStorages(
+ std::vector<const char*>* storages);
/** Get an associative list [mount point]->[Storage] of all local mount points.
*
/** Get an associative list [mount point]->[Storage] of all local mount points.
*
@@
-104,8
+111,8
@@
public:
*/
std::unordered_map<std::string, Storage*> const& getMountedStorages();
*/
std::unordered_map<std::string, Storage*> const& getMountedStorages();
- void routeTo(Host
* dest, std::vector<Link*> *
links, double* latency);
- void routeTo(Host
* dest, std::vector<surf::LinkImpl*> *
links, double* latency);
+ void routeTo(Host
* dest, std::vector<Link*>&
links, double* latency);
+ void routeTo(Host
* dest, std::vector<kernel::resource::LinkImpl*>&
links, double* latency);
/** Block the calling actor on an execution located on the called host
*
/** Block the calling actor on an execution located on the called host
*
@@
-114,8
+121,11
@@
public:
*/
void execute(double flops);
*/
void execute(double flops);
+ /** @brief Returns the current computation load (in flops per second) */
+ double getLoad();
+
private:
private:
- simgrid::xbt::string name_
= "noname"
;
+ simgrid::xbt::string name_
{"noname"}
;
std::unordered_map<std::string, Storage*>* mounts = nullptr; // caching
public:
std::unordered_map<std::string, Storage*>* mounts = nullptr; // caching
public: