-/* $Id$ */
-
-/* Copyright (c) 2004 Arnaud Legrand. All rights reserved. */
+/* Copyright (c) 2010. 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. */
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)
{
- host_number_int++;
+ host_number_int_viva++;
}
static void netviva_define_callbacks(const char *file)
static surf_action_t netviva_communicate(const char *src_name, const char *dst_name,
int src, int dst, double size, double rate)
{
+ surf_action_network_Vivaldi_t action = NULL;
netviva_coords_t c1,c2;
c1 = xbt_dict_get(coords,src_name);
c2 = xbt_dict_get(coords,dst_name);
- surf_action_network_Vivaldi_t action = NULL;
-
- action =
- surf_action_new(sizeof(s_surf_action_network_Vivaldi_t), size,
- surf_network_model, 0);
+ action = surf_action_new(sizeof(s_surf_action_network_Vivaldi_t), size,surf_network_model, 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) {
DIE_IMPOSSIBLE;
}
-static int link_shared(const void *link)
+static int netviva_link_shared(const void *link)
{
DIE_IMPOSSIBLE;
}
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);
coord->h = atof(xbt_dynar_get_as(ctn, 2, char*));
#ifdef HAVE_TRACING
- TRACE_surf_vivaldi_parse_host (A_surfxml_host_id, coord->x, coord->y, coord->h);
+ TRACE_surf_host_vivaldi_parse (A_surfxml_host_id, coord->x, coord->y, coord->h);
#endif
xbt_dynar_free(&ctn);
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);