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
Remove usage of xbt_assert[0-9].
[simgrid.git]
/
src
/
surf
/
workstation.c
diff --git
a/src/surf/workstation.c
b/src/surf/workstation.c
index
1d154ba
..
9aa3304
100644
(file)
--- a/
src/surf/workstation.c
+++ b/
src/surf/workstation.c
@@
-27,21
+27,20
@@
static workstation_CLM03_t workstation_new(const char *name, void *cpu)
workstation->generic_resource.name = xbt_strdup(name);
workstation->cpu = cpu;
workstation->generic_resource.name = xbt_strdup(name);
workstation->cpu = cpu;
- xbt_dict_set(surf_model_resource_set(surf_workstation_model), name,
- workstation, surf_resource_free);
+ xbt_lib_set(host_lib, name, SURF_WKS_LEVEL, workstation);
return workstation;
}
void create_workstations(void)
{
return workstation;
}
void create_workstations(void)
{
- xbt_
dict
_cursor_t cursor = NULL;
+ xbt_
lib
_cursor_t cursor = NULL;
char *name = NULL;
char *name = NULL;
- void *cpu = NULL;
+ void *
*
cpu = NULL;
- xbt_
dict_foreach(surf_model_resource_set(surf_cpu_model), cursor, name,
- cpu) {
-
workstation_new(name, cpu
);
+ xbt_
lib_foreach(host_lib, cursor, name, cpu) {
+ if(cpu[SURF_CPU_LEVEL])
+
workstation_new(name, cpu[SURF_CPU_LEVEL]
);
}
}
}
}
@@
-196,9
+195,8
@@
static int ws_get_latency_limited(surf_action_t action)
{
if (action->model_type == surf_network_model)
return surf_network_model->get_latency_limited(action);
{
if (action->model_type == surf_network_model)
return surf_network_model->get_latency_limited(action);
- INFO0
- ("You tried to ask if a non network action is limited by latency, aborting...");
- DIE_IMPOSSIBLE;
+ else
+ return 0;
}
#endif
}
#endif
@@
-362,8
+360,8
@@
void surf_workstation_model_init_CLM03(const char *filename)
void surf_workstation_model_init_compound(const char *filename)
{
void surf_workstation_model_init_compound(const char *filename)
{
- xbt_assert
0
(surf_cpu_model, "No CPU model defined yet!");
- xbt_assert
0
(surf_network_model, "No network model defined yet!");
+ xbt_assert(surf_cpu_model, "No CPU model defined yet!");
+ xbt_assert(surf_network_model, "No network model defined yet!");
surf_workstation_model_init_internal();
update_model_description(surf_workstation_model_description,
surf_workstation_model_init_internal();
update_model_description(surf_workstation_model_description,