From c6a4f416030569a5ae5a45e3ceaf348395a941b1 Mon Sep 17 00:00:00 2001 From: mquinson Date: Tue, 13 Jul 2004 02:03:55 +0000 Subject: [PATCH 1/1] take care of the architecture maximal boundary when computing field offset (damn intel); cosmetics & logs improvements git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@265 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- src/gras/DataDesc/datadesc_private.h | 3 +- src/gras/DataDesc/ddt_convert.c | 195 ++++++++++++++++----------- src/gras/DataDesc/ddt_create.c | 53 +++++--- src/gras/DataDesc/ddt_exchange.c | 8 +- 4 files changed, 150 insertions(+), 109 deletions(-) diff --git a/src/gras/DataDesc/datadesc_private.h b/src/gras/DataDesc/datadesc_private.h index 2d17326130..37075aa4dc 100644 --- a/src/gras/DataDesc/datadesc_private.h +++ b/src/gras/DataDesc/datadesc_private.h @@ -52,6 +52,8 @@ typedef struct { int sizeof_scalars[9]; /* char,short,int,long,long_long, pdata,pfunc, float,double */ + + int struct_boundary; } gras_arch_desc_t; extern const gras_arch_desc_t gras_arches[gras_arch_count]; @@ -128,7 +130,6 @@ typedef struct s_gras_dd_cat_scalar { */ typedef struct s_gras_dd_cat_struct { gras_dynar_t *fields; /* elm type = gras_dd_cat_field_t */ - int remaining; /**/ int closed; /* gras_datadesc_declare_struct_close() was called */ } gras_dd_cat_struct_t; diff --git a/src/gras/DataDesc/ddt_convert.c b/src/gras/DataDesc/ddt_convert.c index 2ab8d4859f..dbcc6ff191 100644 --- a/src/gras/DataDesc/ddt_convert.c +++ b/src/gras/DataDesc/ddt_convert.c @@ -14,17 +14,30 @@ #include "DataDesc/datadesc_private.h" -GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(convert,DataDesc); +GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(convert,datadesc); /*** - *** Table of all known architectures. + *** Table of all known architectures: + *** + *** l C<1/1> I<2/2:4/4:4/4:8/4> P<4/4:4/4> D<4/4:8/4> + *** l C<1/1> I<2/2:4/4:8/8:8/8> P<4/4:4/4> D<4/4:8/8> + *** B C<1/1> I<2/2:4/4:4/8:8/8> P<4/4:4/4> D<4/4:8/4> + *** B C<1/1> I<2/2:4/8:8/8:8/8> P<4/4:4/4> D<4/4:8/4> + *** ***/ const gras_arch_desc_t gras_arches[gras_arch_count] = { - {"little32", 0, {1,2,4,4,8, 4,4, 4,8}}, - {"little64", 0, {1,2,4,8,8, 8,8, 4.8}}, - {"big32", 1, {1,2,4,4,8, 4,4, 4,8}}, - {"big64", 1, {1,2,4,8,8, 8,8, 4,8}} + {"little32", 0, {1,2,4,4,8, 4,4, 4,8}, 4}, + // {1,2,4,4,4, 4,4, 4,4}}, + + {"little64", 0, {1,2,4,8,8, 8,8, 4,8}, 8}, + // {1,2,4,8,8, 8,8, 4,8}}, + + {"big32", 1, {1,2,4,4,8, 4,4, 4,8}, 8}, + // {1,2,4,4,8, 4,4, 4,8}}, + + {"big64", 1, {1,2,4,8,8, 8,8, 4,8}, 8} + // {1,2,4,8,8, 8,8, 4,8}} }; const char *gras_datadesc_arch_name(int code) { @@ -37,13 +50,6 @@ const char *gras_datadesc_arch_name(int code) { * Local function doing the grunt work */ static void -gras_dd_resize_int(const void *source, - size_t sourceSize, - void *destination, - size_t destinationSize, - int signedType, - int lowOrderFirst); -static void gras_dd_reverse_bytes(void *to, const void *from, size_t length); @@ -65,6 +71,12 @@ gras_dd_convert_elm(gras_datadesc_type_t *type, int count, const void *r_data; void *l_data; size_t r_size, l_size; + /* Hexadecimal displayer + union { + char c[sizeof(int)]; + int i; + } tester; + */ gras_assert(type->category_code == e_gras_datadesc_type_cat_scalar); @@ -75,7 +87,6 @@ gras_dd_convert_elm(gras_datadesc_type_t *type, int count, r_size,l_size,src,dst); if (r_arch == GRAS_THISARCH) { -// || scal.encoding == e_gras_dd_scalar_encoding_float) { DEBUG0("No conversion needed"); return no_error; } @@ -83,6 +94,9 @@ gras_dd_convert_elm(gras_datadesc_type_t *type, int count, r_size = type->size[r_arch]; l_size = type->size[GRAS_THISARCH]; + DEBUG2("remote=%c local=%c", gras_arches[r_arch].endian?'B':'l', + gras_arches[GRAS_THISARCH].endian?'B':'l'); + if(r_size != l_size) { for(cpt = 0, r_data = src, l_data = dst; cpt < count; @@ -90,21 +104,97 @@ gras_dd_convert_elm(gras_datadesc_type_t *type, int count, r_data = (char *)r_data + r_size, l_data = (char *)l_data + l_size) { - DEBUG5("Resize elm %d from %d @%p to %d @%p",cpt, r_size,r_data, l_size,l_data); - gras_dd_resize_int(r_data, r_size, l_data, l_size, - scal.encoding == e_gras_dd_scalar_encoding_sint, - gras_arches[r_arch].endian && - gras_arches[r_arch].endian - != gras_arches[GRAS_THISARCH].endian);*/ - + /* + fprintf(stderr,"r_data="); + for (cpt=0; cpt 127) != (*l_sign > 127)) { + if(*r_sign > 127) + *l_sign += 128; + else + *l_sign -= 128; + } + } + } else { + DEBUG1("Extend %d bytes", sizeChange); + if (scal.encoding != e_gras_dd_scalar_encoding_sint) { + DEBUG0("This is signed"); + padding = 0; /* pad unsigned with 0 */ + } else { + /* extend sign */ + r_sign = gras_arches[r_arch].endian ? ((unsigned char*)r_data + r_size - 1) + : (unsigned char*)r_data; + padding = (*r_sign > 127) ? 0xff : 0; + } + + memset(l_data, padding, l_size); + memcpy(!gras_arches[r_arch].endian ? l_data : ((char *)l_data + sizeChange), + r_data, r_size); + + /* + fprintf(stderr,"r_data="); + for (cpt=0; cpt 1) { - for(cpt = 0, r_data=src, l_data=dst; + for(cpt = 0, r_data=dst, l_data=dst; cpt < count; cpt++, r_data = (char *)r_data + l_size, /* resizing already done */ @@ -145,65 +235,6 @@ gras_dd_reverse_bytes(void *to, } } -/* - * Copies the integer value of size #sourceSize# stored in #source# to the - * #destinationSize#-long area #destination#. #signedType# indicates whether - * or not the source integer is signed; #lowOrderFirst# whether or not the - * bytes run least-significant to most-significant. - * - * It should be thread safe (operates on local variables and calls mem*) - */ -static void -gras_dd_resize_int(const void *r_data, - size_t r_size, - void *destination, - size_t l_size, - int signedType, - int lowOrderFirst) { - - unsigned char *destinationSign; - int padding; - int sizeChange = l_size - r_size; - unsigned char *r_dataSign; - - gras_assert0(sizeChange, "Nothing to resize"); - - if(sizeChange < 0) { - DEBUG1("Truncate %d bytes", -sizeChange); - /* Truncate high-order bytes. */ - memcpy(destination, - lowOrderFirst?r_data:((char*)r_data-sizeChange), - l_size); - if(signedType) { - DEBUG0("This is signed"); - /* Make sure the high order bit of r_data and - * destination are the same */ - destinationSign = lowOrderFirst ? ((unsigned char*)destination + l_size - 1) : (unsigned char*)destination; - r_dataSign = lowOrderFirst ? ((unsigned char*)r_data + r_size - 1) : (unsigned char*)r_data; - if((*r_dataSign > 127) != (*destinationSign > 127)) { - if(*r_dataSign > 127) - *destinationSign += 128; - else - *destinationSign -= 128; - } - } - } else { - DEBUG1("Extend %d bytes", sizeChange); - /* Pad with zeros or extend sign, as appropriate. */ - if(!signedType) - padding = 0; - else { - r_dataSign = lowOrderFirst ? ((unsigned char*)r_data + r_size - 1) - : (unsigned char*)r_data; - padding = (*r_dataSign > 127) ? 0xff : 0; - } - memset(destination, padding, l_size); - memcpy(lowOrderFirst ? destination - : ((char *)destination + sizeChange), - r_data, r_size); - } -} - /** * gras_arch_selfid: diff --git a/src/gras/DataDesc/ddt_create.c b/src/gras/DataDesc/ddt_create.c index 415a05c260..543ae354f4 100644 --- a/src/gras/DataDesc/ddt_create.c +++ b/src/gras/DataDesc/ddt_create.c @@ -10,7 +10,7 @@ #include "DataDesc/datadesc_private.h" -GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(new,datadesc); +GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(create,datadesc); /** * gras_ddt_freev: @@ -195,12 +195,12 @@ gras_datadesc_declare_struct_append(gras_datadesc_type_t *struct_type, gras_dd_cat_field_t *field; int arch; - gras_assert1(!struct_type->category.struct_data.closed, - "Cannot add anything to the already closed struct %s", - struct_type->name); - gras_assert1(field_type->size >= 0, - "Cannot add a dynamically sized field in structure %s", - struct_type->name); + gras_assert1(!struct_type->category.struct_data.closed, + "Cannot add anything to the already closed struct %s", + struct_type->name); + gras_assert1(field_type->size >= 0, + "Cannot add a dynamically sized field in structure %s", + struct_type->name); field=malloc(sizeof(gras_dd_cat_field_t)); if (!field) @@ -208,38 +208,47 @@ gras_datadesc_declare_struct_append(gras_datadesc_type_t *struct_type, field->name = strdup(name); + DEBUG0("----------------"); + DEBUG4("PRE s={size=%d,align=%d,asize=%d} struct_boundary=%d", + struct_type->size[GRAS_THISARCH], + struct_type->alignment[GRAS_THISARCH], + struct_type->aligned_size[GRAS_THISARCH], + gras_arches[GRAS_THISARCH].struct_boundary); + + for (arch=0; archoffset[arch] = aligned(struct_type->size[arch], - field_type->alignment[arch]); - } - field->code = field_type->code; - field->pre = NULL; - field->post = NULL; - - TRY(gras_dynar_push(struct_type->category.struct_data.fields, &field)); + min(field_type->alignment[arch], + gras_arches[arch].struct_boundary)); - for (arch=0; archsize[arch] = field->offset[arch] + field_type->size[arch]; struct_type->alignment[arch] = max(struct_type->alignment[arch], field_type->alignment[arch]); struct_type->aligned_size[arch] = aligned(struct_type->size[arch], struct_type->alignment[arch]); } + field->code = field_type->code; + field->pre = NULL; + field->post = NULL; + + TRY(gras_dynar_push(struct_type->category.struct_data.fields, &field)); DEBUG3("Push a %s into %s at offset %d.", field_type->name, struct_type->name,field->offset[GRAS_THISARCH]); DEBUG3(" f={size=%d,align=%d,asize=%d}", field_type->size[GRAS_THISARCH], - field_type->alignment, field_type->aligned_size); + field_type->alignment[GRAS_THISARCH], + field_type->aligned_size[GRAS_THISARCH]); DEBUG3(" s={size=%d,align=%d,asize=%d}", struct_type->size[GRAS_THISARCH], - struct_type->alignment, struct_type->aligned_size); + struct_type->alignment[GRAS_THISARCH], + struct_type->aligned_size[GRAS_THISARCH]); return no_error; } void gras_datadesc_declare_struct_close(gras_datadesc_type_t *struct_type) { struct_type->category.struct_data.closed = 1; - INFO0("FIXME: Do something in gras_datadesc_declare_struct_close"); + // INFO0("FIXME: Do something in gras_datadesc_declare_struct_close"); } /** @@ -248,9 +257,9 @@ gras_datadesc_declare_struct_close(gras_datadesc_type_t *struct_type) { * Create a new union and give a pointer to it */ gras_error_t -gras_datadesc_declare_union(const char *name, - gras_datadesc_type_cb_int_t selector, - gras_datadesc_type_t **dst) { +gras_datadesc_declare_union(const char *name, + gras_datadesc_type_cb_int_t selector, + gras_datadesc_type_t **dst) { gras_error_t errcode; gras_datadesc_type_t *res; @@ -326,7 +335,7 @@ gras_datadesc_declare_union_append(gras_datadesc_type_t *union_type, void gras_datadesc_declare_union_close(gras_datadesc_type_t *union_type) { union_type->category.union_data.closed = 1; - INFO0("FIXME: Do something in gras_datadesc_declare_array_close"); + // INFO0("FIXME: Do something in gras_datadesc_declare_union_close"); } /** * gras_datadesc_declare_ref: diff --git a/src/gras/DataDesc/ddt_exchange.c b/src/gras/DataDesc/ddt_exchange.c index 05905c38d8..c90975cb68 100644 --- a/src/gras/DataDesc/ddt_exchange.c +++ b/src/gras/DataDesc/ddt_exchange.c @@ -330,11 +330,11 @@ gras_datadesc_send_rec(gras_socket_t *sock, gras_dd_cat_struct_t struct_data; gras_dd_cat_field_t *field; char *field_data; - - gras_assert1(type->category.struct_data.closed, - "Please call gras_datadesc_declare_array_close on %s before sending it", - type->name); + struct_data = type->category.struct_data; + gras_assert1(struct_data.closed, + "Please call gras_datadesc_declare_struct_close on %s before sending it", + type->name); VERB1(">> Send all fields of the structure %s",type->name); gras_dynar_foreach(struct_data.fields, cpt, field) { field_data = data; -- 2.20.1