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
Restructure surf++ cpu and network
[simgrid.git]
/
src
/
surf
/
workstation_ptask_L07.cpp
diff --git
a/src/surf/workstation_ptask_L07.cpp
b/src/surf/workstation_ptask_L07.cpp
index
383ff77
..
926990f
100644
(file)
--- a/
src/surf/workstation_ptask_L07.cpp
+++ b/
src/surf/workstation_ptask_L07.cpp
@@
-5,7
+5,7
@@
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "workstation_ptask_L07.hpp"
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "workstation_ptask_L07.hpp"
-#include "cpu.hpp"
+#include "cpu
_interface
.hpp"
#include "surf_routing.hpp"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_workstation);
#include "surf_routing.hpp"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_workstation);
@@
-20,11
+20,11
@@
WorkstationL07Model::WorkstationL07Model() : WorkstationModel("Workstation ptask
surf_workstation_model = NULL;
surf_network_model = new NetworkL07Model();
surf_cpu_model_pm = new CpuL07Model();
surf_workstation_model = NULL;
surf_network_model = new NetworkL07Model();
surf_cpu_model_pm = new CpuL07Model();
- routing_model_create(
p_networkM
odel->createResource("__loopback__",
+ routing_model_create(
static_cast<ResourcePtr>(surf_network_m
odel->createResource("__loopback__",
498000000, NULL,
0.000015, NULL,
SURF_RESOURCE_ON, NULL,
498000000, NULL,
0.000015, NULL,
SURF_RESOURCE_ON, NULL,
- SURF_LINK_FATPIPE, NULL));
+ SURF_LINK_FATPIPE, NULL))
)
;
p_cpuModel = surf_cpu_model_pm;
}
p_cpuModel = surf_cpu_model_pm;
}
@@
-328,7
+328,7
@@
ResourcePtr CpuL07Model::createResource(const char *name, double power_scale,
return cpu;//FIXME:xbt_lib_get_elm_or_null(host_lib, name);
}
return cpu;//FIXME:xbt_lib_get_elm_or_null(host_lib, name);
}
-
Resource
Ptr NetworkL07Model::createResource(const char *name,
+
NetworkLink
Ptr NetworkL07Model::createResource(const char *name,
double bw_initial,
tmgr_trace_t bw_trace,
double lat_initial,
double bw_initial,
tmgr_trace_t bw_trace,
double lat_initial,
@@
-475,7
+475,7
@@
CpuL07::CpuL07(CpuL07ModelPtr model, const char* name, xbt_dict_t props)
}
LinkL07::LinkL07(NetworkL07ModelPtr model, const char* name, xbt_dict_t props)
}
LinkL07::LinkL07(NetworkL07ModelPtr model, const char* name, xbt_dict_t props)
- : Resource(model, name, props), Network
Cm02LinkLmm(model, name, props
) {
+ : Resource(model, name, props), Network
LinkLmm(
) {
}
}