X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/649ff8bac9ec72bc9321a7b21843cd41f7b7e7bc..e0412698e7573cf44491b46234b335bf400859e6:/src/surf/host_ptask_L07.cpp diff --git a/src/surf/host_ptask_L07.cpp b/src/surf/host_ptask_L07.cpp index ec930907d3..3dcb404e8d 100644 --- a/src/surf/host_ptask_L07.cpp +++ b/src/surf/host_ptask_L07.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2010, 2013-2014. The SimGrid Team. +/* Copyright (c) 2007-2010, 2013-2015. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -8,6 +8,7 @@ #include "cpu_interface.hpp" #include "surf_routing.hpp" +#include "xbt/lib.h" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_host); @@ -33,24 +34,21 @@ void surf_host_model_init_ptask_L07(void) xbt_assert(!surf_network_model, "network model type already defined"); // Define the callbacks to parse the XML - sg_platf_host_add_cb(cpu_parse_init); - sg_platf_host_add_cb(host_parse_init); sg_platf_link_add_cb(ptask_netlink_parse_init); sg_platf_postparse_add_cb(host_add_traces); surf_host_model = new HostL07Model(); Model *model = surf_host_model; - xbt_dynar_push(model_list, &model); - xbt_dynar_push(model_list_invoke, &model); + xbt_dynar_push(all_existing_models, &model); } -HostL07Model::HostL07Model() : HostModel("Host ptask_L07") { +HostL07Model::HostL07Model() : HostModel() { if (!ptask_maxmin_system) ptask_maxmin_system = lmm_system_new(1); surf_host_model = NULL; - surf_network_model = new NetworkL07Model(); - surf_cpu_model_pm = new CpuL07Model(); + surf_network_model = new NetworkL07Model(this); + surf_cpu_model_pm = new CpuL07Model(this); routing_model_create(surf_network_model->createLink("__loopback__", 498000000, NULL, @@ -167,7 +165,7 @@ void HostL07Model::updateActionsState(double /*now*/, double delta) { } Action *HostL07Model::executeParallelTask(int host_nb, - void **host_list, + sg_host_t*host_list, double *flops_amount, double *bytes_amount, double rate) @@ -180,7 +178,7 @@ Action *HostL07Model::executeParallelTask(int host_nb, action->p_edgeList->reserve(host_nb); for (int i = 0; ip_edgeList->push_back(static_cast(host_list[i])->p_netElm); + action->p_edgeList->push_back(sg_host_edge(host_list[i])); if (ptask_parallel_task_link_set == NULL) ptask_parallel_task_link_set = xbt_dict_new_homogeneous(NULL); @@ -234,7 +232,7 @@ Action *HostL07Model::executeParallelTask(int host_nb, for (int i = 0; i < host_nb; i++) lmm_expand(ptask_maxmin_system, - static_cast(host_list[i])->p_cpu->getConstraint(), + sg_host_surfcpu(host_list[i])->getConstraint(), action->getVariable(), flops_amount[i]); for (int i = 0; i < host_nb; i++) { @@ -277,25 +275,25 @@ Host *HostL07Model::createHost(const char *name) wk = new HostL07(this, name, NULL, sg_host_edge(sg_host), sg_host_surfcpu(sg_host)); - + surf_callback_emit(hostCreatedCallbacks, wk); xbt_lib_set(host_lib, name, SURF_HOST_LEVEL, wk); return wk; } -Action *HostL07Model::communicate(Host *src, Host *dst, +Action *NetworkL07Model::communicate(RoutingEdge *src, RoutingEdge *dst, double size, double rate) { - void **host_list = xbt_new0(void *, 2); + sg_host_t*host_list = xbt_new0(sg_host_t, 2); double *flops_amount = xbt_new0(double, 2); double *bytes_amount = xbt_new0(double, 4); Action *res = NULL; - host_list[0] = src; - host_list[1] = dst; + host_list[0] = sg_host_by_name(src->getName()); + host_list[1] = sg_host_by_name(dst->getName()); bytes_amount[1] = size; - res = executeParallelTask(2, host_list, + res = p_hostModel->executeParallelTask(2, host_list, flops_amount, bytes_amount, rate); @@ -317,7 +315,6 @@ Cpu *CpuL07Model::createCpu(const char *name, xbt_dynar_t powerPeak, xbt_dict_t cpu_properties) { double power_initial = xbt_dynar_get_as(powerPeak, pstate, double); - xbt_dynar_free(&powerPeak); // kill memory leak sg_host_t sg_host = sg_host_by_name(name); xbt_assert(!surf_host_resource_priv(sg_host), @@ -327,9 +324,7 @@ Cpu *CpuL07Model::createCpu(const char *name, xbt_dynar_t powerPeak, CpuL07 *cpu = new CpuL07(this, name, cpu_properties, power_initial, power_scale, power_trace, core, state_initial, state_trace); - - sg_host_surfcpu_set(sg_host, cpu); - + sg_host_surfcpu_register(sg_host, cpu); return cpu; } @@ -346,11 +341,13 @@ Link* NetworkL07Model::createLink(const char *name, xbt_assert(!Link::byName(name), "Link '%s' declared several times in the platform file.", name); - return new LinkL07(this, name, properties, + Link* link = new LinkL07(this, name, properties, bw_initial, bw_trace, lat_initial, lat_trace, state_initial, state_trace, policy); + surf_callback_emit(networkLinkCreatedCallbacks, link); + return link; } void HostL07Model::addTraces() @@ -423,36 +420,11 @@ HostL07::HostL07(HostModel *model, const char* name, xbt_dict_t props, RoutingEd { } -double HostL07::getPowerPeakAt(int /*pstate_index*/) -{ - THROW_UNIMPLEMENTED; -} - -int HostL07::getNbPstates() -{ - THROW_UNIMPLEMENTED; -} - -void HostL07::setPstate(int /*pstate_index*/) -{ - THROW_UNIMPLEMENTED; -} - -int HostL07::getPstate() -{ - THROW_UNIMPLEMENTED; -} - -double HostL07::getConsumedEnergy() -{ - THROW_UNIMPLEMENTED; -} - CpuL07::CpuL07(CpuL07Model *model, const char* name, xbt_dict_t props, double power_initial, double power_scale, tmgr_trace_t power_trace, int core, e_surf_resource_state_t state_initial, tmgr_trace_t state_trace) : Cpu(model, name, props, lmm_constraint_new(ptask_maxmin_system, this, power_initial * power_scale), - core, power_initial, power_scale) + core, power_initial, power_scale, state_initial) { xbt_assert(m_powerScale > 0, "Power has to be >0"); @@ -461,7 +433,6 @@ CpuL07::CpuL07(CpuL07Model *model, const char* name, xbt_dict_t props, else p_powerEvent = NULL; - setState(state_initial); if (state_trace) p_stateEvent = tmgr_history_add_trace(history, state_trace, 0.0, 0, this); } @@ -490,6 +461,35 @@ LinkL07::LinkL07(NetworkL07Model *model, const char* name, xbt_dict_t props, lmm_constraint_shared(getConstraint()); } +Action *CpuL07::execute(double size) +{ + sg_host_t*host_list = xbt_new0(sg_host_t, 1); + double *flops_amount = xbt_new0(double, 1); + double *bytes_amount = xbt_new0(double, 1); + + host_list[0] = sg_host_by_name(getName()); + flops_amount[0] = size; + + return static_cast(getModel())->executeParallelTask(1, host_list, + flops_amount, + bytes_amount, -1); +} + +Action *CpuL07::sleep(double duration) +{ + L07Action *action = NULL; + + XBT_IN("(%s,%g)", getName(), duration); + + action = static_cast(execute(1.0)); + action->m_maxDuration = duration; + action->m_suspended = 2; + lmm_update_variable_weight(ptask_maxmin_system, action->getVariable(), 0.0); + + XBT_OUT(); + return action; +} + bool CpuL07::isUsed(){ return lmm_constraint_used(ptask_maxmin_system, getConstraint()); } @@ -547,35 +547,6 @@ e_surf_resource_state_t HostL07::getState() { return p_cpu->getState(); } -Action *HostL07::execute(double size) -{ - void **host_list = xbt_new0(void *, 1); - double *flops_amount = xbt_new0(double, 1); - double *bytes_amount = xbt_new0(double, 1); - - host_list[0] = this; - bytes_amount[0] = 0.0; - flops_amount[0] = size; - - return static_cast(getModel())->executeParallelTask(1, host_list, - flops_amount, - bytes_amount, -1); -} - -Action *HostL07::sleep(double duration) -{ - L07Action *action = NULL; - - XBT_IN("(%s,%g)", getName(), duration); - - action = static_cast(execute(1.0)); - action->m_maxDuration = duration; - action->m_suspended = 2; - lmm_update_variable_weight(ptask_maxmin_system, action->getVariable(), 0.0); - - XBT_OUT(); - return action; -} double LinkL07::getBandwidth() { @@ -656,7 +627,7 @@ int L07Action::unref() { m_refcount--; if (!m_refcount) { - if (actionHook::is_linked()) + if (action_hook.is_linked()) p_stateSet->erase(p_stateSet->iterator_to(*this)); if (getVariable()) lmm_variable_free(ptask_maxmin_system, getVariable());