From 13e1a1ba15c7881d70cb79279bb601feda413d4d Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Wed, 28 Mar 2018 15:40:34 +0200 Subject: [PATCH] Function has been renamed. --- doc/doxygen/inside_extending.doc | 2 +- src/surf/plugins/host_energy.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/doxygen/inside_extending.doc b/doc/doxygen/inside_extending.doc index 9593489d61..e13c61cea6 100644 --- a/doc/doxygen/inside_extending.doc +++ b/doc/doxygen/inside_extending.doc @@ -108,7 +108,7 @@ initialization function. s_surf_model_description_t surf_plugin_description[] = { {"Energy", "Cpu energy consumption.", - sg_energy_plugin_init}, + sg_host_energy_plugin_init}, {"MyNetworkPlugin", "My network plugin.", sg_my_network_plugin_init}, diff --git a/src/surf/plugins/host_energy.cpp b/src/surf/plugins/host_energy.cpp index 81b4c9b559..4f288b7e81 100644 --- a/src/surf/plugins/host_energy.cpp +++ b/src/surf/plugins/host_energy.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2010-2018. 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. */ @@ -500,7 +500,7 @@ void sg_host_energy_update_all() double sg_host_get_consumed_energy(sg_host_t host) { xbt_assert(HostEnergy::EXTENSION_ID.valid(), - "The Energy plugin is not active. Please call sg_energy_plugin_init() during initialization."); + "The Energy plugin is not active. Please call sg_host_energy_plugin_init() during initialization."); return host->extension()->getConsumedEnergy(); } @@ -510,7 +510,7 @@ double sg_host_get_consumed_energy(sg_host_t host) double sg_host_get_wattmin_at(sg_host_t host, int pstate) { xbt_assert(HostEnergy::EXTENSION_ID.valid(), - "The Energy plugin is not active. Please call sg_energy_plugin_init() during initialization."); + "The Energy plugin is not active. Please call sg_host_energy_plugin_init() during initialization."); return host->extension()->getWattMinAt(pstate); } /** @ingroup plugin_energy @@ -519,7 +519,7 @@ double sg_host_get_wattmin_at(sg_host_t host, int pstate) double sg_host_get_wattmax_at(sg_host_t host, int pstate) { xbt_assert(HostEnergy::EXTENSION_ID.valid(), - "The Energy plugin is not active. Please call sg_energy_plugin_init() during initialization."); + "The Energy plugin is not active. Please call sg_host_energy_plugin_init() during initialization."); return host->extension()->getWattMaxAt(pstate); } @@ -529,7 +529,7 @@ double sg_host_get_wattmax_at(sg_host_t host, int pstate) double sg_host_get_current_consumption(sg_host_t host) { xbt_assert(HostEnergy::EXTENSION_ID.valid(), - "The Energy plugin is not active. Please call sg_energy_plugin_init() during initialization."); + "The Energy plugin is not active. Please call sg_host_energy_plugin_init() during initialization."); return host->extension()->getCurrentWattsValue(); } } -- 2.20.1