X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3715b2a421abd8357f41fb2be3c25a351f1af8cb..b3b356352e87ae00a20f737c48e19b0c8413455a:/src/surf/host_ptask_L07.hpp?ds=sidebyside diff --git a/src/surf/host_ptask_L07.hpp b/src/surf/host_ptask_L07.hpp index 33a957dfa8..d3466c93f7 100644 --- a/src/surf/host_ptask_L07.hpp +++ b/src/surf/host_ptask_L07.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2013-2014. The SimGrid Team. +/* Copyright (c) 2013-2015. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -39,19 +39,18 @@ public: void updateActionsState(double now, double delta); Host *createHost(const char *name); Action *executeParallelTask(int host_nb, - void **host_list, - double *flops_amount, - double *bytes_amount, - double rate); + sg_host_t *host_list, + double *flops_amount, + double *bytes_amount, + double rate); xbt_dynar_t getRoute(Host *src, Host *dst); - Action *communicate(Host *src, Host *dst, double size, double rate); void addTraces(); NetworkModel *p_networkModel; }; class CpuL07Model : public CpuModel { public: - CpuL07Model() : CpuModel("cpuL07") {}; + CpuL07Model() : CpuModel() {}; ~CpuL07Model() {surf_cpu_model_pm = NULL;}; Cpu *createCpu(const char *name, xbt_dynar_t powerPeak, int pstate, double power_scale, @@ -79,7 +78,7 @@ public: e_surf_link_sharing_policy_t policy, xbt_dict_t properties); - Action *communicate(RoutingEdge */*src*/, RoutingEdge */*dst*/, double /*size*/, double /*rate*/) {DIE_IMPOSSIBLE;}; + Action *communicate(RoutingEdge *src, RoutingEdge *dst, double size, double rate); void addTraces() {DIE_IMPOSSIBLE;}; bool shareResourcesIsIdempotent() {return true;} @@ -162,7 +161,7 @@ class L07Action : public HostAction { friend Action *HostL07::execute(double size); friend Action *HostL07::sleep(double duration); friend Action *HostL07Model::executeParallelTask(int host_nb, - void **host_list, + sg_host_t*host_list, double *flops_amount, double *bytes_amount, double rate);