From 6186b5ed9dee56b9899a85fee26896842014f877 Mon Sep 17 00:00:00 2001 From: Nathan Hjelm Date: Wed, 23 Oct 2013 16:17:51 +0000 Subject: [PATCH] Remove extra file that made its way into r29490. cmr=v1.7.4:ticket=3862 This commit was SVN r29491. The following SVN revision numbers were found above: r29490 --> open-mpi/ompi@cde3b05ed30f6ddd590e899ae0bf2afa0e3b088a The following Trac tickets were found above: Ticket 3862 --> https://svn.open-mpi.org/trac/ompi/ticket/3862 --- ompi/mca/btl/scif/btl_scif_prepare.h | 168 --------------------------- 1 file changed, 168 deletions(-) delete mode 100644 ompi/mca/btl/scif/btl_scif_prepare.h diff --git a/ompi/mca/btl/scif/btl_scif_prepare.h b/ompi/mca/btl/scif/btl_scif_prepare.h deleted file mode 100644 index b82ba8f22d..0000000000 --- a/ompi/mca/btl/scif/btl_scif_prepare.h +++ /dev/null @@ -1,168 +0,0 @@ -/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ -/* - * Copyright (c) 2013 Los Alamos National Security, LLC. All rights - * reserved. - * $COPYRIGHT$ - * - * Additional copyrights may follow - * - * $HEADER$ - */ - -#if !defined(MCA_BTL_SCIF_PREPARE_H) -#define MCA_BTL_SCIF_PREPARE_H - -#include "ompi_config.h" - -#include "btl_scif.h" -#include "btl_scif_frag.h" - -static inline struct mca_btl_base_descriptor_t * -mca_btl_scif_prepare_src_send_inplace (struct mca_btl_base_module_t *btl, - mca_btl_base_endpoint_t *endpoint, - struct opal_convertor_t *convertor, - uint8_t order, size_t reserve, size_t *size, - uint32_t flags) -{ - bool use_eager_get = (*size + reserve) > mca_btl_scif_component.smsg_max_data; - mca_btl_scif_base_frag_t *frag = NULL; - mca_btl_scif_reg_t *registration = NULL; - void *data_ptr; - int rc; - - opal_convertor_get_current_pointer (convertor, &data_ptr); - - (void) MCA_BTL_SCIF_FRAG_ALLOC_RDMA(endpoint, frag); - - if (OPAL_UNLIKELY(NULL == frag)) { - return NULL; - } - - BTL_VERBOSE(("preparing src for send fragment. size = %u", - (unsigned int)(*size + reserve))); - - if (OPAL_UNLIKELY(true == use_eager_get)) { - rc = btl->btl_mpool->mpool_register(btl->btl_mpool, data_ptr, *size, 0, - (mca_mpool_base_registration_t **)®istration); - if (OPAL_UNLIKELY(OMPI_SUCCESS != rc)) { - mca_btl_scif_frag_return (frag); - return NULL; - } - - frag->flags = MCA_BTL_SCIF_FRAG_EAGER | MCA_BTL_SCIF_FRAG_IGNORE; - - frag->registration = registration; - frag->segments[1].memory_handle = registration->memory_hdl; - - frag->hdr_size = reserve + sizeof (frag->hdr.eager); - frag->segments[0].base.seg_addr.pval = frag->hdr.eager_ex.pml_header; - } else { - frag->hdr_size = reserve + sizeof (frag->hdr.send); - frag->segments[0].base.seg_addr.pval = frag->hdr.send_ex.pml_header; - } - - frag->segments[0].base.seg_len = reserve; - - frag->segments[1].base.seg_addr.pval = data_ptr; - frag->segments[1].base.seg_len = *size; - - frag->base.des_src = &frag->segments->base; - frag->base.des_src_cnt = 2; - frag->base.order = order; - frag->base.des_flags = flags; - - return &frag->base; -} - -static inline struct mca_btl_base_descriptor_t * -mca_btl_scif_prepare_src_send_buffered (struct mca_btl_base_module_t *btl, - mca_btl_base_endpoint_t *endpoint, - struct opal_convertor_t *convertor, - uint8_t order, size_t reserve, size_t *size, - uint32_t flags) -{ - bool use_eager_get = (*size + reserve) > mca_btl_scif_component.smsg_max_data; - mca_btl_scif_reg_t *registration = NULL; - mca_btl_scif_base_frag_t *frag = NULL; - uint32_t iov_count = 1; - struct iovec iov; - size_t max_size = *size; - int rc; - - if (OPAL_UNLIKELY(true == use_eager_get)) { - (void) MCA_BTL_SCIF_FRAG_ALLOC_EAGER_SEND(endpoint, frag); - if (OPAL_UNLIKELY(NULL == frag)) { - return NULL; - } - - frag->flags = MCA_BTL_SCIF_FRAG_EAGER | MCA_BTL_SCIF_FRAG_IGNORE; - - registration = (mca_btl_scif_reg_t *) frag->base.super.registration; - - frag->segments[1].memory_handle = registration->memory_hdl; - - frag->hdr_size = reserve + sizeof (frag->hdr.eager); - frag->segments[0].base.seg_addr.pval = frag->hdr.eager_ex.pml_header; - } else { - (void) MCA_BTL_SCIF_FRAG_ALLOC_SMSG(endpoint, frag); - if (OPAL_UNLIKELY(NULL == frag)) { - return NULL; - } - - frag->hdr_size = reserve + sizeof (frag->hdr.send); - frag->segments[0].base.seg_addr.pval = frag->hdr.send_ex.pml_header; - } - - frag->flags |= MCA_BTL_SCIF_FRAG_BUFFERED; - - if (*size) { - iov.iov_len = *size; - iov.iov_base = (IOVBASE_TYPE *) frag->base.super.ptr; - - rc = opal_convertor_pack (convertor, &iov, &iov_count, &max_size); - if (OPAL_UNLIKELY(rc < 0)) { - mca_btl_scif_frag_return (frag); - return NULL; - } - } - - frag->segments[0].base.seg_len = reserve; - - frag->segments[1].base.seg_addr.pval = frag->base.super.ptr; - frag->segments[1].base.seg_len = *size; - - frag->base.des_src = &frag->segments->base; - frag->base.des_src_cnt = 2; - frag->base.order = order; - frag->base.des_flags = flags; - - return &frag->base; -} - -static inline struct mca_btl_base_descriptor_t * -mca_btl_scif_prepare_src_send (struct mca_btl_base_module_t *btl, - mca_btl_base_endpoint_t *endpoint, - struct opal_convertor_t *convertor, - uint8_t order, size_t reserve, size_t *size, - uint32_t flags) -{ - bool use_eager_get = (*size + reserve) > mca_btl_scif_component.smsg_max_data; - bool send_in_place; - void *data_ptr; - - opal_convertor_get_current_pointer (convertor, &data_ptr); - - send_in_place = !(opal_convertor_need_buffers(convertor) || - (use_eager_get && ((uintptr_t)data_ptr & 3))); - - if (send_in_place) { - return mca_btl_scif_prepare_src_send_inplace (btl, endpoint, convertor, order, - reserve, size, flags); - } else { - return mca_btl_scif_prepare_src_send_buffered (btl, endpoint, convertor, order, - reserve, size, flags); - } -} - - -#endif