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
Comment unused parameter.
[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
..
f25aa1f
100644
(file)
--- a/
src/surf/workstation_ptask_L07.cpp
+++ b/
src/surf/workstation_ptask_L07.cpp
@@
-1,11
+1,11
@@
-/* Copyright (c) 2007
, 2008, 2009, 2010
. The SimGrid Team.
+/* Copyright (c) 2007
-2010, 2013
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "workstation_ptask_L07.hpp"
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* 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;
}
@@
-121,7
+121,7
@@
void WorkstationL07Model::updateActionsState(double /*now*/, double delta)
i++))) {
constraint_id = lmm_constraint_id(cnst);
i++))) {
constraint_id = lmm_constraint_id(cnst);
- if (static_cast<Workstation
CLM03
LmmPtr>(constraint_id)->p_stateCurrent == SURF_RESOURCE_OFF) {
+ if (static_cast<WorkstationLmmPtr>(constraint_id)->p_stateCurrent == SURF_RESOURCE_OFF) {
XBT_DEBUG("Action (%p) Failed!!", action);
action->m_finish = surf_get_clock();
action->setState(SURF_ACTION_FAILED);
XBT_DEBUG("Action (%p) Failed!!", action);
action->m_finish = surf_get_clock();
action->setState(SURF_ACTION_FAILED);
@@
-194,7
+194,7
@@
ActionPtr WorkstationL07Model::executeParallelTask(int workstation_nb,
action->m_suspended = 0; /* Should be useless because of the
calloc but it seems to help valgrind... */
action->m_workstationNb = workstation_nb;
action->m_suspended = 0; /* Should be useless because of the
calloc but it seems to help valgrind... */
action->m_workstationNb = workstation_nb;
- action->p_workstationList = (Workstation
CLM03
Ptr *) workstation_list;
+ action->p_workstationList = (WorkstationPtr *) workstation_list;
action->p_computationAmount = computation_amount;
action->p_communicationAmount = communication_amount;
action->m_latency = latency;
action->p_computationAmount = computation_amount;
action->p_communicationAmount = communication_amount;
action->m_latency = latency;
@@
-250,7
+250,7
@@
ResourcePtr WorkstationL07Model::createResource(const char *name, double /*power
tmgr_trace_t /*power_trace*/,
e_surf_resource_state_t /*state_initial*/,
tmgr_trace_t /*state_trace*/,
tmgr_trace_t /*power_trace*/,
e_surf_resource_state_t /*state_initial*/,
tmgr_trace_t /*state_trace*/,
- xbt_dict_t
cpu_properties
)
+ xbt_dict_t
/*cpu_properties*/
)
{
WorkstationL07Ptr wk = NULL;
xbt_assert(!surf_workstation_resource_priv(surf_workstation_resource_by_name(name)),
{
WorkstationL07Ptr wk = NULL;
xbt_assert(!surf_workstation_resource_priv(surf_workstation_resource_by_name(name)),
@@
-266,7
+266,7
@@
ResourcePtr WorkstationL07Model::createResource(const char *name, double /*power
return wk;//FIXME:xbt_lib_get_elm_or_null(host_lib, name);
}
return wk;//FIXME:xbt_lib_get_elm_or_null(host_lib, name);
}
-ActionPtr WorkstationL07Model::communicate(Workstation
CLM03Ptr src, WorkstationCLM03
Ptr dst,
+ActionPtr WorkstationL07Model::communicate(Workstation
Ptr src, Workstation
Ptr dst,
double size, double rate)
{
void **workstation_list = xbt_new0(void *, 2);
double size, double rate)
{
void **workstation_list = xbt_new0(void *, 2);
@@
-285,7
+285,7
@@
ActionPtr WorkstationL07Model::communicate(WorkstationCLM03Ptr src, WorkstationC
return res;
}
return res;
}
-xbt_dynar_t WorkstationL07Model::getRoute(Workstation
CLM03Ptr src, WorkstationCLM03
Ptr dst)
+xbt_dynar_t WorkstationL07Model::getRoute(Workstation
Ptr src, Workstation
Ptr dst)
{
xbt_dynar_t route=NULL;
routing_platf->getRouteAndLatency(src->p_netElm, dst->p_netElm, &route, NULL);
{
xbt_dynar_t route=NULL;
routing_platf->getRouteAndLatency(src->p_netElm, dst->p_netElm, &route, NULL);
@@
-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,
@@
-441,8
+441,8
@@
void WorkstationL07Model::addTraces()
WorkstationL07::WorkstationL07(WorkstationModelPtr model, const char* name, xbt_dict_t props, RoutingEdgePtr netElm, CpuPtr cpu)
: Resource(model, name, props),
WorkstationL07::WorkstationL07(WorkstationModelPtr model, const char* name, xbt_dict_t props, RoutingEdgePtr netElm, CpuPtr cpu)
: Resource(model, name, props),
- Workstation
CLM03(model, name, props,
NULL, netElm, cpu),
- Workstation
CLM03Lmm(model, name, props, NULL, netElm, cpu
)
+ Workstation
(
NULL, netElm, cpu),
+ Workstation
Lmm(
)
{
}
{
}
@@
-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(
) {
}
}
@@
-716,15
+716,7
@@
double WorkstationL07ActionLmm::getRemains()
return m_remains;
}
return m_remains;
}
-
-
-
-
-
-
-
-
-static void ptask_finalize(void)
+/*static void ptask_finalize(void)
{
xbt_dict_free(&ptask_parallel_task_link_set);
{
xbt_dict_free(&ptask_parallel_task_link_set);
@@
-739,7
+731,7
@@
static void ptask_finalize(void)
lmm_system_free(ptask_maxmin_system);
ptask_maxmin_system = NULL;
}
lmm_system_free(ptask_maxmin_system);
ptask_maxmin_system = NULL;
}
-}
+ }*/
/**************************************/
/******* Resource Private **********/
/**************************************/
/******* Resource Private **********/