Mise à jour terminée. Pour connaître les apports de la version 13.8.4 par rapport à notre ancienne version vous pouvez lire les "Release Notes" suivantes :
https://about.gitlab.com/releases/2021/02/11/security-release-gitlab-13-8-4-released/
https://about.gitlab.com/releases/2021/02/05/gitlab-13-8-3-released/

Commit e813207e authored by Millian Poquet's avatar Millian Poquet

SimGrid functions refactoring to support latest dev version of SimGrid (revision be8f70f9d)

parent 7504319f
......@@ -2,12 +2,7 @@
* Installation
** Dependencies
- SimGrid:
- Recommended version: rev 5b8393a87 on git://scm.gforge.inria.fr/simgrid/simgrid.git
- Other versions (if the recommanded one does not work for example):
- without energy: rev 8de23104635721196 on git://scm.gforge.inria.fr/simgrid/simgrid.git
- with energy: rev 685c03b7bc7bbc on https://github.com/mquinson/simgrid.git
- with energy & SimGrid process tracing: rev 79f2c630c9587d494cb1 on https://github.com/mquinson/simgrid.git
- SimGrid revision be8f70f9dd5f57 on git://scm.gforge.inria.fr/simgrid/simgrid.git
- rapidjson
- boost (system, filesystem)
- C++11 compiler
......
......@@ -5,7 +5,7 @@
#include <unistd.h>
#include <simgrid/msg.h>
#include <simgrid/plugins.h>
#include <simgrid/plugins/energy.h>
#include <boost/algorithm/string/case_conv.hpp>
......
#include "jobs_execution.hpp"
#include "jobs.hpp"
#include <simgrid/plugins/energy.h>
#include <simgrid/msg.h>
#include <smpi/smpi.h>
......@@ -243,7 +245,7 @@ int execute_job_process(int argc, char *argv[])
for(const int & machine_id : job->allocation)
{
Machine * machine = args->context->machines[machine_id];
job->consumed_energy += MSG_host_get_consumed_energy(machine->host);
job->consumed_energy += sg_host_get_consumed_energy(machine->host);
}
}
......@@ -273,7 +275,7 @@ int execute_job_process(int argc, char *argv[])
for(const int & machine_id : job->allocation)
{
Machine * machine = args->context->machines[machine_id];
job->consumed_energy += MSG_host_get_consumed_energy(machine->host);
job->consumed_energy += sg_host_get_consumed_energy(machine->host);
}
// The consumed energy is the difference (consumed_energy_after_job - consumed_energy_before_job)
......
......@@ -6,6 +6,8 @@
#include <boost/algorithm/string/join.hpp>
#include <boost/lexical_cast.hpp>
#include <simgrid/plugins/energy.h>
#include "context.hpp"
#include "export.hpp"
......@@ -42,7 +44,7 @@ void Machines::createMachines(xbt_dynar_t hosts, BatsimContext *context, const s
{
Machine * machine = new Machine;
machine->name = MSG_host_get_name(host);
machine->name = sg_host_get_name(host);
machine->host = host;
machine->jobs_being_computed = {};
machine->state = MachineState::IDLE;
......@@ -239,7 +241,7 @@ long double Machines::total_consumed_energy(BatsimContext *context) const
if (context->energy_used)
{
for (const Machine * m : _machines)
total_consumed_energy += MSG_host_get_consumed_energy(m->host);
total_consumed_energy += sg_host_get_consumed_energy(m->host);
}
else
total_consumed_energy = -1;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment