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
Replace surf by surf++ and make it compile
[simgrid.git]
/
src
/
surf
/
cpu_cas01.cpp
diff --git
a/src/surf/cpu_cas01.cpp
b/src/surf/cpu_cas01.cpp
index
6eb404c
..
68fba77
100644
(file)
--- a/
src/surf/cpu_cas01.cpp
+++ b/
src/surf/cpu_cas01.cpp
@@
-10,14
+10,10
@@
#include "maxmin_private.h"
#include "simgrid/sg_config.h"
#include "maxmin_private.h"
#include "simgrid/sg_config.h"
-//TODO: resolve dependencies
-static void TRACE_surf_host_set_power(double date, const char *resource, double power) {}
-
-
-static ModelPtr surf_cpu_model = NULL;
-
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surfpp_cpu_cas, surfpp,
+extern "C" {
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_cas, surf,
"Logging specific to the SURF CPU IMPROVED module");
"Logging specific to the SURF CPU IMPROVED module");
+}
static xbt_swag_t
cpu_running_action_set_that_does_not_need_being_checked = NULL;
static xbt_swag_t
cpu_running_action_set_that_does_not_need_being_checked = NULL;
@@
-141,7
+137,7
@@
CpuCas01LmmPtr CpuCas01Model::createResource(const char *name, double power_peak
double CpuCas01Model::shareResourcesFull(double now)
{
CpuCas01ActionLmm action;
double CpuCas01Model::shareResourcesFull(double now)
{
CpuCas01ActionLmm action;
- Model::shareResources
Full
(p_runningActionSet,
+ Model::shareResources
MaxMin
(p_runningActionSet,
xbt_swag_offset(action, p_variable),
p_maxminSystem, lmm_solve);
return 0;
xbt_swag_offset(action, p_variable),
p_maxminSystem, lmm_solve);
return 0;