-/* Copyright (c) 2004-2017. The SimGrid Team.
+/* Copyright (c) 2004-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. */
-#include "SmpiHost.hpp"
+#include "smpi_host.hpp"
#include "private.hpp"
#include "simgrid/msg.h" /* barrier */
#include "simgrid/s4u/Engine.hpp"
class Instance {
public:
- Instance(const char* name, int max_no_processes, int process_count, MPI_Comm comm, msg_bar_t finalization_barrier)
+ Instance(const std::string name, int max_no_processes, int process_count, MPI_Comm comm,
+ msg_bar_t finalization_barrier)
: name(name)
, size(max_no_processes)
, present_processes(0)
, finalization_barrier(finalization_barrier)
{ }
- const char* name;
+ const std::string name;
int size;
int present_processes;
MPI_Comm comm_world;
static int already_called = 0;
if (not already_called) {
already_called = 1;
- std::vector<simgrid::s4u::Host*> list;
- simgrid::s4u::Engine::getInstance()->getHostList(&list);
+ std::vector<simgrid::s4u::Host*> list = simgrid::s4u::Engine::get_instance()->get_all_hosts();
for (auto const& host : list) {
- host->extension_set(new simgrid::smpi::SmpiHost(host));
+ host->extension_set(new simgrid::smpi::Host(host));
}
}
- Instance instance(name, num_processes, process_count, MPI_COMM_NULL, MSG_barrier_init(num_processes));
+ Instance instance(std::string(name), num_processes, process_count, MPI_COMM_NULL, MSG_barrier_init(num_processes));
MPI_Group group = new simgrid::smpi::Group(instance.size);
instance.comm_world = new simgrid::smpi::Comm(group, nullptr);
MPI_Attr_put(instance.comm_world, MPI_UNIVERSE_SIZE, reinterpret_cast<void*>(instance.size));
smpi_instances.insert(std::pair<std::string, Instance>(name, instance));
}
-void smpi_deployment_register_process(const char* instance_id, int rank, simgrid::s4u::ActorPtr actor)
+void smpi_deployment_register_process(const std::string instance_id, int rank, simgrid::s4u::ActorPtr actor)
{
if (smpi_instances.empty()) // no instance registered, we probably used smpirun.
return;
instance.comm_world->group()->set_mapping(actor, rank);
}
-MPI_Comm* smpi_deployment_comm_world(const char* instance_id)
+MPI_Comm* smpi_deployment_comm_world(const std::string instance_id)
{
if (smpi_instances.empty()) { // no instance registered, we probably used smpirun.
return nullptr;
return &instance.comm_world;
}
-msg_bar_t smpi_deployment_finalization_barrier(const char* instance_id)
+msg_bar_t smpi_deployment_finalization_barrier(const std::string instance_id)
{
if (smpi_instances.empty()) { // no instance registered, we probably used smpirun.
return nullptr;