X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/281f8c29e177852dcb1591fc31e363e1176857c8..a92872978cf9cc16a34a4a8ea0c9d0866187decc:/src/surf/workstation_ptask_L07.cpp diff --git a/src/surf/workstation_ptask_L07.cpp b/src/surf/workstation_ptask_L07.cpp index 0010a53738..f25aa1f83c 100644 --- 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" -#include "cpu.hpp" +#include "cpu_interface.hpp" #include "surf_routing.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_workstation); @@ -20,11 +20,12 @@ WorkstationL07Model::WorkstationL07Model() : WorkstationModel("Workstation ptask surf_workstation_model = NULL; surf_network_model = new NetworkL07Model(); surf_cpu_model_pm = new CpuL07Model(); - routing_model_create(p_networkModel->createResource("__loopback__", + routing_model_create(static_cast(surf_network_model->createResource("__loopback__", 498000000, NULL, 0.000015, NULL, SURF_RESOURCE_ON, NULL, - SURF_LINK_FATPIPE, NULL)); + SURF_LINK_FATPIPE, NULL))); + p_cpuModel = surf_cpu_model_pm; } WorkstationL07Model::~WorkstationL07Model() { @@ -40,7 +41,7 @@ WorkstationL07Model::~WorkstationL07Model() { } } -double WorkstationL07Model::shareResources(double now) +double WorkstationL07Model::shareResources(double /*now*/) { void *_action; WorkstationL07ActionLmmPtr action; @@ -70,7 +71,7 @@ double WorkstationL07Model::shareResources(double now) return min; } -void WorkstationL07Model::updateActionsState(double now, double delta) +void WorkstationL07Model::updateActionsState(double /*now*/, double delta) { double deltap = 0.0; void *_action, *_next_action; @@ -120,7 +121,7 @@ void WorkstationL07Model::updateActionsState(double now, double delta) i++))) { constraint_id = lmm_constraint_id(cnst); - if (static_cast(constraint_id)->p_stateCurrent == SURF_RESOURCE_OFF) { + if (static_cast(constraint_id)->p_stateCurrent == SURF_RESOURCE_OFF) { XBT_DEBUG("Action (%p) Failed!!", action); action->m_finish = surf_get_clock(); action->setState(SURF_ACTION_FAILED); @@ -193,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->p_workstationList = (WorkstationCLM03Ptr *) workstation_list; + action->p_workstationList = (WorkstationPtr *) workstation_list; action->p_computationAmount = computation_amount; action->p_communicationAmount = communication_amount; action->m_latency = latency; @@ -244,19 +245,19 @@ ActionPtr WorkstationL07Model::executeParallelTask(int workstation_nb, return static_cast(action); } -ResourcePtr WorkstationL07Model::createResource(const char *name, double power_scale, - double power_initial, - tmgr_trace_t power_trace, - e_surf_resource_state_t state_initial, - tmgr_trace_t state_trace, - xbt_dict_t cpu_properties) +ResourcePtr WorkstationL07Model::createResource(const char *name, double /*power_scale*/, + double /*power_initial*/, + tmgr_trace_t /*power_trace*/, + e_surf_resource_state_t /*state_initial*/, + tmgr_trace_t /*state_trace*/, + xbt_dict_t /*cpu_properties*/) { WorkstationL07Ptr wk = NULL; xbt_assert(!surf_workstation_resource_priv(surf_workstation_resource_by_name(name)), "Host '%s' declared several times in the platform file.", name); - wk = new WorkstationL07(this, name, cpu_properties, + wk = new WorkstationL07(this, name, NULL, static_cast(xbt_lib_get_or_null(host_lib, name, ROUTING_HOST_LEVEL)), dynamic_cast(static_cast(xbt_lib_get_or_null(host_lib, name, SURF_CPU_LEVEL)))); @@ -265,7 +266,7 @@ ResourcePtr WorkstationL07Model::createResource(const char *name, double power_s return wk;//FIXME:xbt_lib_get_elm_or_null(host_lib, name); } -ActionPtr WorkstationL07Model::communicate(WorkstationCLM03Ptr src, WorkstationCLM03Ptr dst, +ActionPtr WorkstationL07Model::communicate(WorkstationPtr src, WorkstationPtr dst, double size, double rate) { void **workstation_list = xbt_new0(void *, 2); @@ -284,7 +285,7 @@ ActionPtr WorkstationL07Model::communicate(WorkstationCLM03Ptr src, WorkstationC return res; } -xbt_dynar_t WorkstationL07Model::getRoute(WorkstationCLM03Ptr src, WorkstationCLM03Ptr dst) +xbt_dynar_t WorkstationL07Model::getRoute(WorkstationPtr src, WorkstationPtr dst) { xbt_dynar_t route=NULL; routing_platf->getRouteAndLatency(src->p_netElm, dst->p_netElm, &route, NULL); @@ -327,7 +328,7 @@ ResourcePtr CpuL07Model::createResource(const char *name, double power_scale, return cpu;//FIXME:xbt_lib_get_elm_or_null(host_lib, name); } -ResourcePtr NetworkL07Model::createResource(const char *name, +NetworkLinkPtr NetworkL07Model::createResource(const char *name, double bw_initial, tmgr_trace_t bw_trace, double lat_initial, @@ -338,7 +339,7 @@ ResourcePtr NetworkL07Model::createResource(const char *name, e_surf_link_sharing_policy_t policy, xbt_dict_t properties) { - LinkL07Ptr nw_link = new LinkL07(this, xbt_strdup(name), properties); + LinkL07Ptr nw_link = new LinkL07(this, name, properties); xbt_assert(!xbt_lib_get_or_null(link_lib, name, SURF_LINK_LEVEL), "Link '%s' declared several times in the platform file.", name); @@ -440,12 +441,12 @@ void WorkstationL07Model::addTraces() WorkstationL07::WorkstationL07(WorkstationModelPtr model, const char* name, xbt_dict_t props, RoutingEdgePtr netElm, CpuPtr cpu) : Resource(model, name, props), - WorkstationCLM03Lmm(model, name, props, NULL, netElm, cpu), - WorkstationCLM03(model, name, props, NULL, netElm, cpu) + Workstation(NULL, netElm, cpu), + WorkstationLmm() { } -double WorkstationL07::getPowerPeakAt(int pstate_index) +double WorkstationL07::getPowerPeakAt(int /*pstate_index*/) { XBT_DEBUG("[ws_get_power_peak_at] Not implemented for workstation_ptask_L07"); return 0.0; @@ -457,7 +458,7 @@ int WorkstationL07::getNbPstates() return 0.0; } -void WorkstationL07::setPowerPeakAt(int pstate_index) +void WorkstationL07::setPowerPeakAt(int /*pstate_index*/) { XBT_DEBUG("[ws_set_power_peak_at] Not implemented for workstation_ptask_L07"); } @@ -469,12 +470,12 @@ double WorkstationL07::getConsumedEnergy() } CpuL07::CpuL07(CpuL07ModelPtr model, const char* name, xbt_dict_t props) - : Resource(model, name, props), CpuLmm(model, name, props) { + : Resource(model, name, props), CpuLmm() { } LinkL07::LinkL07(NetworkL07ModelPtr model, const char* name, xbt_dict_t props) - : Resource(model, name, props), NetworkCm02LinkLmm(model, name, props) { + : Resource(model, name, props), NetworkLinkLmm() { } @@ -486,7 +487,7 @@ bool LinkL07::isUsed(){ return lmm_constraint_used(ptask_maxmin_system, p_constraint); } -void CpuL07::updateState(tmgr_trace_event_t event_type, double value, double date){ +void CpuL07::updateState(tmgr_trace_event_t event_type, double value, double /*date*/){ XBT_DEBUG("Updating cpu %s (%p) with value %g", m_name, this, value); if (event_type == p_power.event) { m_powerCurrent = value; @@ -715,15 +716,7 @@ double WorkstationL07ActionLmm::getRemains() return m_remains; } - - - - - - - - -static void ptask_finalize(void) +/*static void ptask_finalize(void) { xbt_dict_free(&ptask_parallel_task_link_set); @@ -738,7 +731,7 @@ static void ptask_finalize(void) lmm_system_free(ptask_maxmin_system); ptask_maxmin_system = NULL; } -} + }*/ /**************************************/ /******* Resource Private **********/ @@ -860,4 +853,5 @@ void surf_workstation_model_init_ptask_L07(void) surf_workstation_model = new WorkstationL07Model(); ModelPtr model = static_cast(surf_workstation_model); xbt_dynar_push(model_list, &model); + xbt_dynar_push(model_list_invoke, &model); }