X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a243b4c3535f516d05259cac06963c422d4aadc0..40778ac106dfafd9f790d8bdadf737de01c3d3e3:/src/surf/workstation_ptask_L07.hpp diff --git a/src/surf/workstation_ptask_L07.hpp b/src/surf/workstation_ptask_L07.hpp index 0fcb23c624..364ed78a54 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_ @@ -25,11 +31,8 @@ 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 * @@ -45,43 +48,38 @@ public: 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); + WorkstationPtr createWorkstation(const char *name); 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); + xbt_dynar_t getRoute(WorkstationPtr src, WorkstationPtr dst); + ActionPtr communicate(WorkstationPtr src, WorkstationPtr dst, double size, double rate); void addTraces(); - CpuL07ModelPtr p_cpuModel; - NetworkL07ModelPtr p_networkModel; + 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); + CpuPtr createCpu(const char *name, xbt_dynar_t powerPeak, + int pstate, double power_scale, + tmgr_trace_t power_trace, int core, + e_surf_resource_state_t state_initial, + tmgr_trace_t state_trace, + xbt_dict_t cpu_properties); void addTraces() {DIE_IMPOSSIBLE;}; + WorkstationL07ModelPtr p_workstationModel; }; -class NetworkL07Model : public NetworkCm02Model { +class NetworkL07Model : public NetworkModel { public: - NetworkL07Model() : NetworkCm02Model(0) {}; + NetworkL07Model() : NetworkModel() {}; ~NetworkL07Model() {surf_network_model = NULL;}; - ResourcePtr createResource(const char *name, + NetworkLinkPtr createNetworkLink(const char *name, double bw_initial, tmgr_trace_t bw_trace, double lat_initial, @@ -92,8 +90,7 @@ public: e_surf_link_sharing_policy_t policy, xbt_dict_t properties); - xbt_dynar_t getRoute(WorkstationCLM03Ptr src, WorkstationCLM03Ptr dst) {DIE_IMPOSSIBLE;}; - ActionPtr communicate(RoutingEdgePtr src, RoutingEdgePtr 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; }; @@ -102,12 +99,12 @@ public: * Resource * ************/ -class WorkstationL07 : public WorkstationCLM03Lmm { +class WorkstationL07 : public Workstation { public: 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;}; + 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(); @@ -117,35 +114,47 @@ public: double getConsumedEnergy(); }; -class CpuL07 : public CpuLmm { +class CpuL07 : public Cpu { + friend void WorkstationL07Model::addTraces(); + tmgr_trace_event_t p_stateEvent; + tmgr_trace_event_t p_powerEvent; public: - CpuL07(CpuL07ModelPtr model, const char* name, xbt_dict_t properties); + CpuL07(CpuL07ModelPtr model, const char* name, xbt_dict_t properties, + double power_scale, double power_initial, tmgr_trace_t power_trace, + int core, 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) {DIE_IMPOSSIBLE;}; - ActionPtr sleep(double duration) {DIE_IMPOSSIBLE;}; - - double getCurrentPowerPeak() {}; - double getPowerPeakAt(int pstate_index) {}; - int getNbPstates() {}; - void setPowerPeakAt(int pstate_index) {}; - double getConsumedEnergy() {}; - - double m_powerCurrent; + 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;}; }; -class LinkL07 : public NetworkCm02LinkLmm { +class LinkL07 : public NetworkLink { public: - LinkL07(NetworkL07ModelPtr 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(); double getLatency(); bool isShared(); + void updateBandwidth(double value, double date=surf_get_clock()); + void updateLatency(double value, double date=surf_get_clock()); double m_latCurrent; tmgr_trace_event_t p_latEvent; @@ -156,11 +165,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) - : Action(model, cost, failed), WorkstationActionLmm(model, cost, failed) {}; - ~WorkstationL07ActionLmm(); + WorkstationL07Action(ModelPtr model, double cost, bool failed) + : WorkstationAction(model, cost, failed) {}; + ~WorkstationL07Action(); void updateBound(); @@ -174,7 +191,7 @@ public: double getRemains(); int m_workstationNb; - WorkstationCLM03Ptr *p_workstationList; + WorkstationPtr *p_workstationList; double *p_computationAmount; double *p_communicationAmount; double m_latency;