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
Update workstation handling in SimDag. Change the prefix of SimDag functions with...
[simgrid.git]
/
src
/
simdag
/
sd_link.c
diff --git
a/src/simdag/sd_link.c
b/src/simdag/sd_link.c
index
fcfc578
..
424ebc3
100644
(file)
--- a/
src/simdag/sd_link.c
+++ b/
src/simdag/sd_link.c
@@
-4,15
+4,15
@@
/* Creates a link.
*/
/* Creates a link.
*/
-S
G_link_t __SG
_link_create(const char *name, void *surf_link, void *data) {
+S
D_link_t __SD
_link_create(const char *name, void *surf_link, void *data) {
xbt_assert0(surf_link != NULL, "surf_link is NULL !");
xbt_assert0(surf_link != NULL, "surf_link is NULL !");
- S
G_link_data_t sgdata = xbt_new0(s_SG
_link_data_t, 1); /* link private data */
- s
g
data->surf_link = surf_link;
+ S
D_link_data_t sd_data = xbt_new0(s_SD
_link_data_t, 1); /* link private data */
+ s
d_
data->surf_link = surf_link;
- S
G_link_t link = xbt_new0(s_SG
_link_t, 1);
+ S
D_link_t link = xbt_new0(s_SD
_link_t, 1);
link->name = xbt_strdup(name);
link->data = data;
link->name = xbt_strdup(name);
link->data = data;
- link->s
gdata = sg
data;
+ link->s
d_data = sd_
data;
/*link->capacity = capacity;*/
/* link->current_bandwidth = bandwidth;
/*link->capacity = capacity;*/
/* link->current_bandwidth = bandwidth;
@@
-23,21
+23,21
@@
SG_link_t __SG_link_create(const char *name, void *surf_link, void *data) {
/* Returns the user data of a link. The user data can be NULL.
*/
/* Returns the user data of a link. The user data can be NULL.
*/
-void* S
G_link_get_data(SG
_link_t link) {
+void* S
D_link_get_data(SD
_link_t link) {
xbt_assert0(link, "Invalid parameter");
return link->data;
}
xbt_assert0(link, "Invalid parameter");
return link->data;
}
-/* Sets the user data of a link. The
data can be
NULL.
+/* Sets the user data of a link. The
new data can be NULL. The old data should have been freed first if it was not
NULL.
*/
*/
-void S
G_link_set_data(SG
_link_t link, void *data) {
+void S
D_link_set_data(SD
_link_t link, void *data) {
xbt_assert0(link, "Invalid parameter");
link->data = data;
}
/* Returns the name of a link. The name can be NULL.
*/
xbt_assert0(link, "Invalid parameter");
link->data = data;
}
/* Returns the name of a link. The name can be NULL.
*/
-const char* S
G_link_get_name(SG
_link_t link) {
+const char* S
D_link_get_name(SD
_link_t link) {
xbt_assert0(link, "Invalid parameter");
return link->name;
}
xbt_assert0(link, "Invalid parameter");
return link->name;
}
@@
-45,14
+45,14
@@
const char* SG_link_get_name(SG_link_t link) {
/* Returns the capacity of a link.
*/
/*
/* Returns the capacity of a link.
*/
/*
-double S
G_link_get_capacity(SG
_link_t link) {
+double S
D_link_get_capacity(SD
_link_t link) {
xbt_assert0(link, "Invalid parameter");
return link->capacity;
}*/
/* Return the current bandwidth of a link.
*/
xbt_assert0(link, "Invalid parameter");
return link->capacity;
}*/
/* Return the current bandwidth of a link.
*/
-double S
G_link_get_current_bandwidth(SG
_link_t link) {
+double S
D_link_get_current_bandwidth(SD
_link_t link) {
xbt_assert0(link, "Invalid parameter");
/* TODO */
xbt_assert0(link, "Invalid parameter");
/* TODO */
@@
-62,7
+62,7
@@
double SG_link_get_current_bandwidth(SG_link_t link) {
/* Return the current latency of a link.
*/
/* Return the current latency of a link.
*/
-double S
G_link_get_current_latency(SG
_link_t link) {
+double S
D_link_get_current_latency(SD
_link_t link) {
xbt_assert0(link, "Invalid parameter");
/* TODO */
xbt_assert0(link, "Invalid parameter");
/* TODO */
@@
-72,10
+72,13
@@
double SG_link_get_current_latency(SG_link_t link) {
/* Destroys a link. The user data (if any) should have been destroyed first.
*/
/* Destroys a link. The user data (if any) should have been destroyed first.
*/
-void __S
G_link_destroy(SG
_link_t link) {
+void __S
D_link_destroy(SD
_link_t link) {
xbt_assert0(link, "Invalid parameter");
xbt_assert0(link, "Invalid parameter");
- if (link->name)
+ if (link->sd_data != NULL)
+ xbt_free(link->sd_data);
+
+ if (link->name != NULL)
xbt_free(link->name);
xbt_free(link);
xbt_free(link->name);
xbt_free(link);