X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4ae2fd01d8cc55bf83654e29f294335e3cb1f022..63c22347e854ce1cd31b509002df101876034c3e:/src/smpi/smpi_dvfs.cpp diff --git a/src/smpi/smpi_dvfs.cpp b/src/smpi/smpi_dvfs.cpp index efd24c3f32..c5910cb639 100644 --- a/src/smpi/smpi_dvfs.cpp +++ b/src/smpi/smpi_dvfs.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2013-2015. The SimGrid Team. +/* Copyright (c) 2013-2017. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -35,7 +35,7 @@ double smpi_get_host_power_peak_at(int pstate_index) */ double smpi_get_host_current_power_peak() { - return SIMIX_host_self()->getPstateSpeedCurrent(); + return SIMIX_host_self()->speed(); } /** @@ -73,10 +73,8 @@ double smpi_get_host_consumed_energy() { #if defined(__alpha__) || defined(__sparc64__) || defined(__x86_64__) || defined(__ia64__) typedef int integer; -typedef unsigned int uinteger; #else typedef long int integer; -typedef unsigned long int uinteger; #endif typedef char *address; typedef short int shortint;