Skip to content

Commit 190d5f1

Browse files
bosilcabosilca
authored
Merge pull request #6898 from bosilca/fix/convertor_raw
Fix/convertor raw
2 parents d58c59e + 2930bd9 commit 190d5f1

9 files changed

+50
-45
lines changed

‎ompi/mca/common/monitoring/common_monitoring.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ void mca_common_monitoring_register(void*pml_monitoring_component)
270270
&mca_common_monitoring_enabled);
271271

272272
mca_common_monitoring_current_state = mca_common_monitoring_enabled;
273-
273+
274274
(void)mca_base_var_register("ompi", "pml", "monitoring", "enable_output",
275275
"Enable the PML monitoring textual output at MPI_Finalize "
276276
"(it will be automatically turned off when MPIT is used to "
@@ -280,7 +280,7 @@ void mca_common_monitoring_register(void*pml_monitoring_component)
280280
MCA_BASE_VAR_FLAG_DWG, OPAL_INFO_LVL_9,
281281
MCA_BASE_VAR_SCOPE_READONLY,
282282
&mca_common_monitoring_output_enabled);
283-
283+
284284
(void)mca_base_var_register("ompi", "pml", "monitoring", "filename",
285285
/*&mca_common_monitoring_component.pmlm_version, "filename",*/
286286
"The name of the file where the monitoring information "
@@ -294,7 +294,7 @@ void mca_common_monitoring_register(void*pml_monitoring_component)
294294

295295
/* Now that the MCA variables are automatically unregistered when
296296
* their component close, we need to keep a safe copy of the
297-
* filename.
297+
* filename.
298298
* Keep the copy completely separated in order to let the initial
299299
* filename to be handled by the framework. It's easier to deal
300300
* with the string lifetime.

‎opal/datatype/opal_convertor_internal.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,6 @@ opal_convertor_master_t* opal_convertor_find_or_create_master( uint32_t remote_a
5050
void opal_convertor_destroy_masters( void );
5151

5252

53-
#if OPAL_ENABLE_DEBUG
54-
extern bool opal_pack_debug;
55-
extern bool opal_unpack_debug;
56-
#endif /* OPAL_ENABLE_DEBUG */
57-
5853
END_C_DECLS
5954

6055
#endif /* OPAL_CONVERTOR_INTERNAL_HAS_BEEN_INCLUDED */

‎opal/datatype/opal_convertor_raw.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#if OPAL_ENABLE_DEBUG
2626
#include "opal/util/output.h"
2727

28-
#define DO_DEBUG(INST) if( opal_pack_debug ) { INST }
28+
#define DO_DEBUG(INST) if( opal_ddt_raw_debug ) { INST }
2929
#else
3030
#define DO_DEBUG(INST)
3131
#endif /* OPAL_ENABLE_DEBUG */
@@ -126,8 +126,8 @@ opal_convertor_raw( opal_convertor_t* pConvertor,
126126
const ddt_elem_desc_t* current = &(pElem->elem);
127127

128128
if( count_desc != (current->count * current->blocklen) ) { /* Not the full element description */
129-
do_now = current->blocklen - (count_desc % current->blocklen); /* how much left in the block */
130-
if( do_now ) {
129+
if( (do_now = count_desc % current->blocklen) ) {
130+
do_now = current->blocklen - do_now; /* how much left in the block */
131131
source_base += current->disp;
132132
blength = do_now * opal_datatype_basicDatatypes[current->common.type]->size;
133133
OPAL_DATATYPE_SAFEGUARD_POINTER( source_base, blength, pConvertor->pBaseBuf,
@@ -136,12 +136,12 @@ opal_convertor_raw( opal_convertor_t* pConvertor,
136136
index, (void*)source_base, blength ); );
137137
opal_convertor_merge_iov( iov, iov_count,
138138
(IOVBASE_TYPE *) source_base, blength, &index );
139-
/* not check the return value, we know there was at least one element in the iovec */
139+
/* ignore the return value, we know there was at least one element in the iovec */
140140
sum_iov_len += blength;
141141
count_desc -= do_now;
142142

143-
source_base += (current->extent - current->disp +
144-
(current->blocklen - do_now) * opal_datatype_basicDatatypes[current->common.type]->size);
143+
source_base += (blength - current->blocklen * opal_datatype_basicDatatypes[current->common.type]->size +
144+
current->extent - current->disp);
145145
}
146146
}
147147
}
@@ -258,7 +258,7 @@ opal_convertor_raw( opal_convertor_t* pConvertor,
258258
}
259259
/* I complete an element, next step I should go to the next one */
260260
PUSH_STACK( pStack, pConvertor->stack_pos, pos_desc, OPAL_DATATYPE_UINT1, count_desc,
261-
source_base - pStack->disp - pConvertor->pBaseBuf );
261+
source_base - pConvertor->pBaseBuf );
262262
DO_DEBUG( opal_output( 0, "raw save stack stack_pos %d pos_desc %d count_desc %" PRIsize_t " disp %ld\n",
263263
pConvertor->stack_pos, pStack->index, pStack->count, (long)pStack->disp ); );
264264
return 0;

‎opal/datatype/opal_datatype_copy.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737

3838
#if OPAL_ENABLE_DEBUG
39-
#define DO_DEBUG(INST) if( opal_copy_debug ) { INST }
39+
#define DO_DEBUG(INST) if( opal_ddt_copy_debug ) { INST }
4040
#else
4141
#define DO_DEBUG(INST)
4242
#endif /* OPAL_ENABLE_DEBUG */

‎opal/datatype/opal_datatype_internal.h

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -514,10 +514,11 @@ OPAL_DECLSPEC int opal_datatype_contain_basic_datatypes( const struct opal_datat
514514
OPAL_DECLSPEC int opal_datatype_dump_data_flags( unsigned short usflags, char* ptr, size_t length );
515515
OPAL_DECLSPEC int opal_datatype_dump_data_desc( union dt_elem_desc* pDesc, int nbElems, char* ptr, size_t length );
516516

517-
extern bool opal_position_debug;
518-
extern bool opal_copy_debug;
519-
extern bool opal_unpack_debug;
520-
extern bool opal_pack_debug;
517+
extern bool opal_ddt_position_debug;
518+
extern bool opal_ddt_copy_debug;
519+
extern bool opal_ddt_unpack_debug;
520+
extern bool opal_ddt_pack_debug;
521+
extern bool opal_ddt_raw_debug;
521522

522523
END_C_DECLS
523524
#endif /* OPAL_DATATYPE_INTERNAL_H_HAS_BEEN_INCLUDED */

‎opal/datatype/opal_datatype_module.c

Lines changed: 30 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,11 @@
4141

4242
/* by default the debuging is turned off */
4343
int opal_datatype_dfd = -1;
44-
bool opal_unpack_debug = false;
45-
bool opal_pack_debug = false;
46-
bool opal_position_debug = false;
47-
bool opal_copy_debug = false;
44+
bool opal_ddt_unpack_debug = false;
45+
bool opal_ddt_pack_debug = false;
46+
bool opal_ddt_position_debug = false;
47+
bool opal_ddt_copy_debug = false;
48+
bool opal_ddt_raw_debug = false;
4849
int opal_ddt_verbose = -1; /* Has the datatype verbose it's own output stream */
4950

5051
extern int opal_cuda_verbose;
@@ -161,35 +162,43 @@ int opal_datatype_register_params(void)
161162
int ret;
162163

163164
ret = mca_base_var_register ("opal", "mpi", NULL, "ddt_unpack_debug",
164-
"Whether to output debugging information in the ddt unpack functions (nonzero = enabled)",
165-
MCA_BASE_VAR_TYPE_BOOL, NULL, 0, MCA_BASE_VAR_FLAG_SETTABLE, OPAL_INFO_LVL_3,
166-
MCA_BASE_VAR_SCOPE_LOCAL, &opal_unpack_debug);
165+
"Whether to output debugging information in the ddt unpack functions (nonzero = enabled)",
166+
MCA_BASE_VAR_TYPE_BOOL, NULL, 0, MCA_BASE_VAR_FLAG_SETTABLE, OPAL_INFO_LVL_3,
167+
MCA_BASE_VAR_SCOPE_LOCAL, &opal_ddt_unpack_debug);
167168
if (0 > ret) {
168-
return ret;
169+
return ret;
169170
}
170171

171172
ret = mca_base_var_register ("opal", "mpi", NULL, "ddt_pack_debug",
172-
"Whether to output debugging information in the ddt pack functions (nonzero = enabled)",
173-
MCA_BASE_VAR_TYPE_BOOL, NULL, 0, MCA_BASE_VAR_FLAG_SETTABLE, OPAL_INFO_LVL_3,
174-
MCA_BASE_VAR_SCOPE_LOCAL, &opal_pack_debug);
173+
"Whether to output debugging information in the ddt pack functions (nonzero = enabled)",
174+
MCA_BASE_VAR_TYPE_BOOL, NULL, 0, MCA_BASE_VAR_FLAG_SETTABLE, OPAL_INFO_LVL_3,
175+
MCA_BASE_VAR_SCOPE_LOCAL, &opal_ddt_pack_debug);
175176
if (0 > ret) {
176-
return ret;
177+
return ret;
178+
}
179+
180+
ret = mca_base_var_register ("opal", "mpi", NULL, "ddt_raw_debug",
181+
"Whether to output debugging information in the ddt raw functions (nonzero = enabled)",
182+
MCA_BASE_VAR_TYPE_BOOL, NULL, 0, MCA_BASE_VAR_FLAG_SETTABLE, OPAL_INFO_LVL_3,
183+
MCA_BASE_VAR_SCOPE_LOCAL, &opal_ddt_raw_debug);
184+
if (0 > ret) {
185+
return ret;
177186
}
178187

179188
ret = mca_base_var_register ("opal", "mpi", NULL, "ddt_position_debug",
180-
"Non zero lead to output generated by the datatype position functions",
181-
MCA_BASE_VAR_TYPE_BOOL, NULL, 0, MCA_BASE_VAR_FLAG_SETTABLE, OPAL_INFO_LVL_3,
182-
MCA_BASE_VAR_SCOPE_LOCAL, &opal_position_debug);
189+
"Non zero lead to output generated by the datatype position functions",
190+
MCA_BASE_VAR_TYPE_BOOL, NULL, 0, MCA_BASE_VAR_FLAG_SETTABLE, OPAL_INFO_LVL_3,
191+
MCA_BASE_VAR_SCOPE_LOCAL, &opal_ddt_position_debug);
183192
if (0 > ret) {
184-
return ret;
193+
return ret;
185194
}
186195

187196
ret = mca_base_var_register ("opal", "mpi", NULL, "ddt_copy_debug",
188-
"Whether to output debugging information in the ddt copy functions (nonzero = enabled)",
189-
MCA_BASE_VAR_TYPE_BOOL, NULL, 0, MCA_BASE_VAR_FLAG_SETTABLE, OPAL_INFO_LVL_3,
190-
MCA_BASE_VAR_SCOPE_LOCAL, &opal_copy_debug);
197+
"Whether to output debugging information in the ddt copy functions (nonzero = enabled)",
198+
MCA_BASE_VAR_TYPE_BOOL, NULL, 0, MCA_BASE_VAR_FLAG_SETTABLE, OPAL_INFO_LVL_3,
199+
MCA_BASE_VAR_SCOPE_LOCAL, &opal_ddt_copy_debug);
191200
if (0 > ret) {
192-
return ret;
201+
return ret;
193202
}
194203

195204
ret = mca_base_var_register ("opal", "opal", NULL, "ddt_verbose",
@@ -208,7 +217,7 @@ int opal_datatype_register_params(void)
208217
OPAL_INFO_LVL_8, MCA_BASE_VAR_SCOPE_LOCAL,
209218
&opal_cuda_verbose);
210219
if (0 > ret) {
211-
return ret;
220+
return ret;
212221
}
213222
#endif
214223

‎opal/datatype/opal_datatype_pack.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#if OPAL_ENABLE_DEBUG
3232
#include "opal/util/output.h"
3333

34-
#define DO_DEBUG(INST) if( opal_pack_debug ) { INST }
34+
#define DO_DEBUG(INST) if( opal_ddt_pack_debug ) { INST }
3535
#else
3636
#define DO_DEBUG(INST)
3737
#endif /* OPAL_ENABLE_DEBUG */
@@ -272,7 +272,7 @@ opal_generic_simple_pack_function( opal_convertor_t* pConvertor,
272272
for( iov_count = 0; iov_count < (*out_size); iov_count++ ) {
273273
iov_ptr = (unsigned char *) iov[iov_count].iov_base;
274274
iov_len_local = iov[iov_count].iov_len;
275-
275+
276276
if( pElem->elem.common.flags & OPAL_DATATYPE_FLAG_DATA ) {
277277
if( (pElem->elem.count * pElem->elem.blocklen) != count_desc ) {
278278
/* we have a partial (less than blocklen) basic datatype */

‎opal/datatype/opal_datatype_position.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#if OPAL_ENABLE_DEBUG
3434
#include "opal/util/output.h"
3535

36-
#define DO_DEBUG(INST) if( opal_position_debug ) { INST }
36+
#define DO_DEBUG(INST) if( opal_ddt_position_debug ) { INST }
3737
#else
3838
#define DO_DEBUG(INST)
3939
#endif /* OPAL_ENABLE_DEBUG */

‎opal/datatype/opal_datatype_unpack.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#if OPAL_ENABLE_DEBUG
3434
#include "opal/util/output.h"
3535

36-
#define DO_DEBUG(INST) if( opal_unpack_debug ) { INST }
36+
#define DO_DEBUG(INST) if( opal_ddt_unpack_debug ) { INST }
3737
#else
3838
#define DO_DEBUG(INST)
3939
#endif /* OPAL_ENABLE_DEBUG */

0 commit comments

Comments
 (0)