Move all dumping functions in dt_module.c
On destroy set the fields back to 0 or NULL Always allocate one more element in the datatype description. This element will containt a fake DT_END_LOOP entry, that enable us to remove some tests in all parsing functions. (more about that in the design document soooooon) This commit was SVN r1088.
Этот коммит содержится в:
George Bosilca
родитель
9a9bf88781
Коммит
977ef57289
@ -28,14 +28,18 @@ static void __get_free_dt_struct( dt_desc_t* pData )
|
|||||||
pData->ub = LONG_MIN;
|
pData->ub = LONG_MIN;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void __destroy_ddt_struct( dt_desc_t** pData )
|
static void __destroy_ddt_struct( dt_desc_t* pData )
|
||||||
{
|
{
|
||||||
if( (*pData)->desc.desc != NULL ) free( (*pData)->desc.desc );
|
if( pData->desc.desc != NULL ) free( pData->desc.desc );
|
||||||
(*pData)->desc.desc = NULL;
|
pData->desc.desc = NULL;
|
||||||
if( (*pData)->opt_desc.desc != NULL ) free( (*pData)->opt_desc.desc );
|
pData->desc.length = 0;
|
||||||
(*pData)->opt_desc.desc = NULL;
|
pData->desc.used = 0;
|
||||||
if( (*pData)->args != NULL ) free( (*pData)->args );
|
if( pData->opt_desc.desc != NULL ) free( pData->opt_desc.desc );
|
||||||
(*pData)->args = NULL;
|
pData->opt_desc.desc = NULL;
|
||||||
|
pData->opt_desc.length = 0;
|
||||||
|
pData->opt_desc.used = 0;
|
||||||
|
if( pData->args != NULL ) free( pData->args );
|
||||||
|
pData->args = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
OBJ_CLASS_INSTANCE(lam_datatype_t, lam_object_t, __get_free_dt_struct, __destroy_ddt_struct );
|
OBJ_CLASS_INSTANCE(lam_datatype_t, lam_object_t, __get_free_dt_struct, __destroy_ddt_struct );
|
||||||
@ -45,9 +49,10 @@ dt_desc_t* lam_ddt_create( int expectedSize )
|
|||||||
dt_desc_t* pdt = (dt_desc_t*)OBJ_NEW(lam_datatype_t);
|
dt_desc_t* pdt = (dt_desc_t*)OBJ_NEW(lam_datatype_t);
|
||||||
|
|
||||||
if( expectedSize == -1 ) expectedSize = DT_INCREASE_STACK;
|
if( expectedSize == -1 ) expectedSize = DT_INCREASE_STACK;
|
||||||
pdt->desc.length = expectedSize;
|
pdt->desc.length = expectedSize + 1; /* one for the fake elem at the end */
|
||||||
pdt->desc.used = 0;
|
pdt->desc.used = 0;
|
||||||
pdt->desc.desc = (dt_elem_desc_t*)calloc(pdt->desc.length, sizeof(dt_elem_desc_t));
|
pdt->desc.desc = (dt_elem_desc_t*)calloc(pdt->desc.length, sizeof(dt_elem_desc_t));
|
||||||
|
memset( pdt->name, 0, MPI_MAX_OBJECT_NAME );
|
||||||
return pdt;
|
return pdt;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -58,169 +63,3 @@ int lam_ddt_create_resized( dt_desc_t* oldType, long lb, long extent, dt_desc_t*
|
|||||||
(*newType)->ub = lb + extent;
|
(*newType)->ub = lb + extent;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void _dump_data_flags( unsigned short usflags )
|
|
||||||
{
|
|
||||||
char flags[12] = "-----------";
|
|
||||||
|
|
||||||
if( usflags & DT_FLAG_DESTROYED ) flags[0] = 'd';
|
|
||||||
if( usflags & DT_FLAG_COMMITED ) flags[1] = 'c';
|
|
||||||
if( usflags & DT_FLAG_CONTIGUOUS ) flags[2] = 'C';
|
|
||||||
if( usflags & DT_FLAG_OVERLAP ) flags[3] = 'o';
|
|
||||||
if( usflags & DT_FLAG_USER_LB ) flags[4] = 'l';
|
|
||||||
if( usflags & DT_FLAG_USER_UB ) flags[5] = 'u';
|
|
||||||
if( usflags & DT_FLAG_FOREVER ) flags[6] = 'F';
|
|
||||||
if( usflags & DT_FLAG_IN_LOOP ) flags[7] = 'L';
|
|
||||||
if( usflags & DT_FLAG_DATA ) flags[8] = 'D';
|
|
||||||
if( usflags & DT_FLAG_INITIAL ) flags[9] = 'I';
|
|
||||||
if( (usflags & DT_FLAG_BASIC) == DT_FLAG_BASIC ) flags[10] = 'B';
|
|
||||||
flags[11] = 0;
|
|
||||||
printf( "%s\t", flags );
|
|
||||||
}
|
|
||||||
|
|
||||||
static int __dump_data_desc( dt_elem_desc_t* pDesc, int nbElems )
|
|
||||||
{
|
|
||||||
int i;
|
|
||||||
|
|
||||||
for( i = 0; i < nbElems; i++ ) {
|
|
||||||
_dump_data_flags( pDesc->flags );
|
|
||||||
if( pDesc->type == DT_LOOP )
|
|
||||||
printf( "%15s %d times the next %d elements extent %d\n",
|
|
||||||
basicDatatypes[pDesc->type].name,
|
|
||||||
pDesc->count, (int)pDesc->disp, pDesc->extent );
|
|
||||||
else
|
|
||||||
printf( "%15s count %d disp 0x%lx (%ld) extent %d\n",
|
|
||||||
basicDatatypes[pDesc->type].name,
|
|
||||||
pDesc->count, pDesc->disp, pDesc->disp, pDesc->extent );
|
|
||||||
pDesc++;
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void __dt_contain_basic_datatypes( dt_desc_t* pData )
|
|
||||||
{
|
|
||||||
int i, mask = 1;
|
|
||||||
|
|
||||||
if( pData->flags & DT_FLAG_USER_LB ) printf( "lb " );
|
|
||||||
if( pData->flags & DT_FLAG_USER_UB ) printf( "ub " );
|
|
||||||
for( i = 0; i < DT_MAX_PREDEFINED; i++ ) {
|
|
||||||
if( pData->bdt_used & mask )
|
|
||||||
printf( "%s ", basicDatatypes[i].name );
|
|
||||||
mask <<= 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void lam_ddt_dump( dt_desc_t* data )
|
|
||||||
{
|
|
||||||
dt_desc_t* pData = (dt_desc_t*)data;
|
|
||||||
|
|
||||||
printf( "Datatype %p size %d align %d id %d length %d used %d\n\
|
|
||||||
true_lb %ld true_ub %ld (true_extent %ld) lb %ld ub %ld (extent %ld)\n\
|
|
||||||
nbElems %d loops %d flags %X (",
|
|
||||||
(void*)pData, pData->size, pData->align, pData->id, pData->desc.length, pData->desc.used,
|
|
||||||
pData->true_lb, pData->true_ub, pData->true_ub - pData->true_lb,
|
|
||||||
pData->lb, pData->ub, pData->ub - pData->lb,
|
|
||||||
pData->nbElems, pData->btypes[DT_LOOP], pData->flags );
|
|
||||||
/* dump the flags */
|
|
||||||
if( pData->flags == DT_FLAG_BASIC ) printf( "basic datatype " );
|
|
||||||
else {
|
|
||||||
if( pData->flags & DT_FLAG_DESTROYED ) printf( "destroyed " );
|
|
||||||
if( pData->flags & DT_FLAG_COMMITED ) printf( "commited " );
|
|
||||||
if( pData->flags & DT_FLAG_CONTIGUOUS) printf( "contiguous " );
|
|
||||||
}
|
|
||||||
printf( ")" ); _dump_data_flags( pData->flags );
|
|
||||||
printf( "\n contain " ); __dt_contain_basic_datatypes( pData ); printf( "\n" );
|
|
||||||
__dump_data_desc( pData->desc.desc, pData->desc.used );
|
|
||||||
if( pData->opt_desc.desc != NULL ) {
|
|
||||||
printf( "Optimized description \n" );
|
|
||||||
__dump_data_desc( pData->opt_desc.desc, pData->opt_desc.used );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#define DUMP_TYPE( TYPENAME, TYPE ) \
|
|
||||||
static int dump_##TYPENAME( unsigned int count, \
|
|
||||||
char* from, unsigned int from_len, long from_extent, \
|
|
||||||
char* to, unsigned int to_len, long to_extent, \
|
|
||||||
int* used ) \
|
|
||||||
{ \
|
|
||||||
int remote_type_size = sizeof(TYPE), res = 1; \
|
|
||||||
if( (remote_type_size * count) > from_len ) { \
|
|
||||||
count = from_len / remote_type_size; \
|
|
||||||
if( (count * remote_type_size) != from_len ) { \
|
|
||||||
printf( "oops should I keep this data somewhere (excedent %d bytes)?\n", \
|
|
||||||
from_len - (count * remote_type_size) ); \
|
|
||||||
res = -1; \
|
|
||||||
} \
|
|
||||||
printf( "correct: %s count %d from %p with length %d to %p space %d\n", \
|
|
||||||
#TYPE, count, from, from_len, to, to_len ); \
|
|
||||||
} else \
|
|
||||||
printf( " %s count %d from %p with length %d to %p space %d\n", \
|
|
||||||
#TYPE, count, from, from_len, to, to_len ); \
|
|
||||||
\
|
|
||||||
*used = count * to_extent; \
|
|
||||||
return res * count; \
|
|
||||||
}
|
|
||||||
|
|
||||||
DUMP_TYPE( char, char )
|
|
||||||
DUMP_TYPE( short, short )
|
|
||||||
DUMP_TYPE( int, int )
|
|
||||||
DUMP_TYPE( float, float )
|
|
||||||
DUMP_TYPE( long, long )
|
|
||||||
DUMP_TYPE( double, double )
|
|
||||||
DUMP_TYPE( long_long, long long )
|
|
||||||
DUMP_TYPE( long_double, long double )
|
|
||||||
DUMP_TYPE( complex_float, lam_complex_float_t )
|
|
||||||
DUMP_TYPE( complex_double, lam_complex_double_t )
|
|
||||||
|
|
||||||
static lam_convertor_t* pDumpConv = NULL;
|
|
||||||
|
|
||||||
static conversion_fct_t dump_functions[] = {
|
|
||||||
(conversion_fct_t)NULL, /* DT_LOOP */
|
|
||||||
(conversion_fct_t)NULL, /* DT_LB */
|
|
||||||
(conversion_fct_t)NULL, /* DT_UB */
|
|
||||||
(conversion_fct_t)NULL, /* DT_SPACE */
|
|
||||||
(conversion_fct_t)dump_char, /* DT_CHAR */
|
|
||||||
(conversion_fct_t)dump_char, /* DT_BYTE */
|
|
||||||
(conversion_fct_t)dump_short, /* DT_SHORT */
|
|
||||||
(conversion_fct_t)dump_int, /* DT_INT */
|
|
||||||
(conversion_fct_t)dump_float, /* DT_FLOAT */
|
|
||||||
(conversion_fct_t)dump_long, /* DT_LONG */
|
|
||||||
(conversion_fct_t)dump_double, /* DT_DOUBLE */
|
|
||||||
(conversion_fct_t)dump_long_long, /* DT_LONG_LONG */
|
|
||||||
(conversion_fct_t)dump_long_double, /* DT_LONG_DOUBLE */
|
|
||||||
(conversion_fct_t)dump_complex_float, /* DT_COMPLEX_FLOAT */
|
|
||||||
(conversion_fct_t)dump_complex_double, /* DT_COMPLEX_DOUBLE */
|
|
||||||
};
|
|
||||||
|
|
||||||
void lam_ddt_dump_complete( dt_desc_t* data )
|
|
||||||
{
|
|
||||||
dt_desc_t* pData = (dt_desc_t*)data;
|
|
||||||
struct iovec fake = { (void*)0, 0 };
|
|
||||||
|
|
||||||
printf( "Datatype %p size %d align %d id %d length %d used %d\n\
|
|
||||||
true_lb %ld true_ub %ld (true_extent %ld) lb %ld ub %ld (extent %ld)\n\
|
|
||||||
nbElems %d loops %d flags %X (",
|
|
||||||
(void*)pData, pData->size, pData->align, pData->id, pData->desc.length, pData->desc.used,
|
|
||||||
pData->true_lb, pData->true_ub, pData->true_ub - pData->true_lb,
|
|
||||||
pData->lb, pData->ub, pData->ub - pData->lb,
|
|
||||||
pData->nbElems, pData->btypes[DT_LOOP], pData->flags );
|
|
||||||
|
|
||||||
/* dump the flags */
|
|
||||||
if( pData->flags == DT_FLAG_BASIC ) printf( "basic datatype " );
|
|
||||||
else {
|
|
||||||
if( pData->flags & DT_FLAG_DESTROYED ) printf( "destroyed " );
|
|
||||||
if( pData->flags & DT_FLAG_COMMITED ) printf( "commited " );
|
|
||||||
if( pData->flags & DT_FLAG_CONTIGUOUS) printf( "contiguous " );
|
|
||||||
if( pData->flags & DT_FLAG_OVERLAP ) printf( "overlap " );
|
|
||||||
}
|
|
||||||
printf( ")\n contain " ); __dt_contain_basic_datatypes( pData );
|
|
||||||
printf( "\n{\n" );
|
|
||||||
if( pDumpConv == NULL ) {
|
|
||||||
pDumpConv = lam_convertor_create( 0, 0 );
|
|
||||||
}
|
|
||||||
lam_convertor_init_for_recv( pDumpConv, 0, pData, 1, NULL, 0 );
|
|
||||||
pDumpConv->pFunctions = dump_functions;
|
|
||||||
|
|
||||||
fake.iov_len = pData->size;
|
|
||||||
lam_convertor_unpack( pDumpConv, &fake, 1 );
|
|
||||||
printf( "}\n" );
|
|
||||||
}
|
|
||||||
|
|||||||
Загрузка…
x
Ссылка в новой задаче
Block a user