X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5faf49cdf3f8ad8751317b857a6d3134fe07eda3..6211c588d514efac018d071c4304df3f7bace3bd:/src/surf/workstation_ptask_L07.hpp diff --git a/src/surf/workstation_ptask_L07.hpp b/src/surf/workstation_ptask_L07.hpp index 38a6e9e498..360a851780 100644 --- a/src/surf/workstation_ptask_L07.hpp +++ b/src/surf/workstation_ptask_L07.hpp @@ -1,4 +1,10 @@ -#include "workstation.hpp" +/* Copyright (c) 2013-2014. 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_interface.hpp" #ifndef WORKSTATION_L07_HPP_ #define WORKSTATION_L07_HPP_ @@ -10,17 +16,23 @@ class WorkstationL07Model; typedef WorkstationL07Model *WorkstationL07ModelPtr; +class CpuL07Model; +typedef CpuL07Model *CpuL07ModelPtr; + +class NetworkL07Model; +typedef NetworkL07Model *NetworkL07ModelPtr; + +class WorkstationL07; +typedef WorkstationL07 *WorkstationL07Ptr; + class CpuL07; typedef CpuL07 *CpuL07Ptr; class LinkL07; typedef LinkL07 *LinkL07Ptr; -class WorkstationL07ActionLmm; -typedef WorkstationL07ActionLmm *WorkstationL07ActionLmmPtr; - -/*FIXME:class WorkstationActionLmm; -typedef WorkstationActionLmm *WorkstationActionLmmPtr;*/ +class WorkstationL07Action; +typedef WorkstationL07Action *WorkstationL07ActionPtr; /********* * Tools * @@ -32,14 +44,47 @@ typedef WorkstationActionLmm *WorkstationActionLmmPtr;*/ class WorkstationL07Model : public WorkstationModel { public: WorkstationL07Model(); - void parseInit(sg_platf_host_cbarg_t host); - WorkstationCLM03Ptr createCpuResource(const char *name, double power_scale, + ~WorkstationL07Model(); + + double shareResources(double now); + void updateActionsState(double now, double delta); + ResourcePtr 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); + ActionPtr executeParallelTask(int workstation_nb, + void **workstation_list, + double *computation_amount, + double *communication_amount, + double rate); + xbt_dynar_t getRoute(WorkstationPtr src, WorkstationPtr dst); + ActionPtr communicate(WorkstationPtr src, WorkstationPtr dst, double size, double rate); + void addTraces(); + NetworkModelPtr p_networkModel; +}; + +class CpuL07Model : public CpuModel { +public: + CpuL07Model() : CpuModel("cpuL07") {}; + ~CpuL07Model() {surf_cpu_model_pm = NULL;}; + ResourcePtr 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); - WorkstationCLM03Ptr createLinkResource(const char *name, + void addTraces() {DIE_IMPOSSIBLE;}; + + WorkstationL07ModelPtr p_workstationModel; +}; + +class NetworkL07Model : public NetworkModel { +public: + NetworkL07Model() : NetworkModel() {}; + ~NetworkL07Model() {surf_network_model = NULL;}; + NetworkLinkPtr createResource(const char *name, double bw_initial, tmgr_trace_t bw_trace, double lat_initial, @@ -49,49 +94,71 @@ public: tmgr_trace_t state_trace, e_surf_link_sharing_policy_t policy, xbt_dict_t properties); - double shareResources(double now); - void updateActionsState(double now, double delta); - void addTraces(); - ActionPtr executeParallelTask(int workstation_nb, - void **workstation_list, - double *computation_amount, - double *communication_amount, - double rate); - xbt_dynar_t getRoute(WorkstationCLM03Ptr src, WorkstationCLM03Ptr dst); - ActionPtr communicate(WorkstationCLM03Ptr src, WorkstationCLM03Ptr dst, double size, double rate); -}; - -class NetworkL07Model : public NetworkCm02Model { -public: - NetworkL07Model(): NetworkCm02Model() {}; - xbt_dynar_t getRoute(WorkstationCLM03Ptr src, WorkstationCLM03Ptr dst) {DIE_IMPOSSIBLE;}; - ActionPtr communicate(WorkstationCLM03Ptr src, WorkstationCLM03Ptr dst, double size, double rate) {DIE_IMPOSSIBLE;}; + ActionPtr communicate(RoutingEdgePtr /*src*/, RoutingEdgePtr /*dst*/, double /*size*/, double /*rate*/) {DIE_IMPOSSIBLE;}; void addTraces() {DIE_IMPOSSIBLE;}; + WorkstationL07ModelPtr p_workstationModel; }; /************ * Resource * ************/ -class CpuL07 : public WorkstationCLM03Lmm { +class WorkstationL07 : public Workstation { public: - CpuL07(WorkstationL07ModelPtr model, const char* name, xbt_dict_t properties); + WorkstationL07(WorkstationModelPtr model, const char* name, xbt_dict_t props, RoutingEdgePtr netElm, CpuPtr cpu); + //bool isUsed(); + bool isUsed() {DIE_IMPOSSIBLE;}; + void updateState(tmgr_trace_event_t /*event_type*/, double /*value*/, double /*date*/) {DIE_IMPOSSIBLE;}; + ActionPtr execute(double size); + ActionPtr sleep(double duration); + e_surf_resource_state_t getState(); + double getPowerPeakAt(int pstate_index); + int getNbPstates(); + void setPowerPeakAt(int pstate_index); + double getConsumedEnergy(); +}; + +class CpuL07 : public Cpu { +public: + s_surf_metric_t p_power; + tmgr_trace_event_t p_stateEvent; + +public: + CpuL07(CpuL07ModelPtr model, const char* name, xbt_dict_t properties, + double power_scale, + double power_initial, tmgr_trace_t power_trace, + e_surf_resource_state_t state_initial, tmgr_trace_t state_trace); bool isUsed(); + //bool isUsed() {DIE_IMPOSSIBLE;}; void updateState(tmgr_trace_event_t event_type, double value, double date); - e_surf_resource_state_t getState(); double getSpeed(double load); double getAvailableSpeed(); - ActionPtr execute(double size); - ActionPtr sleep(double duration); + CpuActionPtr execute(double /*size*/) {DIE_IMPOSSIBLE;}; + CpuActionPtr sleep(double /*duration*/) {DIE_IMPOSSIBLE;}; + + double getCurrentPowerPeak() {THROW_UNIMPLEMENTED;}; + double getPowerPeakAt(int /*pstate_index*/) {THROW_UNIMPLEMENTED;}; + int getNbPstates() {THROW_UNIMPLEMENTED;}; + void setPowerPeakAt(int /*pstate_index*/) {THROW_UNIMPLEMENTED;}; + double getConsumedEnergy() {THROW_UNIMPLEMENTED;}; double m_powerCurrent; - RoutingEdgePtr p_info; }; -class LinkL07 : public WorkstationCLM03Lmm { +class LinkL07 : public NetworkLink { public: - LinkL07(WorkstationL07ModelPtr model, const char* name, xbt_dict_t props); + LinkL07(NetworkL07ModelPtr model, const char* name, xbt_dict_t props, + double bw_initial, + tmgr_trace_t bw_trace, + double lat_initial, + tmgr_trace_t lat_trace, + e_surf_resource_state_t + state_initial, + tmgr_trace_t state_trace, + e_surf_link_sharing_policy_t policy); + ~LinkL07(){ + }; bool isUsed(); void updateState(tmgr_trace_event_t event_type, double value, double date); double getBandwidth(); @@ -107,10 +174,19 @@ public: /********** * Action * **********/ -class WorkstationL07ActionLmm : public WorkstationActionLmm { +class WorkstationL07Action : public WorkstationAction { + friend ActionPtr WorkstationL07::execute(double size); + friend ActionPtr WorkstationL07::sleep(double duration); + friend ActionPtr WorkstationL07Model::executeParallelTask(int workstation_nb, + void **workstation_list, + double + *computation_amount, double + *communication_amount, + double rate); public: - WorkstationL07ActionLmm(ModelPtr model, double cost, bool failed): WorkstationActionLmm(model, cost, failed) {}; - ~WorkstationL07ActionLmm(); + WorkstationL07Action(ModelPtr model, double cost, bool failed) + : WorkstationAction(model, cost, failed) {}; + ~WorkstationL07Action(); void updateBound(); @@ -124,7 +200,7 @@ public: double getRemains(); int m_workstationNb; - WorkstationCLM03Ptr *p_workstationList; + WorkstationPtr *p_workstationList; double *p_computationAmount; double *p_communicationAmount; double m_latency;