From d603f31976accaa3b7aa411c6619344172339d4f Mon Sep 17 00:00:00 2001 From: Nathan Hjelm Date: Tue, 8 Nov 2011 15:44:54 +0000 Subject: [PATCH] removed ptr member from seg_key union This commit was SVN r25460. --- ompi/mca/btl/btl.h | 1 - ompi/mca/btl/vader/btl_vader.c | 4 ++-- ompi/mca/btl/vader/btl_vader_get.c | 6 +++--- ompi/mca/btl/vader/btl_vader_put.c | 6 +++--- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/ompi/mca/btl/btl.h b/ompi/mca/btl/btl.h index 0b3d30c5e2..c0a47fd4ab 100644 --- a/ompi/mca/btl/btl.h +++ b/ompi/mca/btl/btl.h @@ -241,7 +241,6 @@ struct mca_btl_base_segment_t { uint32_t key32[4]; uint64_t key64[2]; uint8_t key8[16]; - uintptr_t ptr[2]; } seg_key; }; typedef struct mca_btl_base_segment_t mca_btl_base_segment_t; diff --git a/ompi/mca/btl/vader/btl_vader.c b/ompi/mca/btl/vader/btl_vader.c index db7ad9d42f..706411eef8 100644 --- a/ompi/mca/btl/vader/btl_vader.c +++ b/ompi/mca/btl/vader/btl_vader.c @@ -643,7 +643,7 @@ struct mca_btl_base_descriptor_t *vader_prepare_dst(struct mca_btl_base_module_t opal_convertor_get_current_pointer (convertor, (void **) &data_ptr); - frag->segment.seg_key.ptr[0] = (uintptr_t) data_ptr; + frag->segment.seg_key.key64[0] = (uint64_t)(uintptr_t) data_ptr; frag->segment.seg_len = *size; frag->base.des_dst = &frag->segment; @@ -738,7 +738,7 @@ static struct mca_btl_base_descriptor_t *vader_prepare_src (struct mca_btl_base_ return NULL; } - frag->segment.seg_key.ptr[0] = (uintptr_t) data_ptr; + frag->segment.seg_key.key64[0] = (uint64_t)(uintptr_t) data_ptr; frag->segment.seg_len = reserve + *size; } diff --git a/ompi/mca/btl/vader/btl_vader_get.c b/ompi/mca/btl/vader/btl_vader_get.c index a8ada7c13c..6080bededd 100644 --- a/ompi/mca/btl/vader/btl_vader_get.c +++ b/ompi/mca/btl/vader/btl_vader_get.c @@ -34,15 +34,15 @@ int mca_btl_vader_get (struct mca_btl_base_module_t *btl, void *rem_ptr; reg = vader_get_registation (endpoint->peer_smp_rank, - (void *) src->seg_key.ptr[0], + (void *)(uintptr_t) src->seg_key.key64[0], src->seg_len, 0); if (OPAL_UNLIKELY(NULL == reg)) { return OMPI_ERROR; } - rem_ptr = vader_reg_to_ptr (reg, (void *) src->seg_key.ptr[0]); + rem_ptr = vader_reg_to_ptr (reg, (void *)(uintptr_t) src->seg_key.key64[0]); - vader_memmove ((void *) dst->seg_key.ptr[0], rem_ptr, size); + vader_memmove ((void *)(uintptr_t) dst->seg_key.key64[0], rem_ptr, size); vader_return_registration (reg, endpoint->peer_smp_rank); diff --git a/ompi/mca/btl/vader/btl_vader_put.c b/ompi/mca/btl/vader/btl_vader_put.c index 767f6998fc..be8615f7fb 100644 --- a/ompi/mca/btl/vader/btl_vader_put.c +++ b/ompi/mca/btl/vader/btl_vader_put.c @@ -34,15 +34,15 @@ int mca_btl_vader_put (struct mca_btl_base_module_t *btl, void *rem_ptr; reg = vader_get_registation (endpoint->peer_smp_rank, - (void *) dst->seg_key.ptr[0], + (void *)(uintptr_t) dst->seg_key.key64[0], dst->seg_len, 0); if (OPAL_UNLIKELY(NULL == reg)) { return OMPI_ERROR; } - rem_ptr = vader_reg_to_ptr (reg, (void *) dst->seg_key.ptr[0]); + rem_ptr = vader_reg_to_ptr (reg, (void *)(uintptr_t) dst->seg_key.key64[0]); - vader_memmove (rem_ptr, (void *) src->seg_key.ptr[0], size); + vader_memmove (rem_ptr, (void *)(uintptr_t) src->seg_key.key64[0], size); vader_return_registration (reg, endpoint->peer_smp_rank);