/* 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 "smpi_comm.hpp"
#include "smpi_group.hpp"
+#include "smpi_comm.hpp"
+#include <string>
+#include <xbt/log.h>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_group, smpi, "Logging specific to SMPI (group)");
Group::Group()
{
size_ = 0; /* size */
- rank_to_index_map_ = nullptr; /* rank_to_index_map_ */
refcount_ = 1; /* refcount_: start > 0 so that this group never gets freed */
}
-Group::Group(int n) : size_(n)
+Group::Group(int n) : size_(n), rank_to_index_map_(size_)
{
- rank_to_index_map_ = new int[size_];
refcount_ = 1;
for (int i = 0; i < size_; i++)
rank_to_index_map_[i] = MPI_UNDEFINED;
{
if (origin != MPI_GROUP_NULL && origin != MPI_GROUP_EMPTY) {
size_ = origin->size();
- rank_to_index_map_ = new int[size_];
refcount_ = 1;
- for (int i = 0; i < size_; i++) {
- rank_to_index_map_[i] = origin->rank_to_index_map_[i];
- }
+ rank_to_index_map_ = origin->rank_to_index_map_;
for (auto const& elm : origin->index_to_rank_map_) {
index_to_rank_map_.insert({elm.first, elm.second});
Group::~Group()
{
- delete[] rank_to_index_map_;
+ rank_to_index_map_.clear();
}
void Group::set_mapping(int index, int rank)
*newgroup = MPI_GROUP_EMPTY;
} else if (n == size_) {
*newgroup = this;
- if(this!= MPI_COMM_WORLD->group()
- && this != MPI_COMM_SELF->group()
- && this != MPI_GROUP_EMPTY)
- this->ref();
+ if (this != MPI_COMM_WORLD->group() && this != MPI_COMM_SELF->group() && this != MPI_GROUP_EMPTY)
+ this->ref();
} else {
*newgroup = new Group(n);
for (i = 0; i < n; i++) {
int oldsize = size_;
int newsize = oldsize - n;
*newgroup = new Group(newsize);
- int* to_exclude=xbt_new0(int, size_);
+ int* to_exclude = new int[size_];
for (int i = 0; i < oldsize; i++)
to_exclude[i]=0;
for (int i = 0; i < n; i++)
j++;
}
}
- xbt_free(to_exclude);
+ delete[] to_exclude;
return MPI_SUCCESS;
}