A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
various cleanups in actors/processes
[simgrid.git]
/
src
/
smpi
/
smpi_dvfs.cpp
diff --git
a/src/smpi/smpi_dvfs.cpp
b/src/smpi/smpi_dvfs.cpp
index
8c16192
..
c19e14e
100644
(file)
--- a/
src/smpi/smpi_dvfs.cpp
+++ b/
src/smpi/smpi_dvfs.cpp
@@
-1,5
+1,4
@@
-/* Copyright (c) 2013-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2013-2017. 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. */
/* 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. */
@@
-7,9
+6,9
@@
#include <xbt/log.h>
// FIXME: this plugin should be separated from the core
#include <xbt/log.h>
// FIXME: this plugin should be separated from the core
+#include "simgrid/s4u/Host.hpp"
#include <simgrid/plugins/energy.h>
#include <simgrid/simix.h>
#include <simgrid/plugins/energy.h>
#include <simgrid/simix.h>
-#include <simgrid/s4u/host.hpp>
#include <smpi/smpi.h>
#include <smpi/smpi.h>
@@
-25,7
+24,7
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_dvfs, smpi, "Logging specific to SMPI (expe
*/
double smpi_get_host_power_peak_at(int pstate_index)
{
*/
double smpi_get_host_power_peak_at(int pstate_index)
{
- return
SIMIX
_host_self()->getPstateSpeed(pstate_index);
+ return
sg
_host_self()->getPstateSpeed(pstate_index);
}
/**
}
/**
@@
-33,17
+32,17
@@
double smpi_get_host_power_peak_at(int pstate_index)
*
* \return Returns the current processor speed
*/
*
* \return Returns the current processor speed
*/
-double smpi_get_host_current_power_peak(
void
)
+double smpi_get_host_current_power_peak()
{
{
- return
SIMIX_host_self()->getPstateSpeedCurrent
();
+ return
sg_host_self()->speed
();
}
/**
* \brief Return the number of pstates defined for the current host
*/
}
/**
* \brief Return the number of pstates defined for the current host
*/
-int smpi_get_host_nb_pstates(
void
)
+int smpi_get_host_nb_pstates()
{
{
- return sg_host_get_nb_pstates(
SIMIX
_host_self());
+ return sg_host_get_nb_pstates(
sg
_host_self());
}
/**
}
/**
@@
-53,11
+52,11
@@
int smpi_get_host_nb_pstates(void)
*/
void smpi_set_host_pstate(int pstate_index)
{
*/
void smpi_set_host_pstate(int pstate_index)
{
- sg_host_set_pstate(
SIMIX
_host_self(), pstate_index);
+ sg_host_set_pstate(
sg
_host_self(), pstate_index);
}
/** @brief Gets the pstate at which the processor currently running */
int smpi_get_host_pstate() {
}
/** @brief Gets the pstate at which the processor currently running */
int smpi_get_host_pstate() {
- return sg_host_get_pstate(
SIMIX
_host_self());
+ return sg_host_get_pstate(
sg
_host_self());
}
/**
}
/**
@@
-65,54
+64,58
@@
int smpi_get_host_pstate() {
*
* \return Returns the consumed energy
*/
*
* \return Returns the consumed energy
*/
-double smpi_get_host_consumed_energy(
void
) {
- return sg_host_get_consumed_energy(
SIMIX
_host_self());
+double smpi_get_host_consumed_energy() {
+ return sg_host_get_consumed_energy(
sg
_host_self());
}
#if SMPI_FORTRAN
#if defined(__alpha__) || defined(__sparc64__) || defined(__x86_64__) || defined(__ia64__)
typedef int integer;
}
#if SMPI_FORTRAN
#if defined(__alpha__) || defined(__sparc64__) || defined(__x86_64__) || defined(__ia64__)
typedef int integer;
-typedef unsigned int uinteger;
#else
typedef long int integer;
#else
typedef long int integer;
-typedef unsigned long int uinteger;
#endif
typedef char *address;
typedef short int shortint;
typedef float real;
typedef double doublereal;
#endif
typedef char *address;
typedef short int shortint;
typedef float real;
typedef double doublereal;
-typedef struct { real r, i; } complex;
-typedef struct { doublereal r, i; } doublecomplex;
+typedef struct {
+ real r;
+ real i;
+} complex;
+typedef struct {
+ doublereal r;
+ doublereal i;
+} doublecomplex;
extern "C" XBT_PUBLIC(doublereal) smpi_get_host_power_peak_at_(integer *pstate_index);
doublereal smpi_get_host_power_peak_at_(integer *pstate_index)
{
extern "C" XBT_PUBLIC(doublereal) smpi_get_host_power_peak_at_(integer *pstate_index);
doublereal smpi_get_host_power_peak_at_(integer *pstate_index)
{
- return
(doublereal)smpi_get_host_power_peak_at((int)*pstate_index
);
+ return
static_cast<doublereal>(smpi_get_host_power_peak_at((int)*pstate_index)
);
}
}
-extern "C" XBT_PUBLIC(doublereal) smpi_get_host_current_power_peak_(
void
);
-doublereal smpi_get_host_current_power_peak_(
void
)
+extern "C" XBT_PUBLIC(doublereal) smpi_get_host_current_power_peak_();
+doublereal smpi_get_host_current_power_peak_()
{
return smpi_get_host_current_power_peak();
}
{
return smpi_get_host_current_power_peak();
}
-extern "C" XBT_PUBLIC(integer) smpi_get_host_nb_pstates_(
void
);
-integer smpi_get_host_nb_pstates_(
void
)
+extern "C" XBT_PUBLIC(integer) smpi_get_host_nb_pstates_();
+integer smpi_get_host_nb_pstates_()
{
{
- return
(integer)smpi_get_host_nb_pstates(
);
+ return
static_cast<integer>(smpi_get_host_nb_pstates()
);
}
extern "C" XBT_PUBLIC(void) smpi_set_host_pstate_(integer *pstate_index);
void smpi_set_host_pstate_(integer *pstate_index)
{
}
extern "C" XBT_PUBLIC(void) smpi_set_host_pstate_(integer *pstate_index);
void smpi_set_host_pstate_(integer *pstate_index)
{
- smpi_set_host_pstate(
(int)*pstate_index
);
+ smpi_set_host_pstate(
static_cast<int>(*pstate_index)
);
}
}
-extern "C" XBT_PUBLIC(doublereal) smpi_get_host_consumed_energy_(
void
);
-doublereal smpi_get_host_consumed_energy_(
void
)
+extern "C" XBT_PUBLIC(doublereal) smpi_get_host_consumed_energy_();
+doublereal smpi_get_host_consumed_energy_()
{
{
- return
(doublereal)smpi_get_host_consumed_energy(
);
+ return
static_cast<doublereal>(smpi_get_host_consumed_energy()
);
}
#endif
}
#endif