X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dc1466c0fbb38cdbe51b35767cf6e7adce81597d..04cb8833befbe07b6b94ff0cae98bc17b78724e3:/src/smpi/smpi_group.cpp diff --git a/src/smpi/smpi_group.cpp b/src/smpi/smpi_group.cpp index 8d22f492c3..f12c5cfa7c 100644 --- a/src/smpi/smpi_group.cpp +++ b/src/smpi/smpi_group.cpp @@ -1,12 +1,13 @@ -/* Copyright (c) 2010, 2013-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2010-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. */ -#include "private.h" +#include "src/smpi/smpi_comm.hpp" +#include "src/smpi/smpi_group.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_group, smpi, "Logging specific to SMPI (group)"); + simgrid::smpi::Group mpi_MPI_GROUP_EMPTY; MPI_Group MPI_GROUP_EMPTY=&mpi_MPI_GROUP_EMPTY; @@ -15,74 +16,64 @@ namespace smpi{ Group::Group() { - m_size=0; /* size */ - m_rank_to_index_map=nullptr; /* m_rank_to_index_map */ - m_index_to_rank_map=nullptr; /* m_index_to_rank_map */ - m_refcount=1; /* m_refcount: start > 0 so that this group never gets freed */ + size_=0; /* size */ + rank_to_index_map_=nullptr; /* rank_to_index_map_ */ + index_to_rank_map_=nullptr; /* index_to_rank_map_ */ + refcount_=1; /* refcount_: start > 0 so that this group never gets freed */ } -Group::Group(int n) : m_size(n) +Group::Group(int n) : size_(n) { - int i; - m_rank_to_index_map = xbt_new(int, m_size); - m_index_to_rank_map = xbt_dict_new_homogeneous(xbt_free_f); - m_refcount = 1; - for (i = 0; i < m_size; i++) { - m_rank_to_index_map[i] = MPI_UNDEFINED; + rank_to_index_map_ = xbt_new(int, size_); + index_to_rank_map_ = xbt_dict_new_homogeneous(xbt_free_f); + refcount_ = 1; + for (int i = 0; i < size_; i++) { + rank_to_index_map_[i] = MPI_UNDEFINED; } } Group::Group(MPI_Group origin) { - char *key; - char *ptr_rank; - xbt_dict_cursor_t cursor = nullptr; - - int i; if(origin != MPI_GROUP_NULL && origin != MPI_GROUP_EMPTY) { - m_size = origin->size(); - m_rank_to_index_map = xbt_new(int, m_size); - m_index_to_rank_map = xbt_dict_new_homogeneous(xbt_free_f); - m_refcount = 1; - for (i = 0; i < m_size; i++) { - m_rank_to_index_map[i] = origin->m_rank_to_index_map[i]; + size_ = origin->size(); + rank_to_index_map_ = xbt_new(int, size_); + index_to_rank_map_ = xbt_dict_new_homogeneous(xbt_free_f); + refcount_ = 1; + for (int i = 0; i < size_; i++) { + rank_to_index_map_[i] = origin->rank_to_index_map_[i]; } - xbt_dict_foreach(origin->m_index_to_rank_map, cursor, key, ptr_rank) { + char* key; + char* ptr_rank; + xbt_dict_cursor_t cursor = nullptr; + xbt_dict_foreach(origin->index_to_rank_map_, cursor, key, ptr_rank) { int * cp = static_cast(xbt_malloc(sizeof(int))); *cp=*reinterpret_cast(ptr_rank); - xbt_dict_set(m_index_to_rank_map, key, cp, nullptr); + xbt_dict_set(index_to_rank_map_, key, cp, nullptr); } } } Group::~Group() { - xbt_free(m_rank_to_index_map); - xbt_dict_free(&m_index_to_rank_map); -} - -void Group::destroy() -{ - if(this != MPI_COMM_WORLD->group() - && this != MPI_GROUP_EMPTY) - this->unuse(); + xbt_free(rank_to_index_map_); + xbt_dict_free(&index_to_rank_map_); } void Group::set_mapping(int index, int rank) { int * val_rank; - if (rank < m_size) { - m_rank_to_index_map[rank] = index; + if (rank < size_) { + rank_to_index_map_[rank] = index; if (index!=MPI_UNDEFINED ) { val_rank = static_cast(xbt_malloc(sizeof(int))); *val_rank = rank; char * key = bprintf("%d", index); - xbt_dict_set(m_index_to_rank_map, key, val_rank, nullptr); + xbt_dict_set(index_to_rank_map_, key, val_rank, nullptr); xbt_free(key); } } @@ -92,8 +83,8 @@ int Group::index(int rank) { int index = MPI_UNDEFINED; - if (0 <= rank && rank < m_size) { - index = m_rank_to_index_map[rank]; + if (0 <= rank && rank < size_) { + index = rank_to_index_map_[rank]; } return index; } @@ -104,7 +95,7 @@ int Group::rank(int index) if (this==MPI_GROUP_EMPTY) return MPI_UNDEFINED; char * key = bprintf("%d", index); - ptr_rank = static_cast(xbt_dict_get_or_null(m_index_to_rank_map, key)); + ptr_rank = static_cast(xbt_dict_get_or_null(index_to_rank_map_, key)); xbt_free(key); if (ptr_rank==nullptr) @@ -112,25 +103,22 @@ int Group::rank(int index) return *ptr_rank; } -int Group::use() +void Group::ref() { - m_refcount++; - return m_refcount; + refcount_++; } -int Group::unuse() +void Group::unref(Group* group) { - m_refcount--; - if (m_refcount <= 0) { - delete this; - return 0; + group->refcount_--; + if (group->refcount_ <= 0) { + delete group; } - return m_refcount; } int Group::size() { - return m_size; + return size_; } int Group::compare(MPI_Group group2) @@ -139,13 +127,12 @@ int Group::compare(MPI_Group group2) int i; int index; int rank; - int sz; result = MPI_IDENT; - if (m_size != group2->size()) { + if (size_ != group2->size()) { result = MPI_UNEQUAL; } else { - sz = group2->size(); + int sz = group2->size(); for (i = 0; i < sz; i++) { index = this->index(i); rank = group2->rank(index); @@ -167,12 +154,12 @@ int Group::incl(int n, int* ranks, MPI_Group* newgroup) int index=0; if (n == 0) { *newgroup = MPI_GROUP_EMPTY; - } else if (n == m_size) { + } else if (n == size_) { *newgroup = this; if(this!= MPI_COMM_WORLD->group() && this != MPI_COMM_SELF->group() && this != MPI_GROUP_EMPTY) - this->use(); + this->ref(); } else { *newgroup = new Group(n); for (i = 0; i < n; i++) { @@ -185,7 +172,7 @@ int Group::incl(int n, int* ranks, MPI_Group* newgroup) int Group::group_union(MPI_Group group2, MPI_Group* newgroup) { - int size1 = m_size; + int size1 = size_; int size2 = group2->size(); for (int i = 0; i < size2; i++) { int proc2 = group2->index(i); @@ -197,7 +184,7 @@ int Group::group_union(MPI_Group group2, MPI_Group* newgroup) if (size1 == 0) { *newgroup = MPI_GROUP_EMPTY; } else { - *newgroup = new simgrid::smpi::Group(size1); + *newgroup = new Group(size1); size2 = this->size(); for (int i = 0; i < size2; i++) { int proc1 = this->index(i); @@ -224,7 +211,7 @@ int Group::intersection(MPI_Group group2, MPI_Group* newgroup) if (size2 == 0) { *newgroup = MPI_GROUP_EMPTY; } else { - *newgroup = new simgrid::smpi::Group(size2); + *newgroup = new Group(size2); int j=0; for (int i = 0; i < group2->size(); i++) { int proc2 = group2->index(i); @@ -240,8 +227,8 @@ int Group::intersection(MPI_Group group2, MPI_Group* newgroup) int Group::difference(MPI_Group group2, MPI_Group* newgroup) { - int newsize = m_size; - int size2 = m_size; + int newsize = size_; + int size2 = size_; for (int i = 0; i < size2; i++) { int proc1 = this->index(i); int proc2 = group2->rank(proc1); @@ -252,7 +239,7 @@ int Group::difference(MPI_Group group2, MPI_Group* newgroup) if (newsize == 0) { *newgroup = MPI_GROUP_EMPTY; } else { - *newgroup = new simgrid::smpi::Group(newsize); + *newgroup = new Group(newsize); for (int i = 0; i < size2; i++) { int proc1 = this->index(i); int proc2 = group2->rank(proc1); @@ -265,10 +252,10 @@ int Group::difference(MPI_Group group2, MPI_Group* newgroup) } int Group::excl(int n, int *ranks, MPI_Group * newgroup){ - int oldsize = m_size; + int oldsize = size_; int newsize = oldsize - n; - *newgroup = new simgrid::smpi::Group(newsize); - int* to_exclude=xbt_new0(int, m_size); + *newgroup = new Group(newsize); + int* to_exclude=xbt_new0(int, size_); for (int i = 0; i < oldsize; i++) to_exclude[i]=0; for (int i = 0; i < n; i++) @@ -290,7 +277,7 @@ int Group::range_incl(int n, int ranges[][3], MPI_Group * newgroup){ int newsize = 0; for (int i = 0; i < n; i++) { for (int rank = ranges[i][0]; /* First */ - rank >= 0 && rank < m_size; /* Last */ + rank >= 0 && rank < size_; /* Last */ ) { newsize++; if(rank == ranges[i][1]){/*already last ?*/ @@ -306,11 +293,11 @@ int Group::range_incl(int n, int ranges[][3], MPI_Group * newgroup){ } } } - *newgroup = new simgrid::smpi::Group(newsize); + *newgroup = new Group(newsize); int j = 0; for (int i = 0; i < n; i++) { for (int rank = ranges[i][0]; /* First */ - rank >= 0 && rank < m_size; /* Last */ + rank >= 0 && rank < size_; /* Last */ ) { int index = this->index(rank); (*newgroup)->set_mapping(index, j); @@ -332,10 +319,10 @@ int Group::range_incl(int n, int ranges[][3], MPI_Group * newgroup){ } int Group::range_excl(int n, int ranges[][3], MPI_Group * newgroup){ - int newsize = m_size; + int newsize = size_; for (int i = 0; i < n; i++) { for (int rank = ranges[i][0]; /* First */ - rank >= 0 && rank < m_size; /* Last */ + rank >= 0 && rank < size_; /* Last */ ) { newsize--; if(rank == ranges[i][1]){/*already last ?*/ @@ -354,13 +341,13 @@ int Group::range_excl(int n, int ranges[][3], MPI_Group * newgroup){ if (newsize == 0) { *newgroup = MPI_GROUP_EMPTY; } else { - *newgroup = new simgrid::smpi::Group(newsize); + *newgroup = new Group(newsize); int newrank = 0; int oldrank = 0; while (newrank < newsize) { int add = 1; for (int i = 0; i < n; i++) { - for (int rank = ranges[i][0]; rank >= 0 && rank < m_size;) { + for (int rank = ranges[i][0]; rank >= 0 && rank < size_;) { if(rank==oldrank){ add = 0; break; @@ -389,5 +376,16 @@ int Group::range_excl(int n, int ranges[][3], MPI_Group * newgroup){ return MPI_SUCCESS; } +MPI_Group Group::f2c(int id) { + if(id == -2) { + return MPI_GROUP_EMPTY; + } else if(F2C::f2c_lookup() != nullptr && id >= 0) { + char key[KEY_SIZE]; + return static_cast(xbt_dict_get_or_null(F2C::f2c_lookup(), get_key(key, id))); + } else { + return static_cast(MPI_GROUP_NULL); + } +} + } }