Skip to content

Commit f2fa78e

Browse files
authored
Merge pull request #2896 from jjhursey/fix/ibm/v2.0.x/pml-bsend
pml/base: Expose some bsend varaibles so PMLs may reference them
2 parents 7bafbfb + 3a7163a commit f2fa78e

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

ompi/mca/pml/base/pml_base_bsend.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
* Copyright (c) 2007 Sun Microsystems, Inc. All rights reserved.
1313
* Copyright (c) 2015 Research Organization for Information Science
1414
* and Technology (RIST). All rights reserved.
15+
* Copyright (c) 2017 IBM Corporation. All rights reserved.
1516
* $COPYRIGHT$
1617
*
1718
* Additional copyrights may follow
@@ -40,9 +41,9 @@ static opal_condition_t mca_pml_bsend_condition; /* condition variable to block
4041
static mca_allocator_base_component_t* mca_pml_bsend_allocator_component;
4142
static mca_allocator_base_module_t* mca_pml_bsend_allocator; /* sub-allocator to manage users buffer */
4243
static size_t mca_pml_bsend_usersize; /* user provided buffer size */
43-
static unsigned char *mca_pml_bsend_userbase; /* user provided buffer base */
44-
static unsigned char *mca_pml_bsend_base; /* adjusted base of user buffer */
45-
static unsigned char *mca_pml_bsend_addr; /* current offset into user buffer */
44+
unsigned char *mca_pml_bsend_userbase = NULL; /* user provided buffer base */
45+
unsigned char *mca_pml_bsend_base = NULL; /* adjusted base of user buffer */
46+
unsigned char *mca_pml_bsend_addr = NULL; /* current offset into user buffer */
4647
static size_t mca_pml_bsend_size; /* adjusted size of user buffer */
4748
static size_t mca_pml_bsend_count; /* number of outstanding requests */
4849
static size_t mca_pml_bsend_pagesz; /* mmap page size */

ompi/mca/pml/base/pml_base_bsend.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
* University of Stuttgart. All rights reserved.
1010
* Copyright (c) 2004-2005 The Regents of the University of California.
1111
* All rights reserved.
12+
* Copyright (c) 2017 IBM Corporation. All rights reserved.
1213
* $COPYRIGHT$
1314
*
1415
* Additional copyrights may follow
@@ -37,6 +38,10 @@ OMPI_DECLSPEC int mca_pml_base_bsend_request_fini(ompi_request_t*);
3738
OMPI_DECLSPEC void* mca_pml_base_bsend_request_alloc_buf( size_t length );
3839
OMPI_DECLSPEC int mca_pml_base_bsend_request_free(void* addr);
3940

41+
extern unsigned char *mca_pml_bsend_userbase; /* user provided buffer base */
42+
extern unsigned char *mca_pml_bsend_base; /* adjusted base of user buffer */
43+
extern unsigned char *mca_pml_bsend_addr; /* current offset into user buffer */
44+
4045
END_C_DECLS
4146

4247
#endif

0 commit comments

Comments
 (0)