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
none_get_route_and_latency must set latency to 0.
[simgrid.git]
/
src
/
surf
/
surf_routing.c
diff --git
a/src/surf/surf_routing.c
b/src/surf/surf_routing.c
index
465e3a3
..
6ce1552
100644
(file)
--- a/
src/surf/surf_routing.c
+++ b/
src/surf/surf_routing.c
@@
-95,7
+95,7
@@
struct s_model_type routing_models[] = {
{"DijkstraCache",
"Dijkstra routing data (fast initialization, fast lookup, small memory requirements, shortest path routing only)",
model_dijkstracache_create, model_dijkstra_both_end},
- {"none", "No routing (
usable with Constant network only)
",
+ {"none", "No routing (
Unless you know what you are doing, avoid using this mode in combination with a non Constant network model).
",
model_none_create, NULL},
{"RuleBased", "Rule-Based routing data (...)",
model_rulebased_create, NULL},
@@
-293,17
+293,20
@@
static void routing_parse_E_ASroute(void)
route_t e_route = xbt_new0(s_route_t, 1);
e_route->link_list = parsed_link_list;
- if(!strcmp(current_routing->model_desc->name,"RuleBased")) {
+ if
(!strcmp(current_routing->model_desc->name,"RuleBased")) {
e_route->src_gateway = (network_element_t) gw_src; // DIRTY HACK possible only
e_route->dst_gateway = (network_element_t) gw_dst; // because of what is in routing_parse_E_ASroute
- }
- else{
- e_route->src_gateway = ((network_element_t)xbt_lib_get_or_null(as_router_lib,gw_src,ROUTING_ASR_LEVEL));
- if(!e_route->src_gateway)
- e_route->src_gateway = ((network_element_t)xbt_lib_get_or_null(host_lib,gw_src,ROUTING_HOST_LEVEL));
- e_route->dst_gateway = ((network_element_t)xbt_lib_get_or_null(as_router_lib,gw_dst,ROUTING_ASR_LEVEL));
- if(!e_route->dst_gateway)
- e_route->dst_gateway = ((network_element_t)xbt_lib_get_or_null(host_lib,gw_dst,ROUTING_HOST_LEVEL));
+ } else {
+ e_route->src_gateway = xbt_lib_get_or_null(as_router_lib, gw_src,
+ ROUTING_ASR_LEVEL);
+ if (!e_route->src_gateway)
+ e_route->src_gateway = xbt_lib_get_or_null(host_lib, gw_src,
+ ROUTING_HOST_LEVEL);
+ e_route->dst_gateway = xbt_lib_get_or_null(as_router_lib, gw_dst,
+ ROUTING_ASR_LEVEL);
+ if (!e_route->dst_gateway)
+ e_route->dst_gateway = xbt_lib_get_or_null(host_lib, gw_dst,
+ ROUTING_HOST_LEVEL);
}
xbt_assert(current_routing->parse_ASroute,
"no defined method \"set_ASroute\" in \"%s\"",
@@
-324,12
+327,16
@@
static void routing_parse_E_bypassRoute(void)
{
route_t e_route = xbt_new0(s_route_t, 1);
e_route->link_list = parsed_link_list;
- e_route->src_gateway = ((network_element_t)xbt_lib_get_or_null(as_router_lib,gw_src,ROUTING_ASR_LEVEL));
- if(!e_route->src_gateway)
- e_route->src_gateway = ((network_element_t)xbt_lib_get_or_null(host_lib,gw_src,ROUTING_HOST_LEVEL));
- e_route->dst_gateway = ((network_element_t)xbt_lib_get_or_null(as_router_lib,gw_dst,ROUTING_ASR_LEVEL));
- if(!e_route->dst_gateway)
- e_route->dst_gateway = ((network_element_t)xbt_lib_get_or_null(host_lib,gw_dst,ROUTING_HOST_LEVEL));
+ e_route->src_gateway = xbt_lib_get_or_null(as_router_lib, gw_src,
+ ROUTING_ASR_LEVEL);
+ if (!e_route->src_gateway)
+ e_route->src_gateway = xbt_lib_get_or_null(host_lib, gw_src,
+ ROUTING_HOST_LEVEL);
+ e_route->dst_gateway = xbt_lib_get_or_null(as_router_lib, gw_dst,
+ ROUTING_ASR_LEVEL);
+ if (!e_route->dst_gateway)
+ e_route->dst_gateway = xbt_lib_get_or_null(host_lib, gw_dst,
+ ROUTING_HOST_LEVEL);
xbt_assert(current_routing->parse_bypassroute,
"Bypassing mechanism not implemented by routing '%s'",
current_routing->name);
@@
-482,8
+489,10
@@
static void elements_father(network_element_t src, network_element_t dst,
network_element_t dst_data = dst;
src_as = src_data->rc_component;
dst_as = dst_data->rc_component;
+#ifndef NDEBUG
char* src_name = src_data->name;
char* dst_name = dst_data->name;
+#endif
xbt_assert(src_as && dst_as,
"Ask for route \"from\"(%s) or \"to\"(%s) no found", src_name, dst_name);
@@
-590,14
+599,14
@@
static void _get_route_and_latency(network_element_t src, network_element_t dst,
network_element_t dst_gateway_net_elm = route.dst_gateway;
/* If source gateway is not our source, we have to recursively find our way up to this point */
- if (s
trcmp(src->name, src_gateway_net_elm->name)
)
+ if (s
rc != src_gateway_net_elm
)
_get_route_and_latency(src, src_gateway_net_elm, links, latency);
xbt_dynar_merge(links,&(route.link_list));
/* If dest gateway is not our destination, we have to recursively find our way from this point */
// FIXME why can't I factorize it the same way than [src;src_gw] without breaking the examples??
- if (
strcmp(dst_gateway_net_elm->name, dst->name)
) {
+ if (
dst_gateway_net_elm != dst
) {
_get_route_and_latency(dst_gateway_net_elm, dst, links, latency);
}
xbt_dynar_free(&route.link_list);
@@
-617,7
+626,8
@@
static void _get_route_and_latency(network_element_t src, network_element_t dst,
* walk through the routing components tree and find a route between hosts
* by calling the differents "get_route" functions in each routing component.
*/
-void routing_get_route_and_latency(network_element_t src, network_element_t dst,
+void routing_get_route_and_latency(network_element_t src,
+ network_element_t dst,
xbt_dynar_t * route, double *latency)
{
if (!*route) {
@@
-743,7
+753,9
@@
static void routing_parse_storage(sg_platf_storage_cbarg_t storage)
"Reading a storage, processing unit \"%s\" already exists", storage->id);
// Verification of an existing type_id
+#ifndef NDEBUG
void* storage_type = xbt_lib_get_or_null(storage_type_lib, storage->type_id,ROUTING_STORAGE_TYPE_LEVEL);
+#endif
xbt_assert(storage_type,"Reading a storage, type id \"%s\" does not exists", storage->type_id);
XBT_DEBUG("ROUTING Create a storage name '%s' with type_id '%s'",
@@
-755,6
+767,66
@@
static void routing_parse_storage(sg_platf_storage_cbarg_t storage)
ROUTING_STORAGE_LEVEL,
(void *) xbt_strdup(storage->type_id));
}
+
+static void free_storage_content(void *p)
+{
+ content_t content = p;
+ free(content->date);
+ free(content->group);
+ free(content->time);
+ free(content->user);
+ free(content->user_rights);
+ free(content);
+}
+
+static xbt_dict_t parse_storage_content(const char *filename)
+{
+ if ((!filename) || (strcmp(filename, "") == 0))
+ return NULL;
+
+ xbt_dict_t parse_content = xbt_dict_new_homogeneous(free_storage_content);
+ FILE *file = NULL;
+
+ file = surf_fopen(filename, "r");
+ xbt_assert(file != NULL, "Cannot open file '%s' (path=%s)", filename,
+ xbt_str_join(surf_path, ":"));
+
+ char *line = NULL;
+ size_t len = 0;
+ ssize_t read;
+ char user_rights[12];
+ char user[100];
+ char group[100];
+ char date[12];
+ char time[12];
+ char path[1024];
+ int nb, size;
+
+ content_t content;
+
+ while ((read = getline(&line, &len, file)) != -1) {
+ content = xbt_new0(s_content_t,1);
+ if(sscanf(line,"%s %d %s %s %d %s %s %s",user_rights,&nb,user,group,&size,date,time,path)==8) {
+ content->date = xbt_strdup(date);
+ content->group = xbt_strdup(group);
+ content->size = size;
+ content->time = xbt_strdup(time);
+ content->user = xbt_strdup(user);
+ content->user_rights = xbt_strdup(user_rights);
+ xbt_dict_set(parse_content,path,content,NULL);
+ } else {
+ xbt_die("Be sure of passing a good format for content file.\n");
+ // You can generate this kind of file with command line:
+ // find /path/you/want -type f -exec ls -l {} \; 2>/dev/null > ./content.txt
+ }
+ }
+ if (line)
+ free(line);
+
+ fclose(file);
+ return parse_content;
+}
+
static void routing_parse_storage_type(sg_platf_storage_type_cbarg_t storage_type)
{
xbt_assert(!xbt_lib_get_or_null(storage_type_lib, storage_type->id,ROUTING_STORAGE_TYPE_LEVEL),
@@
-763,13
+835,13
@@
static void routing_parse_storage_type(sg_platf_storage_type_cbarg_t storage_typ
storage_type_t stype = xbt_new0(s_storage_type_t, 1);
stype->model = xbt_strdup(storage_type->model);
stype->properties = storage_type->properties;
- stype->content =
xbt_strdup
(storage_type->content);
+ stype->content =
parse_storage_content
(storage_type->content);
stype->type_id = xbt_strdup(storage_type->id);
XBT_DEBUG("ROUTING Create a storage type id '%s' with model '%s' content '%s' and properties '%p'",
stype->type_id,
stype->model,
- stype->content,
+ st
orage_t
ype->content,
stype->properties);
xbt_lib_set(storage_type_lib,
@@
-804,7
+876,9
@@
static void mount_free(void *p)
static void routing_parse_mount(sg_platf_mount_cbarg_t mount)
{
// Verification of an existing storage
+#ifndef NDEBUG
void* storage = xbt_lib_get_or_null(storage_lib, mount->id,ROUTING_STORAGE_LEVEL);
+#endif
xbt_assert(storage,"Disk id \"%s\" does not exists", mount->id);
XBT_DEBUG("ROUTING Mount '%s' on '%s'",mount->id, mount->name);