Author: bosilca
Date: 2009-07-16 15:13:30 EDT (Thu, 16 Jul 2009)
New Revision: 21703
URL: https://svn.open-mpi.org/trac/ompi/changeset/21703
Log:
Get rid of the ompi_convertor.h header file. Replace all references
to ompi_convertor
by opal_convertor.
Cleanup the pcie BTL.
Removed:
trunk/ompi/datatype/ompi_convertor.h
Text files modified:
trunk/ompi/datatype/Makefile.am | 1 -
trunk/ompi/mca/btl/pcie/btl_pcie.c | 15 ++++++++-------
trunk/ompi/mca/btl/pcie/btl_pcie.h | 4 ++--
trunk/ompi/mca/btl/pcie/btl_pcie_component.c | 1 -
4 files changed, 10 insertions(+), 11 deletions(-)
Modified: trunk/ompi/datatype/Makefile.am
=
=
=
=
=
=
=
=
======================================================================
--- trunk/ompi/datatype/Makefile.am (original)
+++ trunk/ompi/datatype/Makefile.am 2009-07-16 15:13:30 EDT (Thu, 16
Jul 2009)
@@ -20,7 +20,6 @@
#
headers = \
- ompi_convertor.h \
ompi_datatype.h \
ompi_datatype_internal.h
Deleted: trunk/ompi/datatype/ompi_convertor.h
=
=
=
=
=
=
=
=
======================================================================
--- trunk/ompi/datatype/ompi_convertor.h 2009-07-16 15:13:30 EDT
(Thu, 16 Jul 2009)
+++ (empty file)
@@ -1,89 +0,0 @@
-/* -*- Mode: C; c-basic-offset:4 ; -*- */
-/*
- * Copyright (c) 2009 The University of Tennessee and The
University
- * of Tennessee Research Foundation. All
rights
- * reserved.
- * Copyright (c) 2009 Oak Ridge National Labs. All rights
reserved.
- * $COPYRIGHT$
- *
- * Additional copyrights may follow
- *
- * $HEADER$
- */
-
-#ifndef OMPI_CONVERTOR_H
-#define OMPI_CONVERTOR_H
-
-#include "ompi_config.h"
-
-#include <stddef.h>
-
-#include "opal/datatype/opal_convertor.h"
-#include "ompi/datatype/ompi_datatype.h"
-
-/*
- * XXX TODO To be deleted again.
- * Very small interface to have code, which depends on
ompi_convertor_prepare... interface
- * to work, still...
- *
- * However, still any header #include "opal/datatype/
opal_convertor.h" will need
- * to be renamed to #include "ompi/datatype/ompi_convertor.h"
- */
-#warning "This header file should only be included as a
convenience. Please use the opal_convert.h header, functions and
macros"
-
-#define ompi_convertor_t opal_convertor_t
-
-static inline int32_t
ompi_convertor_prepare_for_send( opal_convertor_t* convertor,
- const
ompi_datatype_t* datatype,
- int32_t count,
- const void*
pUserBuf)
-{
- return opal_convertor_prepare_for_send( convertor,
- &(datatype->super),
- count,
- pUserBuf);
-}
-
-static inline int32_t
ompi_convertor_copy_and_prepare_for_send( const opal_convertor_t*
pSrcConv,
-
const ompi_datatype_t* datatype,
-
int32_t count,
-
const void* pUserBuf,
-
int32_t flags,
-
opal_convertor_t* convertor )
-{
- return opal_convertor_copy_and_prepare_for_send( pSrcConv,
- &(datatype-
>super),
- count,
- pUserBuf,
- flags,
- convertor );
-}
-
-
-static inline int32_t
ompi_convertor_prepare_for_recv( opal_convertor_t* convertor,
- const
ompi_datatype_t* datatype,
- int32_t count,
- const void*
pUserBuf )
-{
- return opal_convertor_prepare_for_recv( convertor,
- &(datatype->super),
- count,
- pUserBuf );
-}
-
-static inline int32_t
ompi_convertor_copy_and_prepare_for_recv( const opal_convertor_t*
pSrcConv,
-
const ompi_datatype_t* datatype,
-
int32_t count,
-
const void* pUserBuf,
-
int32_t flags,
-
opal_convertor_t* convertor )
-{
- return opal_convertor_copy_and_prepare_for_recv( pSrcConv,
- &(datatype-
>super),
- count,
- pUserBuf,
- flags,
- convertor );
-}
-
-#endif /* OMPI_CONVERTOR_H */
\ No newline at end of file
Modified: trunk/ompi/mca/btl/pcie/btl_pcie.c
=
=
=
=
=
=
=
=
======================================================================
--- trunk/ompi/mca/btl/pcie/btl_pcie.c (original)
+++ trunk/ompi/mca/btl/pcie/btl_pcie.c 2009-07-16 15:13:30 EDT (Thu,
16 Jul 2009)
@@ -19,7 +19,8 @@
#include "opal/sys/atomic.h"
#include "opal/mca/paffinity/paffinity.h"
-#include "ompi/datatype/ompi_convertor.h"
+#include "opal/datatype/opal_convertor.h"
+#include "ompi/datatype/ompi_datatype.h"
#include "ompi/mca/btl/btl.h"
#include "ompi/mca/btl/base/btl_base_error.h"
#include "ompi/mca/mpool/mpool.h"
@@ -205,7 +206,7 @@
struct mca_btl_base_module_t* btl,
struct mca_btl_base_endpoint_t* endpoint,
struct mca_mpool_base_registration_t* registration,
- struct ompi_convertor_t* convertor,
+ struct opal_convertor_t* convertor,
uint8_t order,
size_t reserve,
size_t* size,
@@ -223,7 +224,7 @@
BTL_VERBOSE(("btl_pcie_prepare_src called with reserve %lu",
(unsigned long)reserve));
/* check and see if the data is contiguous */
- if(ompi_convertor_need_buffers(convertor) == false && 0 ==
reserve) {
+ if(opal_convertor_need_buffers(convertor) == false && 0 ==
reserve) {
MCA_BTL_PCIE_FRAG_ALLOC_DMA(btl, frag, rc);
if(NULL == frag) {
return NULL;
@@ -233,7 +234,7 @@
iov.iov_base = NULL;
/* get the user buffer's address */
- ompi_convertor_pack(convertor, &iov, &iov_count, &max_data);
+ opal_convertor_pack(convertor, &iov, &iov_count, &max_data);
*size = max_data;
if(NULL == registration) {
@@ -280,7 +281,7 @@
iov.iov_len = max_data;
iov.iov_base = (unsigned char*) frag-
>segment.seg_addr.pval + reserve;
- rc = ompi_convertor_pack(convertor, &iov, &iov_count,
&max_data );
+ rc = opal_convertor_pack(convertor, &iov, &iov_count,
&max_data );
*size = max_data;
if( rc < 0 ) {
MCA_BTL_PCIE_FRAG_RETURN(btl, frag, rc);
@@ -305,7 +306,7 @@
iov.iov_len = max_data;
iov.iov_base = (unsigned char*) frag-
>segment.seg_addr.pval + reserve;
- rc = ompi_convertor_pack(convertor, &iov, &iov_count,
&max_data );
+ rc = opal_convertor_pack(convertor, &iov, &iov_count,
&max_data );
*size = max_data;
if( rc < 0 ) {
@@ -344,7 +345,7 @@
struct mca_btl_base_module_t* btl,
struct mca_btl_base_endpoint_t* endpoint,
struct mca_mpool_base_registration_t* registration,
- struct ompi_convertor_t* convertor,
+ struct opal_convertor_t* convertor,
uint8_t order,
size_t reserve,
size_t* size,
Modified: trunk/ompi/mca/btl/pcie/btl_pcie.h
=
=
=
=
=
=
=
=
======================================================================
--- trunk/ompi/mca/btl/pcie/btl_pcie.h (original)
+++ trunk/ompi/mca/btl/pcie/btl_pcie.h 2009-07-16 15:13:30 EDT (Thu,
16 Jul 2009)
@@ -334,7 +334,7 @@
struct mca_btl_base_module_t* btl,
struct mca_btl_base_endpoint_t* endpoint,
struct mca_mpool_base_registration_t* registration,
- struct ompi_convertor_t* convertor,
+ struct opal_convertor_t* convertor,
uint8_t order,
size_t reserve,
size_t* size,
@@ -345,7 +345,7 @@
struct mca_btl_base_module_t* btl,
struct mca_btl_base_endpoint_t* endpoint,
struct mca_mpool_base_registration_t* registration,
- struct ompi_convertor_t* convertor,
+ struct opal_convertor_t* convertor,
uint8_t order,
size_t reserve,
size_t* size,
Modified: trunk/ompi/mca/btl/pcie/btl_pcie_component.c
=
=
=
=
=
=
=
=
======================================================================
--- trunk/ompi/mca/btl/pcie/btl_pcie_component.c (original)
+++ trunk/ompi/mca/btl/pcie/btl_pcie_component.c 2009-07-16 15:13:30
EDT (Thu, 16 Jul 2009)
@@ -32,7 +32,6 @@
#include "orte/mca/errmgr/errmgr.h"
#include "ompi/constants.h"
-#include "ompi/datatype/ompi_convertor.h"
#include "ompi/mca/btl/btl.h"
#include "ompi/mca/btl/base/base.h"
#include "ompi/mca/btl/base/btl_base_error.h"
_______________________________________________
svn-full mailing list
svn-f...@open-mpi.org
http://www.open-mpi.org/mailman/listinfo.cgi/svn-full
