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
Substitution of the word "resource" by "model" in every surf related identifier
[simgrid.git]
/
src
/
simix
/
smx_environment.c
diff --git
a/src/simix/smx_environment.c
b/src/simix/smx_environment.c
index
8ce4451
..
65ef329
100644
(file)
--- a/
src/simix/smx_environment.c
+++ b/
src/simix/smx_environment.c
@@
-38,7
+38,7
@@
void SIMIX_create_environment(const char *file)
int workstation_id = -1;
simix_config_init(); /* make sure that our configuration set is created */
int workstation_id = -1;
simix_config_init(); /* make sure that our configuration set is created */
- surf_timer_
resource
_init(file);
+ surf_timer_
model
_init(file);
/* which model do you want today? */
workstation_model_name =
/* which model do you want today? */
workstation_model_name =
@@
-46,8
+46,8
@@
void SIMIX_create_environment(const char *file)
DEBUG1("Model : %s", workstation_model_name);
workstation_id =
DEBUG1("Model : %s", workstation_model_name);
workstation_id =
- find_
resource_description(surf_workstation_resource
_description,
- surf_workstation_
resource
_description_size,
+ find_
model_description(surf_workstation_model
_description,
+ surf_workstation_
model
_description_size,
workstation_model_name);
if (!strcmp(workstation_model_name, "compound")) {
xbt_ex_t e;
workstation_model_name);
if (!strcmp(workstation_model_name, "compound")) {
xbt_ex_t e;
@@
-83,20
+83,20
@@
void SIMIX_create_environment(const char *file)
}
network_id =
}
network_id =
- find_
resource_description(surf_network_resource
_description,
- surf_network_
resource
_description_size,
+ find_
model_description(surf_network_model
_description,
+ surf_network_
model
_description_size,
network_model_name);
cpu_id =
network_model_name);
cpu_id =
- find_
resource_description(surf_cpu_resource
_description,
- surf_cpu_
resource
_description_size,
+ find_
model_description(surf_cpu_model
_description,
+ surf_cpu_
model
_description_size,
cpu_model_name);
cpu_model_name);
- surf_cpu_
resource_description[cpu_id].resource
_init(file);
- surf_network_
resource_description[network_id].resource
_init(file);
+ surf_cpu_
model_description[cpu_id].model
_init(file);
+ surf_network_
model_description[network_id].model
_init(file);
}
}
- surf_workstation_
resource
_description[workstation_id].
-
resource
_init(file);
+ surf_workstation_
model
_description[workstation_id].
+
model
_init(file);
_simix_init_status = 2; /* inited; don't change settings now */
_simix_init_status = 2; /* inited; don't change settings now */