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
Now supernovae mode works out of project directory.
[simgrid.git]
/
src
/
surf
/
network_vivaldi.c
diff --git
a/src/surf/network_vivaldi.c
b/src/surf/network_vivaldi.c
index
3be1d31
..
8be7582
100644
(file)
--- a/
src/surf/network_vivaldi.c
+++ b/
src/surf/network_vivaldi.c
@@
-23,12
+23,12
@@
typedef struct s_netviva_coords {
xbt_dict_t coords; /* Host name -> coordinates */
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
xbt_dict_t coords; /* Host name -> coordinates */
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
-static random_data_t random_latency = NULL;
-static int host_number_int = 0;
+static random_data_t random_latency
_viva
= NULL;
+static int host_number_int
_viva
= 0;
static void netviva_count_hosts(void)
{
static void netviva_count_hosts(void)
{
- host_number_int++;
+ host_number_int
_viva
++;
}
static void netviva_define_callbacks(const char *file)
}
static void netviva_define_callbacks(const char *file)
@@
-140,7
+140,7
@@
static surf_action_t netviva_communicate(const char *src_name, const char *dst_n
action->suspended = 0;
action->suspended = 0;
- action->latency = sqrt((c1->x-c2->x)*(c1->x-c2->x) + (c1->y-c2->y)*(c1->y-c2->y)) + fabs(c1->h)+ fabs(c2->h) ; //random_generate(random_latency);
+ action->latency = sqrt((c1->x-c2->x)*(c1->x-c2->x) + (c1->y-c2->y)*(c1->y-c2->y)) + fabs(c1->h)+ fabs(c2->h) ; //random_generate(random_latency
_viva
);
action->lat_init = action->latency;
if (action->latency <= 0.0) {
action->lat_init = action->latency;
if (action->latency <= 0.0) {
@@
-168,7
+168,7
@@
static double netviva_get_link_latency(const void *link)
DIE_IMPOSSIBLE;
}
DIE_IMPOSSIBLE;
}
-static int link_shared(const void *link)
+static int
netviva_
link_shared(const void *link)
{
DIE_IMPOSSIBLE;
}
{
DIE_IMPOSSIBLE;
}
@@
-200,12
+200,6
@@
static void netviva_finalize(void)
surf_network_model = NULL;
}
surf_network_model = NULL;
}
-
-static void net_define_callbacks(const char *file)
-{
- /* Figuring out the network links */
-}
-
static void netviva_parse_host(void) {
netviva_coords_t coord = xbt_new(s_netviva_coords_t,1);
static void netviva_parse_host(void) {
netviva_coords_t coord = xbt_new(s_netviva_coords_t,1);
@@
-255,10
+249,10
@@
void surf_network_model_init_Vivaldi(const char *filename)
surf_network_model->extension.network.get_link_bandwidth =
netviva_get_link_bandwidth;
surf_network_model->extension.network.get_link_latency = netviva_get_link_latency;
surf_network_model->extension.network.get_link_bandwidth =
netviva_get_link_bandwidth;
surf_network_model->extension.network.get_link_latency = netviva_get_link_latency;
- surf_network_model->extension.network.link_shared = link_shared;
+ surf_network_model->extension.network.link_shared =
netviva_
link_shared;
- if (!random_latency)
- random_latency = random_new(RAND, 100, 0.0, 1.0, .125, .034);
+ if (!random_latency
_viva
)
+ random_latency
_viva
= random_new(RAND, 100, 0.0, 1.0, .125, .034);
netviva_define_callbacks(filename);
xbt_dynar_push(model_list, &surf_network_model);
netviva_define_callbacks(filename);
xbt_dynar_push(model_list, &surf_network_model);