Skip to content

Commit 556a4ac

Browse files
hjelmnhjelmn
committed
btl: remove unused descriptor flags
This PR removes the MCA_BTL_DES_FLAGS_PUT and MCA_BTL_DES_FLAGS_GET descriptor flags. At some point these had some meaning but they were replaced by the rcache access flags. Signed-off-by: Nathan Hjelm <hjelmn@google.com>
1 parent c17968c commit 556a4ac

File tree

5 files changed

+12
-17
lines changed

5 files changed

+12
-17
lines changed

‎opal/mca/btl/btl.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -491,11 +491,6 @@ OPAL_DECLSPEC OBJ_CLASS_DECLARATION(mca_btl_base_descriptor_t);
491491
*/
492492
#define MCA_BTL_DES_FLAGS_CUDA_COPY_ASYNC 0x0008
493493

494-
/* Type of transfer that will be done with this frag.
495-
*/
496-
#define MCA_BTL_DES_FLAGS_PUT 0x0010
497-
#define MCA_BTL_DES_FLAGS_GET 0x0020
498-
499494
/* Ask the BTL to wake the remote process (send/sendi) or local process
500495
* (put/get) to handle this message. The BTL may ignore this flag if
501496
* signaled operations are not supported.

‎opal/mca/btl/ofi/btl_ofi_module.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
* Copyright (c) 2018 Intel, Inc, All rights reserved
1616
*
1717
* Copyright (c) 2018 Amazon.com, Inc. or its affiliates. All Rights reserved.
18+
* Copyright (c) 2020 Google, LLC. All rights reserved.
1819
* $COPYRIGHT$
1920
*
2021
* Additional copyrights may follow
@@ -169,9 +170,8 @@ void mca_btl_ofi_rcache_init (mca_btl_ofi_module_t *module)
169170
* @param endpoint(IN) BTL addressing information (or NULL for all endpoints)
170171
* @param base (IN) Pointer to start of region
171172
* @param size (IN) Size of region
172-
* @param flags (IN) Flags indicating what operation will be performed. Valid
173-
* values are MCA_BTL_DES_FLAGS_PUT, MCA_BTL_DES_FLAGS_GET,
174-
* and MCA_BTL_DES_FLAGS_ATOMIC
173+
* @param flags (IN) Flags indicating what memory access level is requested.
174+
* See opal/mca/rcache/rcache.h for valid access flags.
175175
*
176176
* @returns a memory registration handle valid for both local and remote operations
177177
* @returns NULL if the region could not be registered

‎opal/mca/btl/template/btl_template.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
* All rights reserved.
1313
* Copyright (c) 2014-2015 Los Alamos National Security, LLC. All rights
1414
* reserved.
15+
* Copyright (c) 2020 Google, LLC. All rights reserved.
1516
* $COPYRIGHT$
1617
*
1718
* Additional copyrights may follow
@@ -349,9 +350,8 @@ int mca_btl_template_get (struct mca_btl_base_module_t *btl,
349350
* @param endpoint(IN) BTL addressing information (or NULL for all endpoints)
350351
* @param base (IN) Pointer to start of region
351352
* @param size (IN) Size of region
352-
* @param flags (IN) Flags indicating what operation will be performed. Valid
353-
* values are MCA_BTL_DES_FLAGS_PUT, MCA_BTL_DES_FLAGS_GET,
354-
* and MCA_BTL_DES_FLAGS_ATOMIC
353+
* @param flags (IN) Flags indicating what memory access level is requested.
354+
* See opal/mca/rcache/rcache.h for valid access flags.
355355
*
356356
* @returns a memory registration handle valid for both local and remote operations
357357
* @returns NULL if the region could not be registered

‎opal/mca/btl/template/btl_template.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
* All rights reserved.
1313
* Copyright (c) 2015 Los Alamos National Security, LLC. All rights
1414
* reserved.
15+
* Copyright (c) 2020 Google, LLC. All rights reserved.
1516
* $COPYRIGHT$
1617
*
1718
* Additional copyrights may follow
@@ -268,9 +269,8 @@ int mca_btl_template_get (struct mca_btl_base_module_t *btl,
268269
* @param endpoint(IN) BTL addressing information (or NULL for all endpoints)
269270
* @param base (IN) Pointer to start of region
270271
* @param size (IN) Size of region
271-
* @param flags (IN) Flags indicating what operation will be performed. Valid
272-
* values are MCA_BTL_DES_FLAGS_PUT, MCA_BTL_DES_FLAGS_GET,
273-
* and MCA_BTL_DES_FLAGS_ATOMIC
272+
* @param flags (IN) Flags indicating what memory access level is requested.
273+
* See opal/mca/rcache/rcache.h for valid access flags.
274274
*
275275
* @returns a memory registration handle valid for both local and remote operations
276276
* @returns NULL if the region could not be registered

‎opal/mca/btl/uct/btl_uct_module.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
* All rights reserved.
1313
* Copyright (c) 2014-2018 Los Alamos National Security, LLC. All rights
1414
* reserved.
15+
* Copyright (c) 2020 Google, LLC. All rights reserved.
1516
* $COPYRIGHT$
1617
*
1718
* Additional copyrights may follow
@@ -149,9 +150,8 @@ static int mca_btl_uct_del_procs (mca_btl_base_module_t *btl, size_t nprocs,
149150
* @param endpoint(IN) BTL addressing information (or NULL for all endpoints)
150151
* @param base (IN) Pointer to start of region
151152
* @param size (IN) Size of region
152-
* @param flags (IN) Flags indicating what operation will be performed. Valid
153-
* values are MCA_BTL_DES_FLAGS_PUT, MCA_BTL_DES_FLAGS_GET,
154-
* and MCA_BTL_DES_FLAGS_ATOMIC
153+
* @param flags (IN) Flags indicating what memory access level is requested.
154+
* See opal/mca/rcache/rcache.h for valid access flags.
155155
*
156156
* @returns a memory registration handle valid for both local and remote operations
157157
* @returns NULL if the region could not be registered

0 commit comments

Comments
 (0)