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
Rename some model methods to stick to getters/setters naming standards; further facto...
[simgrid.git]
/
src
/
simdag
/
sd_link.c
diff --git
a/src/simdag/sd_link.c
b/src/simdag/sd_link.c
index
8cf7978
..
27b2d8b
100644
(file)
--- a/
src/simdag/sd_link.c
+++ b/
src/simdag/sd_link.c
@@
-6,7
+6,8
@@
/* Creates a link and registers it in SD.
*/
/* Creates a link and registers it in SD.
*/
-SD_link_t __SD_link_create(void *surf_link, void *data) {
+SD_link_t __SD_link_create(void *surf_link, void *data)
+{
SD_link_t link;
const char *name;
SD_link_t link;
const char *name;
@@
-16,18
+17,19
@@
SD_link_t __SD_link_create(void *surf_link, void *data) {
link = xbt_new(s_SD_link_t, 1);
link->surf_link = surf_link;
link = xbt_new(s_SD_link_t, 1);
link->surf_link = surf_link;
- link->data = data; /* user data */
- if
(surf_workstation_model->extension_public->
link_shared(surf_link))
- link->sharing_policy
=
SD_LINK_SHARED;
+ link->data = data;
/* user data */
+ if
(surf_workstation_model->extension.workstation.
link_shared(surf_link))
+ link->sharing_policy
=
SD_LINK_SHARED;
else
else
- link->sharing_policy
=
SD_LINK_FATPIPE;
+ link->sharing_policy
=
SD_LINK_FATPIPE;
name = SD_link_get_name(link);
name = SD_link_get_name(link);
- xbt_dict_set(sd_global->links, name, link, __SD_link_destroy); /* add the link to the dictionary */
+ xbt_dict_set(sd_global->links, name, link, __SD_link_destroy);
/* add the link to the dictionary */
sd_global->link_count++;
return link;
}
sd_global->link_count++;
return link;
}
+
/**
* \brief Returns the link list
*
/**
* \brief Returns the link list
*
@@
-36,19
+38,20
@@
SD_link_t __SD_link_create(void *surf_link, void *data) {
* \return an array of \ref SD_link_t containing all links
* \see SD_link_get_number()
*/
* \return an array of \ref SD_link_t containing all links
* \see SD_link_get_number()
*/
-const SD_link_t* SD_link_get_list(void) {
+const SD_link_t *SD_link_get_list(void)
+{
xbt_dict_cursor_t cursor;
char *key;
void *data;
int i;
xbt_dict_cursor_t cursor;
char *key;
void *data;
int i;
-
+
SD_CHECK_INIT_DONE();
xbt_assert0(SD_link_get_number() > 0, "There is no link!");
SD_CHECK_INIT_DONE();
xbt_assert0(SD_link_get_number() > 0, "There is no link!");
- if (sd_global->link_list == NULL) { /* this is the first time the function is called */
+ if (sd_global->link_list == NULL) {
/* this is the first time the function is called */
sd_global->link_list = xbt_new(SD_link_t, sd_global->link_count);
sd_global->link_list = xbt_new(SD_link_t, sd_global->link_count);
-
+
i = 0;
xbt_dict_foreach(sd_global->links, cursor, key, data) {
sd_global->link_list[i++] = (SD_link_t) data;
i = 0;
xbt_dict_foreach(sd_global->links, cursor, key, data) {
sd_global->link_list[i++] = (SD_link_t) data;
@@
-63,7
+66,8
@@
const SD_link_t* SD_link_get_list(void) {
* \return the number of existing links
* \see SD_link_get_list()
*/
* \return the number of existing links
* \see SD_link_get_list()
*/
-int SD_link_get_number(void) {
+int SD_link_get_number(void)
+{
SD_CHECK_INIT_DONE();
return sd_global->link_count;
}
SD_CHECK_INIT_DONE();
return sd_global->link_count;
}
@@
-75,7
+79,8
@@
int SD_link_get_number(void) {
* \return the user data associated with this link (can be \c NULL)
* \see SD_link_set_data()
*/
* \return the user data associated with this link (can be \c NULL)
* \see SD_link_set_data()
*/
-void* SD_link_get_data(SD_link_t link) {
+void *SD_link_get_data(SD_link_t link)
+{
SD_CHECK_INIT_DONE();
xbt_assert0(link != NULL, "Invalid parameter");
return link->data;
SD_CHECK_INIT_DONE();
xbt_assert0(link != NULL, "Invalid parameter");
return link->data;
@@
-91,7
+96,8
@@
void* SD_link_get_data(SD_link_t link) {
* \param data the new data you want to associate with this link
* \see SD_link_get_data()
*/
* \param data the new data you want to associate with this link
* \see SD_link_get_data()
*/
-void SD_link_set_data(SD_link_t link, void *data) {
+void SD_link_set_data(SD_link_t link, void *data)
+{
SD_CHECK_INIT_DONE();
xbt_assert0(link != NULL, "Invalid parameter");
link->data = data;
SD_CHECK_INIT_DONE();
xbt_assert0(link != NULL, "Invalid parameter");
link->data = data;
@@
-103,22
+109,25
@@
void SD_link_set_data(SD_link_t link, void *data) {
* \param link a link
* \return the name of this link (cannot be \c NULL)
*/
* \param link a link
* \return the name of this link (cannot be \c NULL)
*/
-const char* SD_link_get_name(SD_link_t link) {
+const char *SD_link_get_name(SD_link_t link)
+{
SD_CHECK_INIT_DONE();
xbt_assert0(link != NULL, "Invalid parameter");
SD_CHECK_INIT_DONE();
xbt_assert0(link != NULL, "Invalid parameter");
- return surf_
workstation_model->extension_public->get_link
_name(link->surf_link);
+ return surf_
resource
_name(link->surf_link);
}
/**
* \brief Returns the current bandwidth of a link
*
* \param link a link
}
/**
* \brief Returns the current bandwidth of a link
*
* \param link a link
- * \return the current bandwidth of this link, in
Flops
+ * \return the current bandwidth of this link, in
bytes per second
*/
*/
-double SD_link_get_current_bandwidth(SD_link_t link) {
+double SD_link_get_current_bandwidth(SD_link_t link)
+{
SD_CHECK_INIT_DONE();
xbt_assert0(link != NULL, "Invalid parameter");
SD_CHECK_INIT_DONE();
xbt_assert0(link != NULL, "Invalid parameter");
- return surf_workstation_model->extension_public->get_link_bandwidth(link->surf_link);
+ return surf_workstation_model->extension.workstation.
+ get_link_bandwidth(link->surf_link);
}
/**
}
/**
@@
-128,7
+137,7
@@
double SD_link_get_current_bandwidth(SD_link_t link) {
* \param name a property name
* \return value of a property (or NULL if property not set)
*/
* \param name a property name
* \return value of a property (or NULL if property not set)
*/
-const char
* SD_link_get_property_value(SD_link_t link, const char*
name)
+const char
*SD_link_get_property_value(SD_link_t link, const char *
name)
{
return xbt_dict_get_or_null(SD_link_get_properties(link), name);
}
{
return xbt_dict_get_or_null(SD_link_get_properties(link), name);
}
@@
-144,7
+153,7
@@
xbt_dict_t SD_link_get_properties(SD_link_t link)
SD_CHECK_INIT_DONE();
xbt_assert0((link != NULL), "Invalid parameters");
SD_CHECK_INIT_DONE();
xbt_assert0((link != NULL), "Invalid parameters");
- return (surf_workstation_model->
common_public->
get_properties(link->surf_link));
+ return (surf_workstation_model->get_properties(link->surf_link));
}
}
@@
-154,10
+163,12
@@
xbt_dict_t SD_link_get_properties(SD_link_t link)
* \param link a link
* \return the current latency of this link, in seconds
*/
* \param link a link
* \return the current latency of this link, in seconds
*/
-double SD_link_get_current_latency(SD_link_t link) {
+double SD_link_get_current_latency(SD_link_t link)
+{
SD_CHECK_INIT_DONE();
xbt_assert0(link != NULL, "Invalid parameter");
SD_CHECK_INIT_DONE();
xbt_assert0(link != NULL, "Invalid parameter");
- return surf_workstation_model->extension_public->get_link_latency(link->surf_link);
+ return surf_workstation_model->extension.workstation.
+ get_link_latency(link->surf_link);
}
/**
}
/**
@@
-168,19
+179,20
@@
double SD_link_get_current_latency(SD_link_t link) {
* SD_LINK_SHARED or SD_LINK_FATPIPE
*
*/
* SD_LINK_SHARED or SD_LINK_FATPIPE
*
*/
-e_SD_link_sharing_policy_t SD_link_get_sharing_policy (SD_link_t link) {
+e_SD_link_sharing_policy_t SD_link_get_sharing_policy(SD_link_t link)
+{
SD_CHECK_INIT_DONE();
xbt_assert0(link != NULL, "Invalid parameter");
return link->sharing_policy;
}
SD_CHECK_INIT_DONE();
xbt_assert0(link != NULL, "Invalid parameter");
return link->sharing_policy;
}
-
+
/* Destroys a link.
*/
/* Destroys a link.
*/
-void __SD_link_destroy(void *link) {
+void __SD_link_destroy(void *link)
+{
SD_CHECK_INIT_DONE();
xbt_assert0(link != NULL, "Invalid parameter");
/* link->surf_link is freed by surf_exit and link->data is freed by the user */
xbt_free(link);
}
SD_CHECK_INIT_DONE();
xbt_assert0(link != NULL, "Invalid parameter");
/* link->surf_link is freed by surf_exit and link->data is freed by the user */
xbt_free(link);
}
-