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
Disk usage computation bug fix
[simgrid.git]
/
src
/
surf
/
workstation_clm03.cpp
diff --git
a/src/surf/workstation_clm03.cpp
b/src/surf/workstation_clm03.cpp
index
a9bd3d1
..
1848fd5
100644
(file)
--- a/
src/surf/workstation_clm03.cpp
+++ b/
src/surf/workstation_clm03.cpp
@@
-82,7
+82,7
@@
double WorkstationCLM03Model::shareResources(double now){
adjustWeightOfDummyCpuActions();
double min_by_cpu = p_cpuModel->shareResources(now);
adjustWeightOfDummyCpuActions();
double min_by_cpu = p_cpuModel->shareResources(now);
- double min_by_net =
surf_network_model->shareResources(now)
;
+ double min_by_net =
(strcmp(surf_network_model->getName(), "network NS3")) ? surf_network_model->shareResources(now) : -1
;
double min_by_sto = -1;
if (p_cpuModel == surf_cpu_model_pm)
min_by_sto = surf_storage_model->shareResources(now);
double min_by_sto = -1;
if (p_cpuModel == surf_cpu_model_pm)
min_by_sto = surf_storage_model->shareResources(now);