X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5b3677b425b9cc6949c1573d59ac772540cbf4b2..5f8a647bcabed9fa873dd266735c3e58e9fd3c27:/src/surf/vm_workstation_hl13.hpp diff --git a/src/surf/vm_workstation_hl13.hpp b/src/surf/vm_workstation_hl13.hpp index cf3d23f517..c09d5f3eb1 100644 --- a/src/surf/vm_workstation_hl13.hpp +++ b/src/surf/vm_workstation_hl13.hpp @@ -13,8 +13,6 @@ #define GUESTOS_NOISE 100 // This value corresponds to the cost of the global action associated to the VM // It corresponds to the cost of a VM running no tasks. -void surf_vm_workstation_model_init(void); - /*********** * Classes * ***********/ @@ -25,10 +23,6 @@ typedef WorkstationVMHL13Model *WorkstationVMHL13ModelPtr; class WorkstationVMHL13; typedef WorkstationVMHL13 *WorkstationVMHL13Ptr; -/********* - * Tools * - *********/ - /********* * Model * *********/ @@ -36,15 +30,15 @@ class WorkstationVMHL13Model : public WorkstationVMModel { public: WorkstationVMHL13Model(); ~WorkstationVMHL13Model(){}; - void createResource(const char *name, void *ind_phys_workstation); + + WorkstationVMPtr createWorkstationVM(const char *name, surf_resource_t ind_phys_workstation); double shareResources(double now); void adjustWeightOfDummyCpuActions() {}; - xbt_dynar_t getRoute(WorkstationPtr src, WorkstationPtr dst); ActionPtr communicate(WorkstationPtr src, WorkstationPtr dst, double size, double rate); ActionPtr executeParallelTask(int workstation_nb, void **workstation_list, - double *computation_amount, - double *communication_amount, + double *flops_amount, + double *bytes_amount, double rate); void updateActionsState(double /*now*/, double /*delta*/); };