From 4f1139590f993f0bc3d7b987ad7df9ea3b5b3073 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Fri, 27 Feb 2015 18:16:01 -0800 Subject: [PATCH] datatypes: trivial spelling fix s/commited/committed/gi --- ompi/datatype/ompi_datatype_module.c | 2 +- opal/datatype/opal_datatype.h | 6 +++--- opal/datatype/opal_datatype_add.c | 6 +++--- opal/datatype/opal_datatype_dump.c | 4 ++-- opal/datatype/opal_datatype_optimize.c | 4 ++-- test/datatype/ddt_lib.c | 2 +- test/datatype/ddt_lib.h | 2 +- test/datatype/opal_ddt_lib.c | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ompi/datatype/ompi_datatype_module.c b/ompi/datatype/ompi_datatype_module.c index db78367745..a9d5b68d76 100644 --- a/ompi/datatype/ompi_datatype_module.c +++ b/ompi/datatype/ompi_datatype_module.c @@ -748,7 +748,7 @@ void ompi_datatype_dump( const ompi_datatype_t* pData ) if( ompi_datatype_is_predefined(pData) ) { index += snprintf( buffer + index, length - index, "predefined " ); } else { - if( pData->super.flags & OPAL_DATATYPE_FLAG_COMMITED ) index += snprintf( buffer + index, length - index, "commited " ); + if( pData->super.flags & OPAL_DATATYPE_FLAG_COMMITTED ) index += snprintf( buffer + index, length - index, "committed " ); if( pData->super.flags & OPAL_DATATYPE_FLAG_CONTIGUOUS) index += snprintf( buffer + index, length - index, "contiguous " ); } index += snprintf( buffer + index, length - index, ")" ); diff --git a/opal/datatype/opal_datatype.h b/opal/datatype/opal_datatype.h index 56fb672c5f..cf00a690c5 100644 --- a/opal/datatype/opal_datatype.h +++ b/opal/datatype/opal_datatype.h @@ -61,7 +61,7 @@ BEGIN_C_DECLS /* flags for the datatypes. */ #define OPAL_DATATYPE_FLAG_UNAVAILABLE 0x0001 /**< datatypes unavailable on the build (OS or compiler dependant) */ #define OPAL_DATATYPE_FLAG_PREDEFINED 0x0002 /**< cannot be removed: initial and predefined datatypes */ -#define OPAL_DATATYPE_FLAG_COMMITED 0x0004 /**< ready to be used for a send/recv operation */ +#define OPAL_DATATYPE_FLAG_COMMITTED 0x0004 /**< ready to be used for a send/recv operation */ #define OPAL_DATATYPE_FLAG_OVERLAP 0x0008 /**< datatype is unpropper for a recv operation */ #define OPAL_DATATYPE_FLAG_CONTIGUOUS 0x0010 /**< contiguous datatype */ #define OPAL_DATATYPE_FLAG_NO_GAPS 0x0020 /**< no gaps around the datatype, aka OPAL_DATATYPE_FLAG_CONTIGUOUS and extent == size */ @@ -76,7 +76,7 @@ BEGIN_C_DECLS OPAL_DATATYPE_FLAG_CONTIGUOUS | \ OPAL_DATATYPE_FLAG_NO_GAPS | \ OPAL_DATATYPE_FLAG_DATA | \ - OPAL_DATATYPE_FLAG_COMMITED) + OPAL_DATATYPE_FLAG_COMMITTED) /** @@ -186,7 +186,7 @@ OPAL_DECLSPEC int32_t opal_datatype_destroy( opal_datatype_t** ); static inline int32_t opal_datatype_is_committed( const opal_datatype_t* type ) { - return ((type->flags & OPAL_DATATYPE_FLAG_COMMITED) == OPAL_DATATYPE_FLAG_COMMITED); + return ((type->flags & OPAL_DATATYPE_FLAG_COMMITTED) == OPAL_DATATYPE_FLAG_COMMITTED); } static inline int32_t diff --git a/opal/datatype/opal_datatype_add.c b/opal/datatype/opal_datatype_add.c index cca5bb3fca..d6a1458b65 100644 --- a/opal/datatype/opal_datatype_add.c +++ b/opal/datatype/opal_datatype_add.c @@ -279,7 +279,7 @@ int32_t opal_datatype_add( opal_datatype_t* pdtBase, const opal_datatype_t* pdtA if( (pdtAdd->flags & (OPAL_DATATYPE_FLAG_PREDEFINED | OPAL_DATATYPE_FLAG_DATA)) == (OPAL_DATATYPE_FLAG_PREDEFINED | OPAL_DATATYPE_FLAG_DATA) ) { pdtBase->btypes[pdtAdd->id] += count; if( (extent != (OPAL_PTRDIFF_TYPE)pdtAdd->size) && (count > 1) ) { /* gaps around the datatype */ - localFlags = pdtAdd->flags & ~(OPAL_DATATYPE_FLAG_COMMITED | OPAL_DATATYPE_FLAG_CONTIGUOUS | OPAL_DATATYPE_FLAG_NO_GAPS); + localFlags = pdtAdd->flags & ~(OPAL_DATATYPE_FLAG_COMMITTED | OPAL_DATATYPE_FLAG_CONTIGUOUS | OPAL_DATATYPE_FLAG_NO_GAPS); CREATE_LOOP_START( pLast, count, 2, extent, localFlags ); pLast++; pLast->elem.common.type = pdtAdd->id; @@ -298,7 +298,7 @@ int32_t opal_datatype_add( opal_datatype_t* pdtBase, const opal_datatype_t* pdtA pLast->elem.disp = disp; pLast->elem.extent = extent; pdtBase->desc.used++; - pLast->elem.common.flags = pdtAdd->flags & ~(OPAL_DATATYPE_FLAG_COMMITED); + pLast->elem.common.flags = pdtAdd->flags & ~(OPAL_DATATYPE_FLAG_COMMITTED); } } else { /* keep trace of the total number of basic datatypes in the datatype definition */ @@ -322,7 +322,7 @@ int32_t opal_datatype_add( opal_datatype_t* pdtBase, const opal_datatype_t* pdtA if( count != 1 ) { pLoop = pLast; CREATE_LOOP_START( pLast, count, pdtAdd->desc.used + 1, extent, - (pdtAdd->flags & ~(OPAL_DATATYPE_FLAG_COMMITED)) ); + (pdtAdd->flags & ~(OPAL_DATATYPE_FLAG_COMMITTED)) ); pdtBase->btypes[OPAL_DATATYPE_LOOP] += 2; pdtBase->desc.used += 2; pLast++; diff --git a/opal/datatype/opal_datatype_dump.c b/opal/datatype/opal_datatype_dump.c index 696f0a64e9..c1b86cb439 100644 --- a/opal/datatype/opal_datatype_dump.c +++ b/opal/datatype/opal_datatype_dump.c @@ -55,7 +55,7 @@ int opal_datatype_dump_data_flags( unsigned short usflags, char* ptr, size_t len int index = 0; if( length < 22 ) return 0; index = snprintf( ptr, 22, "-----------[---][---]" ); /* set everything to - */ - if( usflags & OPAL_DATATYPE_FLAG_COMMITED ) ptr[1] = 'c'; + if( usflags & OPAL_DATATYPE_FLAG_COMMITTED ) ptr[1] = 'c'; if( usflags & OPAL_DATATYPE_FLAG_CONTIGUOUS ) ptr[2] = 'C'; if( usflags & OPAL_DATATYPE_FLAG_OVERLAP ) ptr[3] = 'o'; if( usflags & OPAL_DATATYPE_FLAG_USER_LB ) ptr[4] = 'l'; @@ -120,7 +120,7 @@ void opal_datatype_dump( const opal_datatype_t* pData ) if( pData->flags == OPAL_DATATYPE_FLAG_PREDEFINED ) index += snprintf( buffer + index, length - index, "predefined " ); else { - if( pData->flags & OPAL_DATATYPE_FLAG_COMMITED ) index += snprintf( buffer + index, length - index, "commited " ); + if( pData->flags & OPAL_DATATYPE_FLAG_COMMITTED ) index += snprintf( buffer + index, length - index, "committed " ); if( pData->flags & OPAL_DATATYPE_FLAG_CONTIGUOUS) index += snprintf( buffer + index, length - index, "contiguous " ); } index += snprintf( buffer + index, length - index, ")" ); diff --git a/opal/datatype/opal_datatype_optimize.c b/opal/datatype/opal_datatype_optimize.c index 26ac43b156..f561987870 100644 --- a/opal/datatype/opal_datatype_optimize.c +++ b/opal/datatype/opal_datatype_optimize.c @@ -255,8 +255,8 @@ int32_t opal_datatype_commit( opal_datatype_t * pData ) ddt_endloop_desc_t* pLast = &(pData->desc.desc[pData->desc.used].end_loop); OPAL_PTRDIFF_TYPE first_elem_disp = 0; - if( pData->flags & OPAL_DATATYPE_FLAG_COMMITED ) return OPAL_SUCCESS; - pData->flags |= OPAL_DATATYPE_FLAG_COMMITED; + if( pData->flags & OPAL_DATATYPE_FLAG_COMMITTED ) return OPAL_SUCCESS; + pData->flags |= OPAL_DATATYPE_FLAG_COMMITTED; /* We have to compute the displacement of the first non loop item in the * description. diff --git a/test/datatype/ddt_lib.c b/test/datatype/ddt_lib.c index b5cc6a50f0..7c1ebd22e2 100644 --- a/test/datatype/ddt_lib.c +++ b/test/datatype/ddt_lib.c @@ -480,7 +480,7 @@ ompi_datatype_t* test_create_twice_two_doubles( void ) /* Datatype 0x832cf28 size 0 align 1 id 0 length 4 used 0 true_lb 0 true_ub 0 (true_extent 0) lb 0 ub 0 (extent 0) - nbElems 0 loops 0 flags 6 (commited contiguous )-cC--------[---][---] + nbElems 0 loops 0 flags 6 (committed contiguous )-cC--------[---][---] contain 13 disp 0x420 (1056) extent 4 --C-----D*-[ C ][INT] MPI_INT count 13 disp 0x478 (1144) extent 4 --C-----D*-[ C ][INT] MPI_INT count 13 disp 0x4d0 (1232) extent 4 diff --git a/test/datatype/ddt_lib.h b/test/datatype/ddt_lib.h index 8efc016fa7..f91b6fd679 100644 --- a/test/datatype/ddt_lib.h +++ b/test/datatype/ddt_lib.h @@ -62,7 +62,7 @@ extern ompi_datatype_t* test_create_twice_two_doubles( void ); /* Datatype 0x832cf28 size 0 align 1 id 0 length 4 used 0 true_lb 0 true_ub 0 (true_extent 0) lb 0 ub 0 (extent 0) - nbElems 0 loops 0 flags 6 (commited contiguous )-cC--------[---][---] + nbElems 0 loops 0 flags 6 (committed contiguous )-cC--------[---][---] contain 13 disp 0x420 (1056) extent 4 --C-----D*-[ C ][INT] MPI_INT count 13 disp 0x478 (1144) extent 4 --C-----D*-[ C ][INT] MPI_INT count 13 disp 0x4d0 (1232) extent 4 diff --git a/test/datatype/opal_ddt_lib.c b/test/datatype/opal_ddt_lib.c index 3329612b70..ce232cd502 100644 --- a/test/datatype/opal_ddt_lib.c +++ b/test/datatype/opal_ddt_lib.c @@ -71,7 +71,7 @@ opal_datatype_t* test_create_twice_two_doubles( void ) /* Datatype 0x832cf28 size 0 align 1 id 0 length 4 used 0 true_lb 0 true_ub 0 (true_extent 0) lb 0 ub 0 (extent 0) - nbElems 0 loops 0 flags 6 (commited contiguous )-cC--------[---][---] + nbElems 0 loops 0 flags 6 (committed contiguous )-cC--------[---][---] contain 13 disp 0x420 (1056) extent 4 --C-----D*-[ C ][INT] MPI_INT count 13 disp 0x478 (1144) extent 4 --C-----D*-[ C ][INT] MPI_INT count 13 disp 0x4d0 (1232) extent 4