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
Merge pull request #228 from Takishipp/actor-execute
[simgrid.git]
/
src
/
s4u
/
s4u_link.cpp
diff --git
a/src/s4u/s4u_link.cpp
b/src/s4u/s4u_link.cpp
index
3f719e5
..
c640077
100644
(file)
--- a/
src/s4u/s4u_link.cpp
+++ b/
src/s4u/s4u_link.cpp
@@
-19,32
+19,32
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_link, s4u, "Logging specific to the S4U link
extern "C" {
extern "C" {
-const char* sg_link_name(
Link*
link)
+const char* sg_link_name(
sg_link_t
link)
{
{
- return link->name();
+ return link->
getC
name();
}
}
-
Link*
sg_link_by_name(const char* name)
+
sg_link_t
sg_link_by_name(const char* name)
{
{
- return Link::byName(name);
+ return
simgrid::s4u::
Link::byName(name);
}
}
-int sg_link_is_shared(
Link*
link)
+int sg_link_is_shared(
sg_link_t
link)
{
return link->sharingPolicy();
}
{
return link->sharingPolicy();
}
-double sg_link_bandwidth(
Link*
link)
+double sg_link_bandwidth(
sg_link_t
link)
{
return link->bandwidth();
}
{
return link->bandwidth();
}
-double sg_link_latency(
Link*
link)
+double sg_link_latency(
sg_link_t
link)
{
return link->latency();
}
{
return link->latency();
}
-void* sg_link_data(
Link*
link)
+void* sg_link_data(
sg_link_t
link)
{
return link->getData();
}
{
return link->getData();
}
-void sg_link_data_set(
Link*
link, void* data)
+void sg_link_data_set(
sg_link_t
link, void* data)
{
link->setData(data);
}
{
link->setData(data);
}
@@
-52,10
+52,10
@@
int sg_link_count()
{
return simgrid::surf::LinkImpl::linksCount();
}
{
return simgrid::surf::LinkImpl::linksCount();
}
-
Link*
* sg_link_list()
+
sg_link_t
* sg_link_list()
{
simgrid::surf::LinkImpl** list = simgrid::surf::LinkImpl::linksList();
{
simgrid::surf::LinkImpl** list = simgrid::surf::LinkImpl::linksList();
-
Link** res = (Link*
*)list; // Use the same memory area
+
sg_link_t* res = (sg_link_t
*)list; // Use the same memory area
int size = sg_link_count();
for (int i = 0; i < size; i++)
int size = sg_link_count();
for (int i = 0; i < size; i++)
@@
-82,9
+82,17
@@
Link* Link::byName(const char* name)
return nullptr;
return &res->piface_;
}
return nullptr;
return &res->piface_;
}
+const std::string& Link::getName() const
+{
+ return this->pimpl_->getName();
+}
+const char* Link::getCname() const
+{
+ return this->pimpl_->getCname();
+}
const char* Link::name()
{
const char* Link::name()
{
- return
this->pimpl_->c
name();
+ return
getC
name();
}
bool Link::isUsed()
{
}
bool Link::isUsed()
{
@@
-152,9
+160,9
@@
void Link::setLatencyTrace(tmgr_trace_t trace)
/*************
* Callbacks *
*************/
/*************
* Callbacks *
*************/
-simgrid::xbt::signal<void(s
urf::LinkImpl*
)> Link::onCreation;
-simgrid::xbt::signal<void(s
urf::LinkImpl*
)> Link::onDestruction;
-simgrid::xbt::signal<void(s
urf::LinkImpl*
)> Link::onStateChange;
+simgrid::xbt::signal<void(s
4u::Link&
)> Link::onCreation;
+simgrid::xbt::signal<void(s
4u::Link&
)> Link::onDestruction;
+simgrid::xbt::signal<void(s
4u::Link&
)> Link::onStateChange;
simgrid::xbt::signal<void(surf::NetworkAction*, s4u::Host* src, s4u::Host* dst)> Link::onCommunicate;
simgrid::xbt::signal<void(surf::NetworkAction*)> Link::onCommunicationStateChange;
}
simgrid::xbt::signal<void(surf::NetworkAction*, s4u::Host* src, s4u::Host* dst)> Link::onCommunicate;
simgrid::xbt::signal<void(surf::NetworkAction*)> Link::onCommunicationStateChange;
}