X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d17275a7f232bacf3d00279e3ba76c32cc6cf2c5..e03bf3a600dff69cab3b8b82adf52971778180c6:/src/smpi/smpi_datatype_derived.cpp diff --git a/src/smpi/smpi_datatype_derived.cpp b/src/smpi/smpi_datatype_derived.cpp index c6aeec117e..326dee846b 100644 --- a/src/smpi/smpi_datatype_derived.cpp +++ b/src/smpi/smpi_datatype_derived.cpp @@ -1,5 +1,5 @@ /* smpi_datatype.cpp -- MPI primitives to handle datatypes */ -/* Copyright (c) 2009-2015. The SimGrid Team. +/* Copyright (c) 2009-2017. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -21,27 +21,24 @@ namespace smpi{ Type_Contiguous::Type_Contiguous(int size, MPI_Aint lb, MPI_Aint ub, int flags, int block_count, MPI_Datatype old_type): Datatype(size, lb, ub, flags), block_count_(block_count), old_type_(old_type){ - old_type_->use(); + old_type_->ref(); } Type_Contiguous::~Type_Contiguous(){ - old_type_->unuse(); + Datatype::unref(old_type_); } -void Type_Contiguous::use(){ - old_type_->use(); -}; void Type_Contiguous::serialize( void* noncontiguous_buf, void *contiguous_buf, int count){ char* contiguous_buf_char = static_cast(contiguous_buf); - char* noncontiguous_buf_char = static_cast(noncontiguous_buf)+lb_; + char* noncontiguous_buf_char = static_cast(noncontiguous_buf)+lb(); memcpy(contiguous_buf_char, noncontiguous_buf_char, count * block_count_ * old_type_->size()); } void Type_Contiguous::unserialize( void* contiguous_buf, void *noncontiguous_buf, int count, MPI_Op op){ char* contiguous_buf_char = static_cast(contiguous_buf); - char* noncontiguous_buf_char = static_cast(noncontiguous_buf)+lb_; + char* noncontiguous_buf_char = static_cast(noncontiguous_buf)+lb(); int n= count*block_count_; if(op!=MPI_OP_NULL) op->apply( contiguous_buf_char, noncontiguous_buf_char, &n, old_type_); @@ -49,15 +46,11 @@ void Type_Contiguous::unserialize( void* contiguous_buf, void *noncontiguous_buf Type_Vector::Type_Vector(int size,MPI_Aint lb, MPI_Aint ub, int flags, int count, int block_length, int stride, MPI_Datatype old_type): Datatype(size, lb, ub, flags), block_count_(count), block_length_(block_length),block_stride_(stride), old_type_(old_type){ -old_type_->use(); + old_type_->ref(); } Type_Vector::~Type_Vector(){ - old_type_->unuse(); -} - -void Type_Vector::use(){ - old_type_->use(); + Datatype::unref(old_type_); } @@ -104,13 +97,10 @@ void Type_Vector::unserialize( void* contiguous_buf, void *noncontiguous_buf, } Type_Hvector::Type_Hvector(int size,MPI_Aint lb, MPI_Aint ub, int flags, int count, int block_length, MPI_Aint stride, MPI_Datatype old_type): Datatype(size, lb, ub, flags), block_count_(count), block_length_(block_length), block_stride_(stride), old_type_(old_type){ - old_type->use(); + old_type->ref(); } Type_Hvector::~Type_Hvector(){ - old_type_->unuse(); -} -void Type_Hvector::use(){ - old_type_->use(); + Datatype::unref(old_type_); } void Type_Hvector::serialize( void* noncontiguous_buf, void *contiguous_buf, @@ -155,7 +145,7 @@ void Type_Hvector::unserialize( void* contiguous_buf, void *noncontiguous_buf, } Type_Indexed::Type_Indexed(int size,MPI_Aint lb, MPI_Aint ub, int flags, int count, int* block_lengths, int* block_indices, MPI_Datatype old_type): Datatype(size, lb, ub, flags), block_count_(count), old_type_(old_type){ - old_type->use(); + old_type->ref(); block_lengths_ = new int[count]; block_indices_ = new int[count]; for (int i = 0; i < count; i++) { @@ -165,16 +155,13 @@ Type_Indexed::Type_Indexed(int size,MPI_Aint lb, MPI_Aint ub, int flags, int cou } Type_Indexed::~Type_Indexed(){ - old_type_->unuse(); - if(in_use_==0){ + Datatype::unref(old_type_); + if(refcount()==0){ delete[] block_lengths_; delete[] block_indices_; } } -void Type_Indexed::use(){ - old_type_->use(); -} void Type_Indexed::serialize( void* noncontiguous_buf, void *contiguous_buf, int count){ @@ -227,7 +214,7 @@ void Type_Indexed::unserialize( void* contiguous_buf, void *noncontiguous_buf, Type_Hindexed::Type_Hindexed(int size,MPI_Aint lb, MPI_Aint ub, int flags, int count, int* block_lengths, MPI_Aint* block_indices, MPI_Datatype old_type) : Datatype(size, lb, ub, flags), block_count_(count), old_type_(old_type) { - old_type_->use(); + old_type_->ref(); block_lengths_ = new int[count]; block_indices_ = new MPI_Aint[count]; for (int i = 0; i < count; i++) { @@ -237,16 +224,13 @@ Type_Hindexed::Type_Hindexed(int size,MPI_Aint lb, MPI_Aint ub, int flags, int c } Type_Hindexed::~Type_Hindexed(){ - old_type_->unuse(); - if(in_use_==0){ + Datatype::unref(old_type_); + if(refcount()==0){ delete[] block_lengths_; delete[] block_indices_; } } -void Type_Hindexed::use(){ - old_type_->use(); -} void Type_Hindexed::serialize( void* noncontiguous_buf, void *contiguous_buf, int count){ char* contiguous_buf_char = static_cast(contiguous_buf); @@ -299,26 +283,21 @@ Type_Struct::Type_Struct(int size,MPI_Aint lb, MPI_Aint ub, int flags, int count block_lengths_[i]=block_lengths[i]; block_indices_[i]=block_indices[i]; old_types_[i]=old_types[i]; - old_types_[i]->use(); + old_types_[i]->ref(); } } Type_Struct::~Type_Struct(){ for (int i = 0; i < block_count_; i++) { - old_types_[i]->unuse(); + Datatype::unref(old_types_[i]); } - if(in_use_==0){ + if(refcount()==0){ delete[] block_lengths_; delete[] block_indices_; delete[] old_types_; } } -void Type_Struct::use(){ - for (int i = 0; i < block_count_; i++) { - old_types_[i]->use(); - } -} void Type_Struct::serialize( void* noncontiguous_buf, void *contiguous_buf, int count){ @@ -360,7 +339,7 @@ void Type_Struct::unserialize( void* contiguous_buf, void *noncontiguous_buf, else noncontiguous_buf_char += block_lengths_[i]*old_types_[i]->get_extent(); } - noncontiguous_buf=reinterpret_cast(noncontiguous_buf_char); + noncontiguous_buf=static_cast(noncontiguous_buf_char); } }